diff --git a/heist.cabal b/heist.cabal
--- a/heist.cabal
+++ b/heist.cabal
@@ -1,5 +1,5 @@
 name:           heist
-version:        0.13.1.1
+version:        0.13.1.2
 synopsis:       An Haskell template system supporting both HTML5 and XML.
 description:
     Heist is a powerful template system that supports both HTML5 and XML.
@@ -140,7 +140,7 @@
   build-depends:
     MonadCatchIO-transformers  >= 0.2.1   && < 0.4,
     aeson                      >= 0.6     && < 0.8,
-    attoparsec                 >= 0.10    && < 0.12,
+    attoparsec                 >= 0.10    && < 0.13,
     base                       >= 4       && < 5,
     blaze-builder              >= 0.2     && < 0.4,
     blaze-html                 >= 0.4     && < 0.8,
diff --git a/src/Heist/Types.hs b/src/Heist/Types.hs
--- a/src/Heist/Types.hs
+++ b/src/Heist/Types.hs
@@ -1,10 +1,11 @@
-{-# LANGUAGE BangPatterns #-}
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE BangPatterns               #-}
+{-# LANGUAGE CPP                        #-}
+{-# LANGUAGE DeriveDataTypeable         #-}
+{-# LANGUAGE FlexibleInstances          #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE UndecidableInstances #-}
-{-# LANGUAGE CPP #-}
 
 {-|
 
diff --git a/test/heist-testsuite.cabal b/test/heist-testsuite.cabal
--- a/test/heist-testsuite.cabal
+++ b/test/heist-testsuite.cabal
@@ -9,33 +9,33 @@
 
   build-depends:
     HUnit                      >= 1.2      && < 2,
-    QuickCheck                 >= 2,
+    QuickCheck                 >= 2        && < 2.8,
     MonadCatchIO-transformers  >= 0.2.1    && < 0.4,
-    test-framework             >= 0.6      && <0.7,
-    test-framework-hunit       >= 0.2.7    && <0.3,
-    test-framework-quickcheck2 >= 0.2.12.1 && <0.3,
-    aeson                      >= 0.6     && < 0.8,
-    attoparsec                 >= 0.10    && < 0.12,
-    base                       >= 4       && < 5,
-    blaze-builder              >= 0.2     && < 0.4,
-    blaze-html                 >= 0.4     && < 0.8,
-    bytestring                 >= 0.9     && < 0.11,
-    containers                 >= 0.2     && < 0.6,
-    directory                  >= 1.1     && < 1.3,
-    directory-tree             >= 0.10    && < 0.12,
-    dlist                      >= 0.5     && < 0.7,
-    errors                     >= 1.4     && < 1.5,
-    filepath                   >= 1.3     && < 1.4,
-    hashable                   >= 1.1     && < 1.3,
-    mtl                        >= 2.0     && < 2.2,
-    process                    >= 1.1     && < 1.2,
-    random                     >= 1.0.1.0 && < 1.1,
-    text                       >= 0.10    && < 1.2,
-    time                       >= 1.1     && < 1.5,
-    transformers               >= 0.2     && < 0.4,
-    unordered-containers       >= 0.1.4   && < 0.3,
-    vector                     >= 0.9     && < 0.11,
-    xmlhtml                    >= 0.2.3   && < 0.3
+    test-framework             >= 0.4      && < 0.9,
+    test-framework-hunit       >= 0.2.7    && < 0.4,
+    test-framework-quickcheck2 >= 0.2.12.1 && < 0.4,
+    aeson                      >= 0.6      && < 0.8,
+    attoparsec                 >= 0.10     && < 0.13,
+    base                       >= 4        && < 5,
+    blaze-builder              >= 0.2      && < 0.4,
+    blaze-html                 >= 0.4      && < 0.8,
+    bytestring                 >= 0.9      && < 0.11,
+    containers                 >= 0.2      && < 0.6,
+    directory                  >= 1.1      && < 1.3,
+    directory-tree             >= 0.10     && < 0.13,
+    dlist                      >= 0.5      && < 0.8,
+    errors                     >= 1.4      && < 1.5,
+    filepath                   >= 1.3      && < 1.4,
+    hashable                   >= 1.1      && < 1.3,
+    mtl                        >= 2.0      && < 2.2,
+    process                    >= 1.1      && < 1.3,
+    random                     >= 1.0.1.0  && < 1.1,
+    text                       >= 0.10     && < 1.2,
+    time                       >= 1.1      && < 1.5,
+    transformers               >= 0.2      && < 0.4,
+    unordered-containers       >= 0.1.4    && < 0.3,
+    vector                     >= 0.9      && < 0.11,
+    xmlhtml                    >= 0.2.3    && < 0.3
 
 
   ghc-options: -O2 -Wall -fhpc -fwarn-tabs -funbox-strict-fields -threaded
@@ -48,29 +48,29 @@
   build-depends:
     MonadCatchIO-transformers >= 0.3     && < 0.4,
     HUnit                     >= 1.2     && < 1.3,
-    criterion                 >= 0.6     && < 0.7,
-    test-framework            >= 0.4     && < 0.7,
-    test-framework-hunit      >= 0.2     && < 0.3,
+    criterion                 >= 0.6     && < 0.9,
+    test-framework            >= 0.4     && < 0.9,
+    test-framework-hunit      >= 0.2     && < 0.4,
 
     -- Copied from regular dependencies:
 
     aeson                      >= 0.6     && < 0.8,
-    attoparsec                 >= 0.10    && < 0.12,
+    attoparsec                 >= 0.10    && < 0.13,
     base                       >= 4       && < 5,
     blaze-builder              >= 0.2     && < 0.4,
     blaze-html                 >= 0.4     && < 0.8,
     bytestring                 >= 0.9     && < 0.11,
     containers                 >= 0.2     && < 0.6,
     directory                  >= 1.1     && < 1.3,
-    directory-tree             >= 0.10    && < 0.12,
-    dlist                      >= 0.5     && < 0.7,
+    directory-tree             >= 0.10    && < 0.13,
+    dlist                      >= 0.5     && < 0.8,
     errors                     >= 1.4     && < 1.5,
     filepath                   >= 1.3     && < 1.4,
     hashable                   >= 1.1     && < 1.3,
     mtl                        >= 2.0     && < 2.2,
-    process                    >= 1.1     && < 1.2,
+    process                    >= 1.1     && < 1.3,
     random                     >= 1.0.1.0 && < 1.1,
-    statistics                               < 0.10.4,
+    statistics                 >= 0.11    && < 0.12,
     text                       >= 0.10    && < 1.2,
     time                       >= 1.1     && < 1.5,
     transformers               >= 0.2     && < 0.4,