diff --git a/.travis.yml b/.travis.yml
index 482d20b..5e60442 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,12 +23,10 @@ matrix:
         - cargo install xargo --force
         - rustup target install armv7-unknown-linux-gnueabihf
         - rustup component add rust-src
-  allow_failures:
     - rust: nightly
       before_script: rustup component add rustfmt-preview
       script:
         - cargo fmt --all -- --write-mode=diff
-        - cd aesni ; cargo fmt -- --config-path ../rustfmt.toml --write-mode=diff
 
 install:
   - curl -LSfs https://japaric.github.io/trust/install.sh | sh -s -- --git japaric/cross --force
diff --git a/keccak/src/lib.rs b/keccak/src/lib.rs
index c365b79..a9fe77e 100644
--- a/keccak/src/lib.rs
+++ b/keccak/src/lib.rs
@@ -82,13 +82,26 @@ const RC: [u64; 24] = [
 
 #[cfg(not(feature = "no_unroll"))]
 macro_rules! unroll5 {
-    ($var:ident, $body:block) => {
-        { const $var:usize = 0; $body; }
-        { const $var:usize = 1; $body; }
-        { const $var:usize = 2; $body; }
-        { const $var:usize = 3; $body; }
-        { const $var:usize = 4; $body; }
+    ($var: ident, $body: block) => {{
+        const $var: usize = 0;
+        $body;
     }
+    {
+        const $var: usize = 1;
+        $body;
+    }
+    {
+        const $var: usize = 2;
+        $body;
+    }
+    {
+        const $var: usize = 3;
+        $body;
+    }
+    {
+        const $var: usize = 4;
+        $body;
+    }};
 }
 
 #[cfg(feature = "no_unroll")]
@@ -100,32 +113,102 @@ macro_rules! unroll5 {
 
 #[cfg(not(feature = "no_unroll"))]
 macro_rules! unroll24 {
-    ($var:ident, $body:block) => {
-        { const $var:usize = 0; $body; }
-        { const $var:usize = 1; $body; }
-        { const $var:usize = 2; $body; }
-        { const $var:usize = 3; $body; }
-        { const $var:usize = 4; $body; }
-        { const $var:usize = 5; $body; }
-        { const $var:usize = 6; $body; }
-        { const $var:usize = 7; $body; }
-        { const $var:usize = 8; $body; }
-        { const $var:usize = 9; $body; }
-        { const $var:usize = 10; $body; }
-        { const $var:usize = 11; $body; }
-        { const $var:usize = 12; $body; }
-        { const $var:usize = 13; $body; }
-        { const $var:usize = 14; $body; }
-        { const $var:usize = 15; $body; }
-        { const $var:usize = 16; $body; }
-        { const $var:usize = 17; $body; }
-        { const $var:usize = 18; $body; }
-        { const $var:usize = 19; $body; }
-        { const $var:usize = 20; $body; }
-        { const $var:usize = 21; $body; }
-        { const $var:usize = 22; $body; }
-        { const $var:usize = 23; $body; }
+    ($var: ident, $body: block) => {{
+        const $var: usize = 0;
+        $body;
     }
+    {
+        const $var: usize = 1;
+        $body;
+    }
+    {
+        const $var: usize = 2;
+        $body;
+    }
+    {
+        const $var: usize = 3;
+        $body;
+    }
+    {
+        const $var: usize = 4;
+        $body;
+    }
+    {
+        const $var: usize = 5;
+        $body;
+    }
+    {
+        const $var: usize = 6;
+        $body;
+    }
+    {
+        const $var: usize = 7;
+        $body;
+    }
+    {
+        const $var: usize = 8;
+        $body;
+    }
+    {
+        const $var: usize = 9;
+        $body;
+    }
+    {
+        const $var: usize = 10;
+        $body;
+    }
+    {
+        const $var: usize = 11;
+        $body;
+    }
+    {
+        const $var: usize = 12;
+        $body;
+    }
+    {
+        const $var: usize = 13;
+        $body;
+    }
+    {
+        const $var: usize = 14;
+        $body;
+    }
+    {
+        const $var: usize = 15;
+        $body;
+    }
+    {
+        const $var: usize = 16;
+        $body;
+    }
+    {
+        const $var: usize = 17;
+        $body;
+    }
+    {
+        const $var: usize = 18;
+        $body;
+    }
+    {
+        const $var: usize = 19;
+        $body;
+    }
+    {
+        const $var: usize = 20;
+        $body;
+    }
+    {
+        const $var: usize = 21;
+        $body;
+    }
+    {
+        const $var: usize = 22;
+        $body;
+    }
+    {
+        const $var: usize = 23;
+        $body;
+    }};
 }
 
 #[cfg(feature = "no_unroll")]