diff --git a/src/lib.rs b/src/lib.rs
index 2138f458..4eaa2b62 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -410,10 +410,7 @@ impl InnerConnection {
             query: query,
             param_types: &[],
         }));
-        try!(self.stream.write_message(&frontend::Describe {
-            variant: b'S',
-            name: stmt_name,
-        }));
+        try!(self.stream.write_message2(|buf| frontend::describe(b'S', stmt_name, buf)));
         try!(self.stream.write_message(&frontend::Sync));
         try!(self.stream.flush());
 
@@ -536,10 +533,7 @@ impl InnerConnection {
             }
         }
 
-        try!(self.stream.write_message(&frontend::Execute {
-            portal: portal_name,
-            max_rows: row_limit,
-        }));
+        try!(self.stream.write_message2(|buf| frontend::execute(portal_name, row_limit, buf)));
         try!(self.stream.write_message(&frontend::Sync));
         try!(self.stream.flush());
 
diff --git a/src/rows.rs b/src/rows.rs
index 8a094d7d..9ffc72ef 100644
--- a/src/rows.rs
+++ b/src/rows.rs
@@ -351,10 +351,7 @@ impl<'trans, 'stmt> LazyRows<'trans, 'stmt> {
     fn execute(&mut self) -> Result<()> {
         let mut conn = self.stmt.conn().conn.borrow_mut();
 
-        try!(conn.stream.write_message(&frontend::Execute {
-            portal: &self.name,
-            max_rows: self.row_limit,
-        }));
+        try!(conn.stream.write_message2(|buf| frontend::execute(&self.name, self.row_limit, buf)));
         try!(conn.stream.write_message(&frontend::Sync));
         try!(conn.stream.flush());
         conn.read_rows(&mut self.data).map(|more_rows| self.more_rows = more_rows)