diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,4 +1,4 @@
-import           Language.ATS.Package
+import           Distribution.ATS
 
 main :: IO ()
 main = atsPolyglotBuild
diff --git a/atspkg.dhall b/atspkg.dhall
--- a/atspkg.dhall
+++ b/atspkg.dhall
@@ -1,4 +1,4 @@
-let prelude = https://raw.githubusercontent.com/vmchale/atspkg/master/dhall/atspkg-prelude.dhall
+let prelude = https://raw.githubusercontent.com/vmchale/atspkg/master/ats-pkg/dhall/atspkg-prelude.dhall
 
 in prelude.default //
   { libraries =
@@ -7,6 +7,7 @@
       { name = "storable"
       , src = [ "ats-src/combinatorics.dats", "ats-src/number-theory.dats", "ats-src/numerics.dats" ]
       , libTarget = "dist-newstyle/lib/libnumbertheory.a"
+      , static = True
       }
     ]
   , compiler = [0,3,8]
diff --git a/fast-arithmetic.cabal b/fast-arithmetic.cabal
--- a/fast-arithmetic.cabal
+++ b/fast-arithmetic.cabal
@@ -1,84 +1,101 @@
-name:                fast-arithmetic
-version:             0.3.3.1
-synopsis:            Fast functions on integers.
-description:         Fast functions for number theory and combinatorics with a high level of safety guaranteed by [ATS](http://www.ats-lang.org/).
-homepage:            https://github.com/vmchale/fast-arithmetic#readme
-license:             BSD3
-license-file:        LICENSE
-author:              Vanessa McHale
-maintainer:          vamchale@gmail.com
-copyright:           Copyright: (c) 2018 Vanessa McHale
-category:            Numerics, Math, Algorithms, Number Theory, Combinatorics, FFI, ATS
-build-type:          Custom
-extra-source-files:  ats-src/*.dats
-                   , atspkg.dhall
-                   , dist-newstyle/lib/empty
-extra-doc-files:     README.md
-cabal-version:       1.18
-
-Flag development {
-  Description: Enable `-Werror` and don't clean ATS libraries between builds.
-  manual: True
-  default: False
-}
+cabal-version: 1.18
+name: fast-arithmetic
+version: 0.3.3.2
+license: BSD3
+license-file: LICENSE
+copyright: Copyright: (c) 2018 Vanessa McHale
+maintainer: vamchale@gmail.com
+author: Vanessa McHale
+homepage: https://github.com/vmchale/fast-arithmetic#readme
+synopsis: Fast functions on integers.
+description:
+    Fast functions for number theory and combinatorics with a high level of safety guaranteed by [ATS](http://www.ats-lang.org/).
+category: Numerics, Math, Algorithms, Number Theory, Combinatorics, FFI, ATS
+build-type: Custom
+extra-source-files:
+    ats-src/*.dats
+    atspkg.dhall
+    dist-newstyle/lib/empty
+extra-doc-files: README.md
 
 custom-setup
-  setup-depends:   base
-                 , ats-pkg >= 2.6.1.0
-                 , Cabal
+    setup-depends: base -any,
+                   Cabal -any,
+                   ats-pkg >= 2.7.0.0
 
+source-repository head
+    type: git
+    location: git@github.com:vmchale/fast-arithmetic.git
+
+flag development
+    description:
+        Enable `-Werror` and don't clean ATS libraries between builds.
+    default: False
+    manual: True
+
 library
-  hs-source-dirs:      src
-  extra-libraries:     numbertheory
-  extra-lib-dirs:      dist-newstyle/lib
-  exposed-modules:     Numeric.Pure
-                     , Numeric.Integer
-                     , Numeric.NumberTheory
-                     , Numeric.Combinatorics
-  other-modules:       Numeric.Common
-  build-depends:       base >= 4.10 && < 5
-                     , composition-prelude
-                     , gmpint
-  default-language:    Haskell2010
-  if flag(development)
-    ghc-options:       -Werror
-  if impl(ghc >= 8.0)
-    ghc-options:       -Wincomplete-uni-patterns -Wincomplete-record-updates -Wcompat
-  ghc-options:         -Wall -optc-mtune=native -optc-flto -optc-O3
+    exposed-modules:
+        Numeric.Pure
+        Numeric.Integer
+        Numeric.NumberTheory
+        Numeric.Combinatorics
+    hs-source-dirs: src
+    other-modules:
+        Numeric.Common
+    default-language: Haskell2010
+    extra-libraries:
+        numbertheory
+    extra-lib-dirs: dist-newstyle/lib
+    ghc-options: -Wall -optc-mtune=native -optc-flto -optc-O3
+    build-depends:
+        base >=4.10 && <5,
+        composition-prelude -any,
+        gmpint -any
+    
+    if flag(development)
+        ghc-options: -Werror
+    
+    if impl(ghc >=8.0)
+        ghc-options: -Wincomplete-uni-patterns -Wincomplete-record-updates
+                     -Wcompat
 
 test-suite fast-arithmetic-test
-  type:                exitcode-stdio-1.0
-  hs-source-dirs:      test
-  main-is:             Spec.hs
-  build-depends:       base
-                     , fast-arithmetic
-                     , hspec
-                     , QuickCheck
-                     , arithmoi
-                     , combinat
-  if flag(development)
-    ghc-options: -Werror
-  if impl(ghc >= 8.0)
-    ghc-options:       -Wincomplete-uni-patterns -Wincomplete-record-updates -Wcompat 
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N -Wall
-  default-language:    Haskell2010
+    type: exitcode-stdio-1.0
+    main-is: Spec.hs
+    hs-source-dirs: test
+    default-language: Haskell2010
+    ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall
+    build-depends:
+        base -any,
+        fast-arithmetic -any,
+        hspec -any,
+        QuickCheck -any,
+        arithmoi -any,
+        combinat -any
+    
+    if flag(development)
+        ghc-options: -Werror
+    
+    if impl(ghc >=8.0)
+        ghc-options: -Wincomplete-uni-patterns -Wincomplete-record-updates
+                     -Wcompat
 
 benchmark fast-arithmetic-bench
-  type:                exitcode-stdio-1.0
-  hs-source-dirs:      bench
-  main-is:             Bench.hs
-  build-depends:       base
-                     , fast-arithmetic
-                     , criterion
-                     , arithmoi
-                     , combinat
-  if flag(development)
-    ghc-options: -Werror
-  if impl(ghc >= 8.0)
-    ghc-options:       -Wincomplete-uni-patterns -Wincomplete-record-updates -Wcompat
-  ghc-options:         -Wall
-  default-language:    Haskell2010
-
-source-repository head
-  type:     git
-  location: git@github.com:vmchale/fast-arithmetic.git
+    type: exitcode-stdio-1.0
+    main-is: Bench.hs
+    hs-source-dirs: bench
+    default-language: Haskell2010
+    ghc-options: -Wall
+    build-depends:
+        base -any,
+        fast-arithmetic -any,
+        criterion -any,
+        arithmoi -any,
+        combinat -any
+    
+    if flag(development)
+        ghc-options: -Werror
+    
+    if impl(ghc >=8.0)
+        ghc-options: -Wincomplete-uni-patterns -Wincomplete-record-updates
+                     -Wcompat