diff --git a/zebra-chain/src/serialization.rs b/zebra-chain/src/serialization.rs
index 6caeb4d4..942bf567 100644
--- a/zebra-chain/src/serialization.rs
+++ b/zebra-chain/src/serialization.rs
@@ -292,6 +292,7 @@ pub trait ReadZcashExt: io::Read {
 impl<R: io::Read + ?Sized> ReadZcashExt for R {}
 
 #[cfg(test)]
+#[allow(clippy::unnecessary_operation)]
 mod tests {
     use super::*;
     use proptest::prelude::*;
@@ -321,7 +322,7 @@ mod tests {
                 // copy the input bytes, and overwrite them with the encoding of s,
                 // so that if the encoding is different, we'll catch it on the part
                 // that's written.
-                let mut expect_bytes = bytes.clone();
+                let mut expect_bytes = bytes;
                 Cursor::new(&mut expect_bytes[..]).write_compactsize(s).unwrap();
                 prop_assert_eq!(bytes, expect_bytes);
             }
diff --git a/zebra-network/src/lib.rs b/zebra-network/src/lib.rs
index f2e5264c..eed00512 100644
--- a/zebra-network/src/lib.rs
+++ b/zebra-network/src/lib.rs
@@ -65,6 +65,7 @@ pub use crate::{
     peer_set::init,
     policies::{RetryErrors, RetryLimit},
     protocol::internal::{Request, Response},
+    protocol::external::codec::Builder,
 };
 
 /// Types used in the definition of [`Request`] and [`Response`] messages.
diff --git a/zebra-network/src/protocol/external.rs b/zebra-network/src/protocol/external.rs
index befe8861..c9e96e6e 100644
--- a/zebra-network/src/protocol/external.rs
+++ b/zebra-network/src/protocol/external.rs
@@ -1,5 +1,5 @@
 /// A Tokio codec that transforms an `AsyncRead` into a `Stream` of `Message`s.
-mod codec;
+pub mod codec;
 /// Inventory items.
 mod inv;
 /// An enum of all supported Bitcoin message types.
diff --git a/zebra-network/src/protocol/external/codec.rs b/zebra-network/src/protocol/external/codec.rs
index bbe123b2..396c98d7 100644
--- a/zebra-network/src/protocol/external/codec.rs
+++ b/zebra-network/src/protocol/external/codec.rs
@@ -154,18 +154,17 @@ impl Codec {
     /// the message body prior to writing the header, so that the header can
     /// contain a checksum of the message body.
     fn write_body<W: Write>(&self, msg: &Message, mut writer: W) -> Result<(), Error> {
-        use Message::*;
-        match *msg {
-            Version {
-                ref version,
-                ref services,
-                ref timestamp,
-                ref address_recv,
-                ref address_from,
-                ref nonce,
-                ref user_agent,
-                ref start_height,
-                ref relay,
+        match msg {
+            Message::Version {
+                version,
+                services,
+                timestamp,
+                address_recv,
+                address_from,
+                nonce,
+                user_agent,
+                start_height,
+                relay,
             } => {
                 writer.write_u32::<LittleEndian>(version.0)?;
                 writer.write_u64::<LittleEndian>(services.bits())?;
@@ -184,64 +183,64 @@ impl Codec {
                 writer.write_u32::<LittleEndian>(start_height.0)?;
                 writer.write_u8(*relay as u8)?;
             }
-            Verack => { /* Empty payload -- no-op */ }
-            Ping(nonce) => {
+            Message::Verack => { /* Empty payload -- no-op */ }
+            Message::Ping(nonce) => {
                 writer.write_u64::<LittleEndian>(nonce.0)?;
             }
-            Pong(nonce) => {
+            Message::Pong(nonce) => {
                 writer.write_u64::<LittleEndian>(nonce.0)?;
             }
-            Reject {
-                ref message,
-                ref ccode,
-                ref reason,
-                ref data,
+            Message::Reject {
+                message,
+                ccode,
+                reason,
+                data,
             } => {
                 writer.write_string(&message)?;
                 writer.write_u8(*ccode as u8)?;
                 writer.write_string(&reason)?;
                 writer.write_all(&data.unwrap())?;
             }
-            Addr(ref addrs) => addrs.zcash_serialize(&mut writer)?,
-            GetAddr => { /* Empty payload -- no-op */ }
-            Block(ref block) => block.zcash_serialize(&mut writer)?,
-            GetBlocks {
-                ref block_locator_hashes,
-                ref hash_stop,
+            Message::Addr(addrs) => addrs.zcash_serialize(&mut writer)?,
+            Message::GetAddr => { /* Empty payload -- no-op */ }
+            Message::Block(block) => block.zcash_serialize(&mut writer)?,
+            Message::GetBlocks {
+                block_locator_hashes,
+                hash_stop,
             } => {
                 writer.write_u32::<LittleEndian>(self.builder.version.0)?;
                 block_locator_hashes.zcash_serialize(&mut writer)?;
                 hash_stop.zcash_serialize(&mut writer)?;
             }
-            GetHeaders {
-                ref block_locator_hashes,
-                ref hash_stop,
+            Message::GetHeaders {
+                block_locator_hashes,
+                hash_stop,
             } => {
                 writer.write_u32::<LittleEndian>(self.builder.version.0)?;
                 block_locator_hashes.zcash_serialize(&mut writer)?;
                 hash_stop.zcash_serialize(&mut writer)?;
             }
-            Headers(ref headers) => headers.zcash_serialize(&mut writer)?,
-            Inv(ref hashes) => hashes.zcash_serialize(&mut writer)?,
-            GetData(ref hashes) => hashes.zcash_serialize(&mut writer)?,
-            NotFound(ref hashes) => hashes.zcash_serialize(&mut writer)?,
-            Tx(ref transaction) => transaction.zcash_serialize(&mut writer)?,
-            Mempool => { /* Empty payload -- no-op */ }
-            FilterLoad {
-                ref filter,
-                ref hash_functions_count,
-                ref tweak,
-                ref flags,
+            Message::Headers(headers) => headers.zcash_serialize(&mut writer)?,
+            Message::Inv(hashes) => hashes.zcash_serialize(&mut writer)?,
+            Message::GetData(hashes) => hashes.zcash_serialize(&mut writer)?,
+            Message::NotFound(hashes) => hashes.zcash_serialize(&mut writer)?,
+            Message::Tx(transaction) => transaction.zcash_serialize(&mut writer)?,
+            Message::Mempool => { /* Empty payload -- no-op */ }
+            Message::FilterLoad {
+                filter,
+                hash_functions_count,
+                tweak,
+                flags,
             } => {
                 writer.write_all(&filter.0)?;
                 writer.write_u32::<LittleEndian>(*hash_functions_count)?;
                 writer.write_u32::<LittleEndian>(tweak.0)?;
                 writer.write_u8(*flags)?;
             }
-            FilterAdd { ref data } => {
+            Message::FilterAdd { data } => {
                 writer.write_all(data)?;
             }
-            FilterClear => { /* Empty payload -- no-op */ }
+            Message::FilterClear => { /* Empty payload -- no-op */ }
         }
         Ok(())
     }