diff --git a/components/zcash_address/src/encoding.rs b/components/zcash_address/src/encoding.rs
index a7c772214..ab7d7768b 100644
--- a/components/zcash_address/src/encoding.rs
+++ b/components/zcash_address/src/encoding.rs
@@ -32,7 +32,7 @@ impl FromStr for ZcashAddress {
         // Remove leading and trailing whitespace, to handle copy-paste errors.
         let s = s.trim();
 
-        // Most Zcash addresses use Bech32, so try that first.
+        // Most Zcash addresses use Bech32 or Bech32m, so try those first.
         match bech32::decode(s) {
             Ok((hrp, data, Variant::Bech32m)) => {
                 // If we reached this point, the encoding is supposed to be valid Bech32m.
@@ -114,10 +114,10 @@ fn encode_bech32(hrp: &str, data: &[u8]) -> String {
 }
 
 fn encode_b58(prefix: [u8; 2], data: &[u8]) -> String {
-    let mut decoded = Vec::with_capacity(2 + data.len());
-    decoded.extend_from_slice(&prefix);
-    decoded.extend_from_slice(data);
-    bs58::encode(decoded).with_check().into_string()
+    let mut bytes = Vec::with_capacity(2 + data.len());
+    bytes.extend_from_slice(&prefix);
+    bytes.extend_from_slice(data);
+    bs58::encode(bytes).with_check().into_string()
 }
 
 impl fmt::Display for ZcashAddress {
@@ -218,9 +218,7 @@ mod tests {
             "u1cd8yzk5mdn4n9r8c24tp8j8e9ethw3rr7ker5zhew3kycyyxggdzfkcq5f9yf2jv8m5ar8krncsntlfpx3p4azvwrkp8z74t3vu4kqq2",
             ZcashAddress {
                 net: Network::Main,
-                kind: AddressKind::Unified(unified::Address(vec![unified::Receiver::Sapling(
-                    [0; 43],
-                )])),
+                kind: AddressKind::Unified(unified::Address(vec![unified::Receiver::Sapling([0; 43])])),
             },
         );
         encoding(
diff --git a/components/zcash_address/src/kind/unified.rs b/components/zcash_address/src/kind/unified.rs
index 5c7b5e6a8..8569f2071 100644
--- a/components/zcash_address/src/kind/unified.rs
+++ b/components/zcash_address/src/kind/unified.rs
@@ -107,7 +107,7 @@ impl TryFrom<&[u8]> for Address {
                 [typecode, length, data @ ..] if data.len() >= *length as usize => {
                     let (addr, rest) = data.split_at(*length as usize);
                     *encoded = rest;
-                    Some((*typecode, addr).try_into())
+                    Some(Receiver::try_from((*typecode, addr)))
                 }
                 // The encoding is truncated.
                 _ => Some(Err(ParseError::InvalidEncoding)),