diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright Vanessa McHale (c) 2018
+Copyright Vanessa McHale (c) 2018-2019
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
diff --git a/Setup.hs b/Setup.hs
deleted file mode 100644
--- a/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/cabal.project.local b/cabal.project.local
--- a/cabal.project.local
+++ b/cabal.project.local
@@ -1,2 +1,2 @@
-constraints: hspec-dirstream +development
+constraints: hspec-dirstream -development
 documentation: True
diff --git a/hspec-dirstream.cabal b/hspec-dirstream.cabal
--- a/hspec-dirstream.cabal
+++ b/hspec-dirstream.cabal
@@ -1,75 +1,76 @@
-cabal-version: 1.18
-name: hspec-dirstream
-version: 1.0.0.2
-license: BSD3
-license-file: LICENSE
-copyright: Copyright: (c) 2018 Vanessa McHale
-maintainer: vamchale@gmail.com
-author: Vanessa McHale
-homepage: https://hub.darcs.net/vmchale/hspec-dirstream
-synopsis: Helper functions to simplify adding integration tests.
+cabal-version:      1.18
+name:               hspec-dirstream
+version:            1.0.0.3
+license:            BSD3
+license-file:       LICENSE
+copyright:          Copyright: (c) 2018-2019 Vanessa McHale
+maintainer:         vamchale@gmail.com
+author:             Vanessa McHale
+homepage:           https://hub.darcs.net/vmchale/hspec-dirstream
+synopsis:           Helper functions to simplify adding integration tests.
 description:
     This package uses [hspec](http://hackage.haskell.org/package/hspec) and [dirstream](http://hackage.haskell.org/package/dirstream) to provide easy-to-use functions for integration tests.
-category: Testing, Development
-build-type: Simple
+
+category:           Testing, Development
+build-type:         Simple
 data-files:
     test/data/*.hs
     test/data/*.out
-extra-source-files:
-    stack.yaml
-    cabal.project.local
-extra-doc-files: README.md
 
+extra-source-files: cabal.project.local
+extra-doc-files:    README.md
+
 source-repository head
-    type: darcs
+    type:     darcs
     location: https://hub.darcs.net/vmchale/hspec-dirstream
 
 flag development
-    description:
-        Enable `-Werror`
-    default: False
-    manual: True
+    description: Enable `-Werror`
+    default:     False
+    manual:      True
 
 library
-    exposed-modules:
-        Test.Hspec.Dirstream
-    hs-source-dirs: src
+    exposed-modules:  Test.Hspec.Dirstream
+    hs-source-dirs:   src
     default-language: Haskell2010
-    ghc-options: -Wall
+    other-extensions:
+        FlexibleInstances GeneralizedNewtypeDeriving OverloadedStrings
+        StandaloneDeriving
+
+    ghc-options:      -Wall
     build-depends:
-        base >=4.9 && <5,
-        hspec -any,
-        dirstream -any,
-        pipes -any,
-        pipes-safe -any,
-        filepath -any,
-        hspec-core -any,
-        system-filepath -any,
-        text -any
-    
+        base >=4.9 && <4.16,
+        hspec,
+        dirstream,
+        pipes,
+        pipes-safe,
+        filepath,
+        hspec-core,
+        system-filepath,
+        text
+
     if flag(development)
         ghc-options: -Werror
-    
+
     if impl(ghc >=8.0)
-        ghc-options: -Wincomplete-uni-patterns -Wincomplete-record-updates
-                     -Wcompat
+        ghc-options:
+            -Wincomplete-uni-patterns -Wincomplete-record-updates -Wcompat
 
 test-suite hspec-dirstream-test
-    type: exitcode-stdio-1.0
-    main-is: Spec.hs
-    hs-source-dirs: test
+    type:             exitcode-stdio-1.0
+    main-is:          Spec.hs
+    hs-source-dirs:   test
     default-language: Haskell2010
-    ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall
+    ghc-options:      -threaded -rtsopts -with-rtsopts=-N -Wall
     build-depends:
-        base -any,
-        hspec-dirstream -any,
-        hspec -any
-    
+        base,
+        hspec-dirstream,
+        hspec
+
     if flag(development)
-        
         if impl(ghc >=8.0)
             ghc-options: -Werror
-    
+
     if impl(ghc >=8.0)
-        ghc-options: -Wincomplete-uni-patterns -Wincomplete-record-updates
-                     -Wcompat
+        ghc-options:
+            -Wincomplete-uni-patterns -Wincomplete-record-updates -Wcompat
diff --git a/src/Test/Hspec/Dirstream.hs b/src/Test/Hspec/Dirstream.hs
--- a/src/Test/Hspec/Dirstream.hs
+++ b/src/Test/Hspec/Dirstream.hs
@@ -47,7 +47,7 @@
 hasExtension = flip F.hasExtension
 
 mapS :: (a -> SpecM () ()) -> Proxy () a y' y (SafeT (SpecM ())) r
-mapS = P.mapM_ . (lift .)
+mapS act = P.mapM_ (\x -> lift (act x))
 
 type SafeSpecM = SafeT (SpecM ())
 type Recursor = F.FilePath -> ListT SafeSpecM F.FilePath
diff --git a/stack.yaml b/stack.yaml
deleted file mode 100644
--- a/stack.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-resolver: lts-10.2
-packages:
-  - '.'
-extra-deps:
-  - dirstream-1.0.3
-flags:
-  hspec-dirstream:
-    development: true
-extra-package-dbs: []