8 files changed, 12 insertions, 15 deletions
diff --git a/src/Data/Array/Mixed/Permutation.hs b/src/Data/Array/Mixed/Permutation.hs
index 8efcbe8..cedfa22 100644
--- a/src/Data/Array/Mixed/Permutation.hs
+++ b/src/Data/Array/Mixed/Permutation.hs
@@ -85,7 +85,7 @@ permCheckPermutation = \p k ->
 
     provePerm1 :: Proxy isTop -> SNat (Rank isTop) -> Perm is'
                -> Maybe (AllElem' is' (Count 0 (Rank isTop)) :~: True)
-    provePerm1 _ _ PNil = Just (Refl)
+    provePerm1 _ _ PNil = Just Refl
     provePerm1 p rtop@SNat (PCons sn@SNat perm)
       | Just Refl <- provePerm1 p rtop perm
       = case (cmpNat (SNat @0) sn, cmpNat sn rtop) of
diff --git a/src/Data/Array/Mixed/Shape.hs b/src/Data/Array/Mixed/Shape.hs
index 0b6d390..3f1f58e 100644
--- a/src/Data/Array/Mixed/Shape.hs
+++ b/src/Data/Array/Mixed/Shape.hs
@@ -557,7 +557,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 sh = withDict @(KnownShX sh) sh
+withKnownShX = withDict @(KnownShX sh)
 
 
 -- * Flattening
diff --git a/src/Data/Array/Mixed/Types.hs b/src/Data/Array/Mixed/Types.hs
index 3f5b1e7..e97690f 100644
--- a/src/Data/Array/Mixed/Types.hs
+++ b/src/Data/Array/Mixed/Types.hs
@@ -54,7 +54,7 @@ sameNat' :: SNat n -> SNat m -> Maybe (n :~: m)
 sameNat' n@SNat m@SNat = sameNat n m
 
 pattern SZ :: () => (n ~ 0) => SNat n
-pattern SZ <- ((\sn -> testEquality sn (SNat @0)) -> Just Refl)
+pattern SZ <- (\sn -> testEquality sn (SNat @0) -> Just Refl)
   where SZ = SNat
 
 pattern SS :: forall np1. () => forall n. (n + 1 ~ np1) => SNat n -> SNat np1
diff --git a/src/Data/Array/Mixed/XArray.hs b/src/Data/Array/Mixed/XArray.hs
index 3680930..681b8db 100644
--- a/src/Data/Array/Mixed/XArray.hs
+++ b/src/Data/Array/Mixed/XArray.hs
@@ -5,7 +5,6 @@
 {-# LANGUAGE ImportQualifiedPost #-}
 {-# LANGUAGE NoStarIsType #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE StandaloneKindSignatures #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TypeApplications #-}
@@ -93,7 +92,7 @@ replicate sh ssh' (XArray arr)
   , Dict <- lemKnownNatRankSSX (ssxAppend (ssxFromShape sh) ssh')
   , Refl <- lemRankApp (ssxFromShape sh) ssh'
   = XArray (S.stretch (shxToList sh ++ S.shapeL arr) $
-            S.reshape (map (const 1) (shxToList sh) ++ S.shapeL arr) $
+            S.reshape (map (const 1) (shxToList sh) ++ S.shapeL arr)
               arr)
 
 replicateScal :: forall sh a. Storable a => IShX sh -> a -> XArray sh a
@@ -169,7 +168,7 @@ rerank :: forall sh sh1 sh2 a b.
 rerank ssh ssh1 ssh2 f xarr@(XArray arr)
   | Dict <- lemKnownNatRankSSX (ssxAppend ssh ssh2)
   = let (sh, _) = shxSplitApp (Proxy @sh1) ssh (shape (ssxAppend ssh ssh1) xarr)
-    in if any (== 0) (shxToList sh)
+    in if elem 0 (shxToList sh)
          then XArray (S.fromList (shxToList (shxAppend sh (shxCompleteZeros ssh2))) [])
          else case () of
            () | Dict <- lemKnownNatRankSSX ssh
@@ -196,7 +195,7 @@ rerank2 :: forall sh sh1 sh2 a b c.
 rerank2 ssh ssh1 ssh2 f xarr1@(XArray arr1) (XArray arr2)
   | Dict <- lemKnownNatRankSSX (ssxAppend ssh ssh2)
   = let (sh, _) = shxSplitApp (Proxy @sh1) ssh (shape (ssxAppend ssh ssh1) xarr1)
-    in if any (== 0) (shxToList sh)
+    in if elem 0 (shxToList sh)
          then XArray (S.fromList (shxToList (shxAppend sh (shxCompleteZeros ssh2))) [])
          else case () of
            () | Dict <- lemKnownNatRankSSX ssh
@@ -270,7 +269,7 @@ sumInner ssh ssh' arr
     in go $
        transpose2 ssh'F ssh $
        reshapePartial ssh' ssh sh'F $
-       transpose2 ssh ssh' $
+       transpose2 ssh ssh'
          arr
 
 sumOuter :: forall sh sh' a. (Storable a, NumElt a)
@@ -281,7 +280,7 @@ sumOuter ssh ssh' arr
         shF = shxFlatten sh :$% ZSX
     in sumInner ssh' (ssxFromShape shF) $
        transpose2 (ssxFromShape shF) ssh' $
-       reshapePartial ssh ssh' shF $
+       reshapePartial ssh ssh' shF
          arr
 
 fromListOuter :: forall n sh a. Storable a
diff --git a/src/Data/Array/Nested/Internal/Mixed.hs b/src/Data/Array/Nested/Internal/Mixed.hs
index 1d4181e..4271526 100644
--- a/src/Data/Array/Nested/Internal/Mixed.hs
+++ b/src/Data/Array/Nested/Internal/Mixed.hs
@@ -543,7 +543,7 @@ instance Elt a => Elt (Mixed sh' a) where
     = fst (shxSplitApp (Proxy @sh') (ssxFromShape 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)
@@ -858,7 +858,7 @@ msliceU :: Elt a => Int -> Int -> Mixed (Nothing : sh) a -> Mixed (Nothing : sh)
 msliceU i n arr = mlift (ssxFromShape (mshape arr)) (\_ -> X.sliceU i n) arr
 
 mrev1 :: Elt a => Mixed (n : sh) a -> Mixed (n : sh) a
-mrev1 arr = mlift (ssxFromShape (mshape arr)) (\_ -> X.rev1) arr
+mrev1 arr = mlift (ssxFromShape (mshape arr)) (const X.rev1) arr
 
 mreshape :: forall sh sh' a. Elt a => IShX sh' -> Mixed sh a -> Mixed sh' a
 mreshape sh' arr =
diff --git a/src/Data/Array/Nested/Internal/Ranked.hs b/src/Data/Array/Nested/Internal/Ranked.hs
index 045b2ef..1d076e8 100644
--- a/src/Data/Array/Nested/Internal/Ranked.hs
+++ b/src/Data/Array/Nested/Internal/Ranked.hs
@@ -3,7 +3,6 @@
 {-# LANGUAGE DerivingVia #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE ImportQualifiedPost #-}
 {-# LANGUAGE InstanceSigs #-}
 {-# LANGUAGE PolyKinds #-}
diff --git a/src/Data/Array/Nested/Internal/Shape.hs b/src/Data/Array/Nested/Internal/Shape.hs
index e65164b..e9e0103 100644
--- a/src/Data/Array/Nested/Internal/Shape.hs
+++ b/src/Data/Array/Nested/Internal/Shape.hs
@@ -690,7 +690,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 sh = withDict @(KnownShS sh) sh
+withKnownShS = withDict @(KnownShS sh)
 
 shsKnownShS :: ShS sh -> Dict KnownShS sh
 shsKnownShS ZSS = Dict
diff --git a/src/Data/Array/Nested/Internal/Shaped.hs b/src/Data/Array/Nested/Internal/Shaped.hs
index cd69daa..109fb70 100644
--- a/src/Data/Array/Nested/Internal/Shaped.hs
+++ b/src/Data/Array/Nested/Internal/Shaped.hs
@@ -3,7 +3,6 @@
 {-# LANGUAGE DerivingVia #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE ImportQualifiedPost #-}
 {-# LANGUAGE InstanceSigs #-}
 {-# LANGUAGE RankNTypes #-}
@@ -423,7 +422,7 @@ sslice i n@SNat arr =
   in slift (n :$$ sh) (\_ -> X.slice i n) arr
 
 srev1 :: Elt a => Shaped (n : sh) a -> Shaped (n : sh) a
-srev1 arr = slift (sshape arr) (\_ -> X.rev1) arr
+srev1 arr = slift (sshape arr) (const X.rev1) arr
 
 sreshape :: (Elt a, Product sh ~ Product sh') => ShS sh' -> Shaped sh a -> Shaped sh' a
 sreshape sh' (Shaped arr) = Shaped (mreshape (shCvtSX sh') arr)