diff --git a/mappings.cabal b/mappings.cabal
--- a/mappings.cabal
+++ b/mappings.cabal
@@ -1,11 +1,11 @@
 cabal-version: 2.2
 
--- This file has been generated from package.yaml by hpack version 0.36.0.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           mappings
-version:        0.3.1.0
+version:        0.3.2.0
 synopsis:       Types which represent functions k -> v
 description:    A typeclass and a number of implementations; please read README.md on github
 category:       Data structures
@@ -13,7 +13,7 @@
 bug-reports:    https://github.com/jcranch/mapping/issues
 author:         James Cranch
 maintainer:     j.d.cranch@sheffield.ac.uk
-copyright:      2023-24 James Cranch
+copyright:      2023-25 James Cranch
 license:        BSD-3-Clause
 build-type:     Simple
 extra-doc-files:
@@ -40,12 +40,12 @@
       src
   ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints
   build-depends:
-      base >=4.16 && <4.21
+      base >=4.16 && <4.22
     , cond >=0.5.1 && <0.6
-    , containers >=0.6.5 && <0.8
+    , containers >=0.6.5 && <0.9
     , formatting >=7.0.0 && <7.3
     , indexed-traversable >=0.1.1 && <0.2
-    , partialord >=0.0.2 && <0.1
+    , partialord ==0.1.*
   default-language: GHC2021
 
 executable view
@@ -58,13 +58,13 @@
       examples
   ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
   build-depends:
-      base >=4.16 && <4.21
+      base >=4.16 && <4.22
     , cond >=0.5.1 && <0.6
-    , containers >=0.6.5 && <0.8
+    , containers >=0.6.5 && <0.9
     , formatting >=7.0.0 && <7.3
     , indexed-traversable >=0.1.1 && <0.2
     , mappings
-    , partialord >=0.0.2 && <0.1
+    , partialord ==0.1.*
   default-language: GHC2021
 
 test-suite mapping
@@ -83,12 +83,12 @@
   build-tool-depends:
       hspec-discover:hspec-discover ==2.11.*
   build-depends:
-      base >=4.16 && <4.21
+      base >=4.16 && <4.22
     , cond >=0.5.1 && <0.6
-    , containers >=0.6.5 && <0.8
+    , containers >=0.6.5 && <0.9
     , formatting >=7.0.0 && <7.3
     , hspec ==2.11.*
     , indexed-traversable >=0.1.1 && <0.2
     , mappings
-    , partialord >=0.0.2 && <0.1
+    , partialord ==0.1.*
   default-language: GHC2021
diff --git a/src/Data/Mapping/MapWithDefault.hs b/src/Data/Mapping/MapWithDefault.hs
--- a/src/Data/Mapping/MapWithDefault.hs
+++ b/src/Data/Mapping/MapWithDefault.hs
@@ -1,20 +1,14 @@
 {-# LANGUAGE
-      CPP,
       DerivingVia
   #-}
 
 module Data.Mapping.MapWithDefault where
 
-#if MIN_VERSION_GLASGOW_HASKELL(9,6,0,0)
-#else
-import Control.Applicative (liftA2)
-#endif
+import Prelude hiding (Applicative(..), Foldable(..))
+import Control.Applicative (Applicative(..))
 import Data.Algebra.Boolean
-#if MIN_VERSION_GLASGOW_HASKELL(9,10,0,0)
+import Data.Foldable (Foldable(..))
 import Data.List (groupBy)
-#else
-import Data.List (foldl', groupBy)
-#endif
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as M
 import qualified Data.Map.Merge.Strict as M