diff --git a/antiope-optparse-applicative.cabal b/antiope-optparse-applicative.cabal
--- a/antiope-optparse-applicative.cabal
+++ b/antiope-optparse-applicative.cabal
@@ -1,53 +1,54 @@
-cabal-version:        2.2
-name:                 antiope-optparse-applicative
-version:              7.3.2
-synopsis:             Please see the README on Github at <https://github.com/arbor/antiope#readme>
-description:          Please see the README on Github at <https://github.com/arbor/antiope#readme>.
-category:             Services
-homepage:             https://github.com/arbor/antiope#readme
-bug-reports:          https://github.com/arbor/antiope/issues
-author:               Arbor Networks
-maintainer:           mayhem@arbor.net
-copyright:            Arbor Networks
-license:              MIT
-license-file:         LICENSE
-build-type:           Simple
-extra-source-files:
-    README.md
-    ChangeLog.md
+cabal-version: 2.4
 
+name:                   antiope-optparse-applicative
+version:                7.3.3
+synopsis:               Please see the README on Github at <https://github.com/arbor/antiope#readme>
+description:            Please see the README on Github at <https://github.com/arbor/antiope#readme>.
+category:               Services
+homepage:               https://github.com/arbor/antiope#readme
+bug-reports:            https://github.com/arbor/antiope/issues
+author:                 Arbor Networks
+maintainer:             mayhem@arbor.net
+copyright:              Arbor Networks
+license:                MIT
+license-file:           LICENSE
+build-type:             Simple
+extra-source-files:     README.md
+                        ChangeLog.md
+
 source-repository head
   type: git
   location: https://github.com/arbor/antiope
 
+common base     { build-depends:  base      >= 4.7    && < 5 }
+
+common config
+  default-language:     Haskell2010
+  ghc-options:          -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints
+
 library
+  import:               base, config
   hs-source-dirs:       src
   default-extensions:   BangPatterns GeneralizedNewtypeDeriving OverloadedStrings TupleSections
-  ghc-options:          -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints -msse4.2
-  default-language:     Haskell2010
-  exposed-modules:
-      Antiope.Options.Applicative
-  build-depends:
-      base                  >= 4.7          && < 5
-    , amazonka              >= 1.6
-    , amazonka-core         >= 1.6
-    , amazonka-s3           >= 1.6
-    , optparse-applicative  >= 0.14.3.0     && < 0.15
-    , text
+  exposed-modules:      Antiope.Options.Applicative
+  build-depends:        amazonka              >= 1.6.1
+                      , amazonka-core         >= 1.6.1
+                      , amazonka-s3           >= 1.6.1
+                      , optparse-applicative  >= 0.14.3.0     && < 0.15
+                      , text
 
 test-suite antiope-optparse-applicative-test
-  type:                   exitcode-stdio-1.0
-  main-is:                Spec.hs
-  hs-source-dirs:         test
-  default-extensions:     BangPatterns GeneralizedNewtypeDeriving OverloadedStrings TupleSections
-  ghc-options:            -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints -msse4.2 -threaded -rtsopts -with-rtsopts=-N
-  default-language:       Haskell2010
-  build-depends:
-      base                  >= 4.7          && < 5
-    , aeson
-    , amazonka              >= 1.6
-    , amazonka-core         >= 1.6
-    , amazonka-s3           >= 1.6
-    , hedgehog              >= 0.5          && <0.7
-    , hspec                 >= 2.4          && <2.7
-    , hw-hspec-hedgehog     >= 0.1          && <0.3
+  import:               base, config
+  type:                 exitcode-stdio-1.0
+  main-is:              Spec.hs
+  hs-source-dirs:       test
+  default-extensions:   BangPatterns GeneralizedNewtypeDeriving OverloadedStrings TupleSections
+  ghc-options:          -threaded -rtsopts -with-rtsopts=-N
+  build-tool-depends:   hspec-discover:hspec-discover
+  build-depends:        aeson
+                      , amazonka              >= 1.6.1
+                      , amazonka-core         >= 1.6.1
+                      , amazonka-s3           >= 1.6.1
+                      , hedgehog              >= 0.5          && <0.7
+                      , hspec                 >= 2.4          && <2.7
+                      , hw-hspec-hedgehog     >= 0.1          && <0.3