diff --git a/hasql-th.cabal b/hasql-th.cabal
--- a/hasql-th.cabal
+++ b/hasql-th.cabal
@@ -1,8 +1,8 @@
 cabal-version: 3.0
-name:          hasql-th
-version:       0.4.0.20
-category:      Hasql, Database, PostgreSQL, Template Haskell
-synopsis:      Template Haskell utilities for Hasql
+name: hasql-th
+version: 0.4.0.21
+category: Hasql, Database, PostgreSQL, Template Haskell
+synopsis: Template Haskell utilities for Hasql
 description:
   Extension-library for Hasql,
   bringing compile-time syntax checking,
@@ -11,23 +11,21 @@
   .
   For details please see <https://github.com/nikita-volkov/hasql-th the readme>.
 
-homepage:      https://github.com/nikita-volkov/hasql-th
-bug-reports:   https://github.com/nikita-volkov/hasql-th/issues
-author:        Nikita Volkov <nikita.y.volkov@mail.ru>
-maintainer:    Nikita Volkov <nikita.y.volkov@mail.ru>
-copyright:     (c) 2015, Nikita Volkov
-license:       MIT
-license-file:  LICENSE
+homepage: https://github.com/nikita-volkov/hasql-th
+bug-reports: https://github.com/nikita-volkov/hasql-th/issues
+author: Nikita Volkov <nikita.y.volkov@mail.ru>
+maintainer: Nikita Volkov <nikita.y.volkov@mail.ru>
+copyright: (c) 2015, Nikita Volkov
+license: MIT
+license-file: LICENSE
 
 source-repository head
-  type:     git
+  type: git
   location: git://github.com/nikita-volkov/hasql-th.git
 
 library
-  hs-source-dirs:     library
+  hs-source-dirs: library
   default-extensions:
-    NoImplicitPrelude
-    NoMonomorphismRestriction
     ApplicativeDo
     Arrows
     BangPatterns
@@ -51,6 +49,8 @@
     MagicHash
     MultiParamTypeClasses
     MultiWayIf
+    NoImplicitPrelude
+    NoMonomorphismRestriction
     OverloadedStrings
     ParallelListComp
     PatternGuards
@@ -65,8 +65,8 @@
     TypeOperators
     UnboxedTuples
 
-  default-language:   Haskell2010
-  exposed-modules:    Hasql.TH
+  default-language: Haskell2010
+  exposed-modules: Hasql.TH
   other-modules:
     Hasql.TH.Construction.Exp
     Hasql.TH.Extraction.ChildExprList
@@ -78,15 +78,15 @@
     Hasql.TH.Prelude
 
   build-depends:
-    , base >=4.11 && <5
-    , bytestring >=0.10 && <0.13
-    , containers >=0.6 && <0.8
-    , contravariant >=1.5.2 && <2
-    , foldl >=1.4.5 && <2
-    , hasql >=1.4 && <1.8
-    , postgresql-syntax >=0.4.1 && <0.5
-    , template-haskell >=2.8 && <3
-    , template-haskell-compat-v0208 >=0.1.9 && <2
-    , text >=1 && <3
-    , uuid >=1.3 && <2
-    , vector >=0.12 && <0.14
+    base >=4.11 && <5,
+    bytestring >=0.10 && <0.13,
+    containers >=0.6 && <0.8,
+    contravariant >=1.5.2 && <2,
+    foldl >=1.4.5 && <2,
+    hasql >=1.4 && <1.8,
+    postgresql-syntax >=0.4.1 && <0.5,
+    template-haskell >=2.8 && <3,
+    template-haskell-compat-v0208 >=0.1.9 && <2,
+    text >=1 && <3,
+    uuid >=1.3 && <2,
+    vector >=0.12 && <0.14,
diff --git a/library/Hasql/TH.hs b/library/Hasql/TH.hs
--- a/library/Hasql/TH.hs
+++ b/library/Hasql/TH.hs
@@ -106,8 +106,6 @@
 
 import qualified Data.Text as Text
 import qualified Data.Text.Encoding as Text
-import Data.Vector (Vector)
-import Hasql.Statement (Statement)
 import qualified Hasql.TH.Construction.Exp as Exp
 import qualified Hasql.TH.Extraction.Exp as ExpExtraction
 import Hasql.TH.Prelude hiding (exp)
diff --git a/library/Hasql/TH/Construction/Exp.hs b/library/Hasql/TH/Construction/Exp.hs
--- a/library/Hasql/TH/Construction/Exp.hs
+++ b/library/Hasql/TH/Construction/Exp.hs
@@ -4,12 +4,11 @@
 
 import qualified Data.ByteString as ByteString
 import qualified Data.ByteString.Unsafe as ByteString
-import qualified Data.List.NonEmpty as NonEmpty
 import qualified Data.Vector.Generic as Vector
 import qualified Hasql.Decoders as Decoders
 import qualified Hasql.Encoders as Encoders
 import qualified Hasql.Statement as Statement
-import Hasql.TH.Prelude hiding (list, sequence_, string)
+import Hasql.TH.Prelude hiding (sequence_)
 import qualified Hasql.TH.Prelude as Prelude
 import Language.Haskell.TH.Syntax
 import qualified TemplateHaskell.Compat.V0208 as Compat
diff --git a/library/Hasql/TH/Extraction/ChildExprList.hs b/library/Hasql/TH/Extraction/ChildExprList.hs
--- a/library/Hasql/TH/Extraction/ChildExprList.hs
+++ b/library/Hasql/TH/Extraction/ChildExprList.hs
@@ -1,3 +1,5 @@
+{-# OPTIONS_GHC -Wno-missing-signatures #-}
+
 module Hasql.TH.Extraction.ChildExprList where
 
 import Hasql.TH.Prelude hiding (bit, fromList, sortBy)
diff --git a/library/Hasql/TH/Extraction/OutputTypeList.hs b/library/Hasql/TH/Extraction/OutputTypeList.hs
--- a/library/Hasql/TH/Extraction/OutputTypeList.hs
+++ b/library/Hasql/TH/Extraction/OutputTypeList.hs
@@ -1,3 +1,5 @@
+{-# OPTIONS_GHC -Wno-missing-signatures #-}
+
 -- |
 -- AST traversal extracting output types.
 module Hasql.TH.Extraction.OutputTypeList where
diff --git a/library/Hasql/TH/Extraction/PlaceholderTypeMap.hs b/library/Hasql/TH/Extraction/PlaceholderTypeMap.hs
--- a/library/Hasql/TH/Extraction/PlaceholderTypeMap.hs
+++ b/library/Hasql/TH/Extraction/PlaceholderTypeMap.hs
@@ -1,3 +1,5 @@
+{-# OPTIONS_GHC -Wno-missing-signatures #-}
+
 module Hasql.TH.Extraction.PlaceholderTypeMap where
 
 import qualified Data.IntMap.Strict as IntMap
diff --git a/library/Hasql/TH/Extraction/PrimitiveType.hs b/library/Hasql/TH/Extraction/PrimitiveType.hs
--- a/library/Hasql/TH/Extraction/PrimitiveType.hs
+++ b/library/Hasql/TH/Extraction/PrimitiveType.hs
@@ -1,3 +1,5 @@
+{-# OPTIONS_GHC -Wno-missing-signatures #-}
+
 module Hasql.TH.Extraction.PrimitiveType where
 
 import Hasql.TH.Prelude hiding (bit, fromList, sortBy)