7 files changed, 15 insertions, 14 deletions
diff --git a/src/Data/Array/Nested/Mixed.hs b/src/Data/Array/Nested/Mixed.hs
index a6e94b6..144230e 100644
--- a/src/Data/Array/Nested/Mixed.hs
+++ b/src/Data/Array/Nested/Mixed.hs
@@ -555,7 +555,7 @@ instance Elt a => Elt (Mixed sh' a) where
     = fst (shxSplitApp (Proxy @sh') (ssxFromShX sh) (mshape arr))
 
   mindex :: Mixed sh (Mixed sh' a) -> IIxX sh -> Mixed sh' a
-  mindex (M_Nest _ arr) i = mindexPartial arr i
+  mindex (M_Nest _ arr) = mindexPartial arr
 
   mindexPartial :: forall sh1 sh2.
                    Mixed (sh1 ++ sh2) (Mixed sh' a) -> IIxX sh1 -> Mixed sh2 (Mixed sh' a)
@@ -833,7 +833,7 @@ mrerankP ssh sh2 f (M_Primitive sh arr) =
                            (\a -> let M_Primitive _ r = f (M_Primitive sh1 a) in r)
                            arr)
 
--- | See the caveats at @X.rerank@.
+-- | See the caveats at 'Data.Array.XArray.rerank'.
 mrerank :: forall sh1 sh2 sh a b. (PrimElt a, PrimElt b)
         => StaticShX sh -> IShX sh2
         -> (Mixed sh1 a -> Mixed sh2 b)
diff --git a/src/Data/Array/Nested/Mixed/Shape.hs b/src/Data/Array/Nested/Mixed/Shape.hs
index e63277f..852dd5e 100644
--- a/src/Data/Array/Nested/Mixed/Shape.hs
+++ b/src/Data/Array/Nested/Mixed/Shape.hs
@@ -590,7 +590,7 @@ instance (KnownNat n, KnownShX sh) => KnownShX (Just n : sh) where knownShX = SK
 instance KnownShX sh => KnownShX (Nothing : sh) where knownShX = SUnknown () :!% knownShX
 
 withKnownShX :: forall sh r. StaticShX sh -> (KnownShX sh => r) -> r
-withKnownShX k = withDict @(KnownShX sh) k
+withKnownShX = withDict @(KnownShX sh)
 
 
 -- * Flattening
diff --git a/src/Data/Array/Nested/Permutation.hs b/src/Data/Array/Nested/Permutation.hs
index 1f90dc5..03d1640 100644
--- a/src/Data/Array/Nested/Permutation.hs
+++ b/src/Data/Array/Nested/Permutation.hs
@@ -24,6 +24,7 @@ import Data.Proxy
 import Data.Type.Bool
 import Data.Type.Equality
 import Data.Type.Ord
+import GHC.Exts (withDict)
 import GHC.TypeError
 import GHC.TypeLits
 import GHC.TypeNats qualified as TN
@@ -35,8 +36,8 @@ import Data.Array.Nested.Types
 -- * Permutations
 
 -- | A "backward" permutation of a dimension list. The operation on the
--- dimension list is most similar to 'Data.Vector.backpermute'; see 'Permute'
--- for code that implements this.
+-- dimension list is most similar to @backpermute@ in the @vector@ package; see
+-- 'Permute' for code that implements this.
 data Perm list where
   PNil :: Perm '[]
   PCons :: SNat a -> Perm l -> Perm (a : l)
@@ -125,6 +126,9 @@ class KnownPerm l where makePerm :: Perm l
 instance KnownPerm '[] where makePerm = PNil
 instance (KnownNat n, KnownPerm l) => KnownPerm (n : l) where makePerm = natSing `PCons` makePerm
 
+withKnownPerm :: forall l r. Perm l -> (KnownPerm l => r) -> r
+withKnownPerm = withDict @(KnownPerm l)
+
 -- | Untyped permutations for ranked arrays
 type PermR = [Int]
 
@@ -230,7 +234,7 @@ permInverse = \perm k ->
                ++ " ; invperm = " ++ show invperm)
       (permCheckPermutation invperm
         (k invperm
-           (\ssh -> case provePermInverse perm invperm ssh of
+           (\ssh -> case permCheckInverse perm invperm ssh of
                       Just eq -> eq
                       Nothing -> error $ "permInverse: did not generate inverse? perm = " ++ show perm
                                              ++ " ; invperm = " ++ show invperm)))
@@ -244,9 +248,9 @@ permInverse = \perm k ->
         toHList [] k = k PNil
         toHList (n : ns) k = toHList ns $ \l -> TN.withSomeSNat n $ \sn -> k (PCons sn l)
 
-    provePermInverse :: Perm is -> Perm is' -> StaticShX sh
+    permCheckInverse :: Perm is -> Perm is' -> StaticShX sh
                      -> Maybe (Permute is' (Permute is sh) :~: sh)
-    provePermInverse perm perminv ssh =
+    permCheckInverse perm perminv ssh =
       ssxEqType (ssxPermute perminv (ssxPermute perm ssh)) ssh
 
 type family MapSucc is where
diff --git a/src/Data/Array/Nested/Ranked.hs b/src/Data/Array/Nested/Ranked.hs
index 97b4c7c..9778c54 100644
--- a/src/Data/Array/Nested/Ranked.hs
+++ b/src/Data/Array/Nested/Ranked.hs
@@ -224,7 +224,7 @@ rrerankP sn sh2 f (Ranked arr)
 -- then:
 --
 -- @
--- rrerank _ _ _ f arr :: Ranked 5 Float
+-- rrerank _ _ _ f arr :: Ranked 6 Float
 -- @
 --
 -- and this result will have shape @[3, 0, 4, 0, 0, 0]@. Note that the
diff --git a/src/Data/Array/Nested/Shaped.hs b/src/Data/Array/Nested/Shaped.hs
index 2b0b6b5..198a068 100644
--- a/src/Data/Array/Nested/Shaped.hs
+++ b/src/Data/Array/Nested/Shaped.hs
@@ -191,6 +191,7 @@ srerankP sh sh2 f sarr@(Shaped arr)
                      (\a -> let Shaped r = f (Shaped a) in r)
                      arr)
 
+-- | See the caveats at 'Data.Array.XArray.rerank'.
 srerank :: forall sh1 sh2 sh a b. (PrimElt a, PrimElt b)
         => ShS sh -> ShS sh2
         -> (Shaped sh1 a -> Shaped sh2 b)
diff --git a/src/Data/Array/Nested/Shaped/Shape.hs b/src/Data/Array/Nested/Shaped/Shape.hs
index ab16422..5f9ba79 100644
--- a/src/Data/Array/Nested/Shaped/Shape.hs
+++ b/src/Data/Array/Nested/Shaped/Shape.hs
@@ -1,12 +1,9 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DeriveFoldable #-}
-{-# LANGUAGE DeriveFunctor #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GADTs #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE ImportQualifiedPost #-}
 {-# LANGUAGE NoStarIsType #-}
 {-# LANGUAGE PatternSynonyms #-}
@@ -370,7 +367,7 @@ instance KnownShS '[] where knownShS = ZSS
 instance (KnownNat n, KnownShS sh) => KnownShS (n : sh) where knownShS = natSing :$$ knownShS
 
 withKnownShS :: forall sh r. ShS sh -> (KnownShS sh => r) -> r
-withKnownShS k = withDict @(KnownShS sh) k
+withKnownShS = withDict @(KnownShS sh)
 
 shsKnownShS :: ShS sh -> Dict KnownShS sh
 shsKnownShS ZSS = Dict
diff --git a/src/Data/Array/Nested/Types.hs b/src/Data/Array/Nested/Types.hs
index df466cf..4444acd 100644
--- a/src/Data/Array/Nested/Types.hs
+++ b/src/Data/Array/Nested/Types.hs
@@ -6,7 +6,6 @@
 {-# LANGUAGE PolyKinds #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
-{-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE TypeFamilyDependencies #-}
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}