diff --git a/Cargo.lock b/Cargo.lock
index f6d7cd4..21dff8a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -150,9 +150,9 @@ dependencies = [
 
 [[package]]
 name = "digest"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "285743a676ccb6b3e116bc14cc69319b957867930ae9c4822f8e0f54509d7243"
+checksum = "4850db49bf08e663084f7fb5c87d202ef91a3907271aff24a94eb97ff039153c"
 dependencies = [
  "blobby",
  "block-buffer",
@@ -181,9 +181,9 @@ dependencies = [
 
 [[package]]
 name = "hybrid-array"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1b229d73f5803b562cc26e4da0396c8610a4ee209f4fac8fa4f8d709166dc45"
+checksum = "8655f91cd07f2b9d0c24137bd650fe69617773435ee5ec83022377777ce65ef1"
 dependencies = [
  "typenum",
  "zeroize",
@@ -210,9 +210,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.182"
+version = "0.2.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
+checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
 
 [[package]]
 name = "magma"
diff --git a/belt-mac/src/lib.rs b/belt-mac/src/lib.rs
index 12002e5..3c44212 100644
--- a/belt-mac/src/lib.rs
+++ b/belt-mac/src/lib.rs
@@ -20,7 +20,7 @@ digest::buffer_fixed!(
     /// BeltMac instance generic over block cipher.
     #[derive(Clone)]
     pub struct GenericBeltMac<C: BlockCipherEncrypt + SmallBlockSizeUser>(block_api::BeltMacCore<C>);
-    impl: BaseFixedTraits MacMarker Reset FixedOutputReset AlgorithmName InnerInit;
+    impl: ResetMacTraits AlgorithmName InnerInit;
 );
 
 /// BeltMac instance.
diff --git a/cbc-mac/src/lib.rs b/cbc-mac/src/lib.rs
index 6bf2ff5..193cc88 100644
--- a/cbc-mac/src/lib.rs
+++ b/cbc-mac/src/lib.rs
@@ -20,7 +20,7 @@ digest::buffer_fixed!(
     /// Generic CBC-MAC instance.
     #[derive(Clone)]
     pub struct CbcMac<C: BlockCipherEncrypt + SmallBlockSizeUser>(block_api::CbcMacCore<C>);
-    impl: BaseFixedTraits MacMarker Reset FixedOutputReset InnerInit;
+    impl: ResetMacTraits InnerInit;
 );
 
 impl<C> AlgorithmName for CbcMac<C>
diff --git a/cmac/src/lib.rs b/cmac/src/lib.rs
index 8897e5a..13a7fa6 100644
--- a/cmac/src/lib.rs
+++ b/cmac/src/lib.rs
@@ -21,7 +21,7 @@ digest::buffer_fixed!(
     /// Generic CMAC instance.
     #[derive(Clone)]
     pub struct Cmac<C: CmacCipher>(block_api::CmacCore<C>);
-    impl: BaseFixedTraits MacMarker Reset FixedOutputReset InnerInit;
+    impl: ResetMacTraits InnerInit;
 );
 
 impl<C: CmacCipher + AlgorithmName> AlgorithmName for Cmac<C> {
diff --git a/hmac/src/lib.rs b/hmac/src/lib.rs
index c06748d..e26c57a 100644
--- a/hmac/src/lib.rs
+++ b/hmac/src/lib.rs
@@ -37,7 +37,7 @@ digest::buffer_fixed!(
     /// Generic HMAC instance.
     #[derive(Clone)]
     pub struct Hmac<D: EagerHash>(block_api::HmacCore<D>);
-    impl: BaseFixedTraits MacMarker KeyInit;
+    impl: MacTraits KeyInit;
 );
 
 impl<D: EagerHash + AlgorithmName> AlgorithmName for Hmac<D> {
@@ -50,7 +50,7 @@ digest::buffer_fixed!(
     /// Generic HMAC instance with reset support.
     #[derive(Clone)]
     pub struct HmacReset<D: EagerHash>(block_api::HmacResetCore<D>);
-    impl: BaseFixedTraits MacMarker Reset FixedOutputReset KeyInit;
+    impl: ResetMacTraits KeyInit;
 );
 
 impl<D: EagerHash + AlgorithmName> AlgorithmName for HmacReset<D> {
diff --git a/pmac/src/lib.rs b/pmac/src/lib.rs
index c67f6d0..c70c18a 100644
--- a/pmac/src/lib.rs
+++ b/pmac/src/lib.rs
@@ -21,7 +21,7 @@ digest::buffer_fixed!(
     /// Generic PMAC instance with `LC_SIZE` = 20.
     #[derive(Clone)]
     pub struct Pmac<C: PmacCipher>(block_api::PmacCore<C, 20>);
-    impl: BaseFixedTraits MacMarker Reset FixedOutputReset InnerInit;
+    impl: ResetMacTraits InnerInit;
 );
 
 impl<C: PmacCipher + AlgorithmName> AlgorithmName for Pmac<C> {
diff --git a/retail-mac/src/lib.rs b/retail-mac/src/lib.rs
index 22da357..9d3d235 100644
--- a/retail-mac/src/lib.rs
+++ b/retail-mac/src/lib.rs
@@ -26,8 +26,9 @@ use digest::{
 
 digest::buffer_fixed!(
     /// Generic Retail MAC instance.
-    pub struct RetailMac<C: BlockCipherEncrypt + BlockCipherDecrypt + SmallBlockSizeUser >(RetailMacCore<C>);
-    impl: BaseFixedTraits MacMarker Reset FixedOutputReset;
+    #[derive(Clone)]
+    pub struct RetailMac<C: BlockCipherEncrypt + BlockCipherDecrypt + SmallBlockSizeUser>(RetailMacCore<C>);
+    impl: ResetMacTraits;
 );
 
 impl<C> KeySizeUser for RetailMac<C>