shorten more lambdas

29 files changed, 130 insertions, 164 deletions

diff --git a/testdata/Builtins.out b/testdata/Builtins.out
index 0595c3ef..01a4d378 100644
--- a/testdata/Builtins.out
+++ b/testdata/Builtins.out
@@ -6,7 +6,7 @@ data VecS (_ :: Type) :: Nat -> Type where
     V4 :: forall c . c -> c -> c -> c -> VecS c (fromInt 4)
 mapVec
   = (\(a :: _) (b :: _) -> case'VecS
-      (\_ -> \_ -> _ :: _)
+      (\_ _ -> _ :: _)
       (\(c :: _) (d :: _) -> _rhs (V2 (a c) (a d)))
       (\(e :: _) (f :: _) (g :: _) -> _rhs (V3 (a e) (a f) (a g)))
       (\(h :: _) (i :: _) (j :: _) (k :: _) -> _rhs (V4 (a h) (a i) (a j) (a k)))
@@ -76,9 +76,9 @@ data Mat :: Nat -> Nat -> Type -> Type where
           a
           (match'VecS
             (\_ -> _)
-            (\(b :: _) -> \_ -> _rhs b)
+            (\(b :: _) _ -> _rhs b)
             a
-            (match'Mat (\_ -> _) (\_ -> \_ (c :: _) -> _rhs c) a undefined)))))
+            (match'Mat (\_ -> _) (\_ _ (c :: _) -> _rhs c) a undefined)))))
     :: Type -> Type
 'Signed
   = (\(a :: _) -> match'Int
@@ -163,7 +163,7 @@ data Mat :: Nat -> Nat -> Type -> Type where
               (_rhs ('Empty "no instance of 'Component on ???")))))))
     :: Type -> Type
 zero
-  = (\ @a -> \ @_ -> match'Int
+  = (\ @a @_ -> match'Int
       (\_ -> _)
       (_rhs \(b := _rhs (fromInt 0 :: Int)) -> b)
       a
@@ -230,7 +230,7 @@ zero
             (match'Bool (\_ -> _) (_rhs \(u := _rhs False) -> u) a (_rhs undefined))))))
     :: forall v . Component v => v
 one
-  = (\ @a -> \ @_ -> match'Int
+  = (\ @a @_ -> match'Int
       (\_ -> _)
       (_rhs \(b := _rhs (fromInt 1 :: Int)) -> b)
       a
@@ -648,7 +648,7 @@ head
   = \(a :: _) -> case'List
     (\_ -> _ :: _)
     (_rhs undefined)
-    (\(b :: _) -> \_ -> _rhs b)
+    (\(b :: _) _ -> _rhs b)
     a
 ++
   = \(a :: _) (b :: _) -> case'List
@@ -718,7 +718,7 @@ data SimpleFragment (_ :: Type) :: Type where
     SimpleFragment :: forall a . Vec (fromInt 3) Float -> a -> SimpleFragment a
 'Fragment = \(a :: _) (b :: _) -> _rhs ('Vector a ('Maybe ('SimpleFragment b)))
 sFragmentCoords
-  = \(a :: _) -> case'SimpleFragment (\_ -> _ :: _) (\(b :: _) -> \_ -> _rhs b) a
+  = \(a :: _) -> case'SimpleFragment (\_ -> _ :: _) (\(b :: _) _ -> _rhs b) a
 sFragmentValue
   = \(a :: _) -> case'SimpleFragment (\_ -> _ :: _) (\_ (b :: _) -> _rhs b) a
 'FragmentStream = \(a :: _) (b :: _) -> _rhs ['Fragment a b]
@@ -768,7 +768,7 @@ data Swizz :: Type where
     Sw :: Swizz
 swizzscalar
   = (\(a :: _) (b :: _) -> case'VecS
-      (\_ -> \_ -> _ :: _)
+      (\_ _ -> _ :: _)
       (\(c :: _) (d :: _) -> case'Swizz
         (\_ -> _ :: _)
         (_rhs c)
@@ -794,10 +794,10 @@ swizzscalar
     :: forall (l :: _) (m :: _) . Vec m l -> Swizz -> l
 definedVec
   = (\(a :: _) -> case'VecS
-      (\_ -> \_ -> _ :: _)
-      (\_ -> \_ -> _rhs True)
-      (\_ -> \_ -> \_ -> _rhs True)
-      (\_ -> \_ -> \_ -> \_ -> _rhs True)
+      (\_ _ -> _ :: _)
+      (\_ _ -> _rhs True)
+      (\_ _ _ -> _rhs True)
+      (\_ _ _ _ -> _rhs True)
       a)
     :: forall (b :: _) (c :: _) . Vec c b -> Bool
 swizzvector
@@ -929,7 +929,7 @@ rasterizePrimitive
 rasterizePrimitives
   = \(a :: _) (b :: _) (c :: _) -> _rhs (concat (map (rasterizePrimitive b a) c))
 'ImageLC
-  = (\(a :: _) -> match'Image (\_ -> _) (\(b :: _) -> \_ -> _rhs b) a undefined)
+  = (\(a :: _) -> match'Image (\_ -> _) (\(b :: _) _ -> _rhs b) a undefined)
     :: Type -> Nat
 allSame
   = (\(a :: _) -> case'List
diff --git a/testdata/Internals.out b/testdata/Internals.out
index c55525d7..c76420ae 100644
--- a/testdata/Internals.out
+++ b/testdata/Internals.out
@@ -80,7 +80,7 @@ isEQ
             (_rhs ('Empty "no instance of 'Num on ???"))))))
     :: Type -> Type
 fromInt
-  = (\ @a -> \ @_ -> match'Int
+  = (\ @a @_ -> match'Int
       (\_ -> _)
       (_rhs \(b := _rhs \(c :: _) -> c) -> b)
       a
@@ -99,7 +99,7 @@ fromInt
             (_rhs undefined)))))
     :: forall g . Num g => Int -> g
 compare
-  = (\ @a -> \ @_ -> match'Int
+  = (\ @a @_ -> match'Int
       (\_ -> _)
       (_rhs \(b := _rhs primCompareInt) -> b)
       a
@@ -114,7 +114,7 @@ compare
           (match'Nat (\_ -> _) (_rhs \(e := _rhs undefined) -> e) a (_rhs undefined)))))
     :: forall f . Num f => f -> f -> Ordering
 negate
-  = (\ @a -> \ @_ -> match'Int
+  = (\ @a @_ -> match'Int
       (\_ -> _)
       (_rhs \(b := _rhs primNegateInt) -> b)
       a
@@ -156,7 +156,7 @@ negate
                 (_rhs ('Empty "no instance of 'Eq on ???"))))))))
     :: Type -> Type
 ==
-  = (\ @a -> \ @_ -> match'String
+  = (\ @a @_ -> match'String
       (\_ -> _)
       (_rhs \(b := \(c :: _) (d :: _) -> _rhs (isEQ (primCompareString c d))) -> b)
       a
diff --git a/testdata/Material.out b/testdata/Material.out
index 67f8b209..2665eadb 100644
--- a/testdata/Material.out
+++ b/testdata/Material.out
@@ -6,16 +6,13 @@ data Entity :: Type where
         -> Vec (fromInt 4) Float
           -> Vec (fromInt 3) Float -> Vec (fromInt 4) Float -> Entity
 eAmbientLight
-  = \(a :: _) -> case'Entity
-    (\_ -> _ :: _)
-    (\(b :: _) -> \_ -> \_ -> \_ -> _rhs b)
-    a
+  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\(b :: _) _ _ _ -> _rhs b) a
 eDirectedLight
-  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\_ (b :: _) -> \_ -> \_ -> _rhs b) a
+  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\_ (b :: _) _ _ -> _rhs b) a
 eLightDir
-  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\_ -> \_ (b :: _) -> \_ -> _rhs b) a
+  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\_ _ (b :: _) _ -> _rhs b) a
 eShaderRGBA
-  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\_ -> \_ -> \_ (b :: _) -> _rhs b) a
+  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\_ _ _ (b :: _) -> _rhs b) a
 data WaveType :: Type where
     WT_Sin :: WaveType
     WT_Triangle :: WaveType
@@ -118,58 +115,57 @@ data StageAttrs :: Type where
 saBlend
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\(b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs
-      b)
+    (\(b :: _) _ _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
 saRGBGen
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs b)
+    (\_ (b :: _) _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
 saAlphaGen
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs b)
+    (\_ _ (b :: _) _ _ _ _ _ _ _ _ -> _rhs b)
     a
 saTCGen
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs b)
+    (\_ _ _ (b :: _) _ _ _ _ _ _ _ -> _rhs b)
     a
 saTCMod
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs b)
+    (\_ _ _ _ (b :: _) _ _ _ _ _ _ -> _rhs b)
     a
 saTexture
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs b)
+    (\_ _ _ _ _ (b :: _) _ _ _ _ _ -> _rhs b)
     a
 saDepthWrite
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> _rhs b)
+    (\_ _ _ _ _ _ (b :: _) _ _ _ _ -> _rhs b)
     a
 saDepthFunc
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> _rhs b)
+    (\_ _ _ _ _ _ _ (b :: _) _ _ _ -> _rhs b)
     a
 saAlphaFunc
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> _rhs b)
+    (\_ _ _ _ _ _ _ _ (b :: _) _ _ -> _rhs b)
     a
 saDepthMaskExplicit
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> _rhs b)
+    (\_ _ _ _ _ _ _ _ _ (b :: _) _ -> _rhs b)
     a
 saTextureUniform
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> _rhs b)
+    (\_ _ _ _ _ _ _ _ _ _ (b :: _) -> _rhs b)
     a
 defaultStageAttrs
   = _rhs
@@ -198,75 +194,62 @@ data CommonAttrs :: Type where
 caSkyParms
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\(b
-      :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs
-      b)
+    (\(b :: _) _ _ _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
 caFogParms
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs
-      b)
+    (\_ (b :: _) _ _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
 caPortal
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs
-      b)
+    (\_ _ (b :: _) _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
 caSort
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs
-      b)
+    (\_ _ _ (b :: _) _ _ _ _ _ _ _ _ -> _rhs b)
     a
 caEntityMergable
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs
-      b)
+    (\_ _ _ _ (b :: _) _ _ _ _ _ _ _ -> _rhs b)
     a
 caFogOnly
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs
-      b)
+    (\_ _ _ _ _ (b :: _) _ _ _ _ _ _ -> _rhs b)
     a
 caCull
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs
-      b)
+    (\_ _ _ _ _ _ (b :: _) _ _ _ _ _ -> _rhs b)
     a
 caDeformVertexes
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> _rhs
-      b)
+    (\_ _ _ _ _ _ _ (b :: _) _ _ _ _ -> _rhs b)
     a
 caNoMipMaps
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> _rhs
-      b)
+    (\_ _ _ _ _ _ _ _ (b :: _) _ _ _ -> _rhs b)
     a
 caPolygonOffset
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> _rhs
-      b)
+    (\_ _ _ _ _ _ _ _ _ (b :: _) _ _ -> _rhs b)
     a
 caStages
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> _rhs
-      b)
+    (\_ _ _ _ _ _ _ _ _ _ (b :: _) _ -> _rhs b)
     a
 caIsSky
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> _rhs
-      b)
+    (\_ _ _ _ _ _ _ _ _ _ _ (b :: _) -> _rhs b)
     a
 defaultCommonAttrs
   = _rhs
diff --git a/testdata/Prelude.out b/testdata/Prelude.out
index 9f79ca67..0d9a2657 100644
--- a/testdata/Prelude.out
+++ b/testdata/Prelude.out
@@ -5,7 +5,7 @@ infixl 7 PrimDot
 infixr 5 ++
 infixr 3 ***
 infixr 0 $
-const = \(a :: _) -> \_ -> _rhs a
+const = \(a :: _) _ -> _rhs a
 otherwise = _rhs True
 & = \(a :: _) (b :: _) -> _rhs (b a)
 $ = _rhs \(a :: _) (b :: _) -> a b
@@ -158,7 +158,7 @@ sortBy
     (\(c :: _) (d :: _) -> case'List
       (\_ -> _ :: _)
       (_rhs (c : []))
-      (\_ -> \_ -> _rhs (uncurry (mergeBy a) ((sortBy a *** sortBy a) (split b))))
+      (\_ _ -> _rhs (uncurry (mergeBy a) ((sortBy a *** sortBy a) (split b))))
       d)
     b
 iterate
@@ -199,15 +199,15 @@ isKeyC
         (primIfThenElse (a == f) (b `'EqCTt` g) (isKeyC a b e)))
       d)
     c
-fstTup = _rhs (hlistConsCase (_ :: _) \(a :: _) -> \_ -> a)
+fstTup = _rhs (hlistConsCase (_ :: _) \(a :: _) _ -> a)
 sndTup = _rhs (hlistConsCase (_ :: _) \_ (a :: _) -> a)
 project
-  = (\ @(a :: _) @(b :: _) (c :: _) -> \ @_ (d :: _) -> case'List
+  = (\ @(a :: _) @(b :: _) (c :: _) @_ (d :: _) -> case'List
       (\_ -> _ :: _)
       (_rhs undefined)
       (\(e :: _) (f :: _) -> case'RecItem
         (\_ -> _ :: _)
-        (\(g :: _) -> \_ -> case'RecordC
+        (\(g :: _) _ -> case'RecordC
           (\_ -> _ :: _)
           (\(h :: _) -> case'Bool
             (\_ -> _ :: _)
diff --git a/testdata/ambig.out b/testdata/ambig.out
index f2146d1c..00f0bcc8 100644
--- a/testdata/ambig.out
+++ b/testdata/ambig.out
@@ -1,6 +1,6 @@
 ------------ desugared source code
 h
-  = \(a :: _) (b :: _) -> \_ -> _rhs
+  = \(a :: _) (b :: _) _ -> _rhs
     \(c
       := _rhs
         ((\(d :: _) -> hlistConsCase
diff --git a/testdata/complex.out b/testdata/complex.out
index 8e93c8fe..2154a46f 100644
--- a/testdata/complex.out
+++ b/testdata/complex.out
@@ -4,7 +4,7 @@ data Repr :: Type where
     Polar :: Repr
 data Complex :: Repr -> Type where
     Complex :: forall (a :: _) . Float -> Float -> Complex a
-repr = (\ @(a :: _) -> \_ -> _rhs a) :: forall (b :: _) . Complex b -> Repr
+repr = (\ @(a :: _) _ -> _rhs a) :: forall (b :: _) . Complex b -> Repr
 normal
   = (\(a :: _) (b :: _) -> _rhs (Complex a b)) :: Float -> Float -> Complex Normal
 polar
@@ -13,15 +13,15 @@ cabs
   = (\ @(a :: _) (b :: _) -> case'Repr
       (\_ -> _ :: _)
       (case'Complex
-        (\_ -> \_ -> _ :: _)
+        (\_ _ -> _ :: _)
         (\(c :: _) (d :: _) -> _rhs (sqrt (c * c + d * d)))
         b)
-      (case'Complex (\_ -> \_ -> _ :: _) (\(e :: _) -> \_ -> _rhs e) b)
+      (case'Complex (\_ _ -> _ :: _) (\(e :: _) _ -> _rhs e) b)
       a)
     :: forall (f :: _) . Complex f -> Float
 toPolar
   = (\(a :: _) -> case'Complex
-      (\_ -> \_ -> _ :: _)
+      (\_ _ -> _ :: _)
       (\(b :: _) (c :: _) -> _rhs
         \(d := _rhs (sqrt (b * b + c * c))) -> primIfThenElse
           (b > 0.0)
@@ -43,21 +43,21 @@ toPolar
     :: Complex Normal -> Complex Polar
 toNormal
   = (\(a :: _) -> case'Complex
-      (\_ -> \_ -> _ :: _)
+      (\_ _ -> _ :: _)
       (\(b :: _) (c :: _) -> _rhs (Complex (b * cos c) (b * sin c)))
       a)
     :: Complex Polar -> Complex Normal
 it_should_fail
-  = \(a :: _) -> case'Complex (\_ -> \_ -> _ :: _) (\(b :: _) -> \_ -> _rhs b) a
+  = \(a :: _) -> case'Complex (\_ _ -> _ :: _) (\(b :: _) _ -> _rhs b) a
 add
   = (\ @(a :: _) @(b :: _) (c :: _) (d :: _) -> case'Repr
       (\_ -> _ :: _)
       (case'Repr
         (\_ -> _ :: _)
         (case'Complex
-          (\_ -> \_ -> _ :: _)
+          (\_ _ -> _ :: _)
           (\(e :: _) (f :: _) -> case'Complex
-            (\_ -> \_ -> _ :: _)
+            (\_ _ -> _ :: _)
             (\(g :: _) (h :: _) -> _rhs (Complex (e + g) (f + h)))
             d)
           c)
@@ -72,9 +72,9 @@ mul
       (case'Repr
         (\_ -> _ :: _)
         (case'Complex
-          (\_ -> \_ -> _ :: _)
+          (\_ _ -> _ :: _)
           (\(e :: _) (f :: _) -> case'Complex
-            (\_ -> \_ -> _ :: _)
+            (\_ _ -> _ :: _)
             (\(g :: _) (h :: _) -> _rhs (Complex (e * g - f * h) (f * g + e * h)))
             d)
           c)
diff --git a/testdata/data.out b/testdata/data.out
index 04576355..ae819782 100644
--- a/testdata/data.out
+++ b/testdata/data.out
@@ -12,7 +12,7 @@ x
   = \(a :: _) -> case'Data2
     (\_ -> _ :: _)
     (\_ -> _rhs undefined)
-    (\(b :: _) -> \_ -> _rhs b)
+    (\(b :: _) _ -> _rhs b)
     (\(c :: _) -> _rhs c)
     (_rhs undefined)
     a
@@ -32,22 +32,22 @@ a5
   = \(a :: _) -> case'Data5
     (\_ -> _ :: _)
     (\(b :: _) -> _rhs b)
-    (\(c :: _) -> \_ -> \_ -> _rhs c)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> _rhs undefined)
+    (\(c :: _) _ _ -> _rhs c)
+    (\_ _ _ _ _ -> _rhs undefined)
     a
 b5
   = \(a :: _) -> case'Data5
     (\_ -> _ :: _)
     (\_ -> _rhs undefined)
-    (\_ (b :: _) -> \_ -> _rhs b)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> _rhs undefined)
+    (\_ (b :: _) _ -> _rhs b)
+    (\_ _ _ _ _ -> _rhs undefined)
     a
 c5
   = \(a :: _) -> case'Data5
     (\_ -> _ :: _)
     (\_ -> _rhs undefined)
-    (\_ -> \_ (b :: _) -> _rhs b)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> _rhs undefined)
+    (\_ _ (b :: _) -> _rhs b)
+    (\_ _ _ _ _ -> _rhs undefined)
     a
 main is not found
 ------------ trace
diff --git a/testdata/language-features/basic-values/def01.out b/testdata/language-features/basic-values/def01.out
index bdc4950d..6aa4d014 100644
--- a/testdata/language-features/basic-values/def01.out
+++ b/testdata/language-features/basic-values/def01.out
@@ -1,7 +1,7 @@
 ------------ desugared source code
 unit = _rhs HNil
 fun1 = \_ -> _rhs (fromInt 1)
-fun2 = \_ -> \_ -> \_ -> \_ -> \_ -> _rhs 'c'
+fun2 = \_ _ _ _ _ -> _rhs 'c'
 main is not found
 ------------ trace
 unit :: ()
diff --git a/testdata/language-features/basic-values/def04.out b/testdata/language-features/basic-values/def04.out
index bcec7dab..18c66ed9 100644
--- a/testdata/language-features/basic-values/def04.out
+++ b/testdata/language-features/basic-values/def04.out
@@ -6,7 +6,7 @@ fun
     (_rhs '1')
     (fromInt 1 == a)
 fun2
-  = \(a :: _) -> \_ -> case'Bool
+  = \(a :: _) _ -> case'Bool
     (\_ -> _ :: _)
     (case'Bool (\_ -> _ :: _) (_rhs '_') (_rhs '2') (fromInt 2 == a))
     (_rhs '1')
diff --git a/testdata/language-features/basic-values/fixity01.out b/testdata/language-features/basic-values/fixity01.out
index ba0fb828..82d3c5a6 100644
--- a/testdata/language-features/basic-values/fixity01.out
+++ b/testdata/language-features/basic-values/fixity01.out
@@ -1,7 +1,7 @@
 ------------ desugared source code
-funL = \(a :: _) -> \_ -> _rhs a
-funR = \(a :: _) -> \_ -> _rhs a
-<<<< = \(a :: _) -> \_ -> _rhs a
+funL = \(a :: _) _ -> _rhs a
+funR = \(a :: _) _ -> _rhs a
+<<<< = \(a :: _) _ -> _rhs a
 >>>> = \_ (a :: _) -> _rhs a
 infixr 7 funL
 infixr 7 <<<<
diff --git a/testdata/language-features/basic-values/fixity02.out b/testdata/language-features/basic-values/fixity02.out
index f14d7e38..baf54313 100644
--- a/testdata/language-features/basic-values/fixity02.out
+++ b/testdata/language-features/basic-values/fixity02.out
@@ -1,7 +1,7 @@
 ------------ desugared source code
-funL = \(a :: _) -> \_ -> _rhs a
+funL = \(a :: _) _ -> _rhs a
 funR = \_ (a :: _) -> _rhs a
-<@ = \(a :: _) -> \_ -> _rhs a
+<@ = \(a :: _) _ -> _rhs a
 @> = \_ (a :: _) -> _rhs a
 infixr 7 funL
 infixr 7 <@
diff --git a/testdata/language-features/basic-values/infix01.out b/testdata/language-features/basic-values/infix01.out
index dbfe5d56..013b0a25 100644
--- a/testdata/language-features/basic-values/infix01.out
+++ b/testdata/language-features/basic-values/infix01.out
@@ -1,5 +1,5 @@
 ------------ desugared source code
-fun = \_ -> \_ -> _rhs HNil
+fun = \_ _ -> _rhs HNil
 value = \(a :: _) (b :: _) -> _rhs (a `fun` b)
 main is not found
 ------------ trace
diff --git a/testdata/language-features/basic-values/infix02.out b/testdata/language-features/basic-values/infix02.out
index c86a773f..dd15a9e9 100644
--- a/testdata/language-features/basic-values/infix02.out
+++ b/testdata/language-features/basic-values/infix02.out
@@ -1,5 +1,5 @@
 ------------ desugared source code
-fun = \_ -> \_ -> \_ -> _rhs HNil
+fun = \_ _ _ -> _rhs HNil
 value = \(a :: _) (b :: _) -> _rhs (a `fun` b)
 main is not found
 ------------ trace
diff --git a/testdata/language-features/basic-values/lambda01.out b/testdata/language-features/basic-values/lambda01.out
index 4598e8d8..0d73915c 100644
--- a/testdata/language-features/basic-values/lambda01.out
+++ b/testdata/language-features/basic-values/lambda01.out
@@ -2,7 +2,7 @@
 fun1 = _rhs \_ -> HNil
 fun2 = _rhs \_ -> HNil
 fun3 = _rhs \_ -> HNil
-fun4 = _rhs \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> HNil
+fun4 = _rhs \_ _ _ _ _ _ _ _ _ -> HNil
 main is not found
 ------------ trace
 fun1 :: forall a . a -> ()
diff --git a/testdata/language-features/basic-values/lambda03.out b/testdata/language-features/basic-values/lambda03.out
index 990af1ad..5ea529b3 100644
--- a/testdata/language-features/basic-values/lambda03.out
+++ b/testdata/language-features/basic-values/lambda03.out
@@ -1,6 +1,6 @@
 ------------ desugared source code
-fun1 = _rhs \_ (a :: _) -> \_ -> a
-fun2 = \(a :: _) -> _rhs \_ -> \_ -> \_ -> a
+fun1 = _rhs \_ (a :: _) _ -> a
+fun2 = \(a :: _) -> _rhs \_ _ _ -> a
 main is not found
 ------------ trace
 fun1 :: forall a b c . a -> b -> c -> b
diff --git a/testdata/language-features/basic-values/operator01.out b/testdata/language-features/basic-values/operator01.out
index 0b8f12c3..96aefcdc 100644
--- a/testdata/language-features/basic-values/operator01.out
+++ b/testdata/language-features/basic-values/operator01.out
@@ -1,8 +1,8 @@
 ------------ desugared source code
-#$# = \_ -> \_ -> _rhs HNil
-$$# = \_ -> \_ -> _rhs HNil
-$$$# = \_ -> \_ -> _rhs HNil
-$$$ = \_ -> \_ -> _rhs HNil
+#$# = \_ _ -> _rhs HNil
+$$# = \_ _ -> _rhs HNil
+$$$# = \_ _ -> _rhs HNil
+$$$ = \_ _ -> _rhs HNil
 main is not found
 ------------ trace
 #$# :: forall a b . a -> b -> ()
diff --git a/testdata/language-features/basic-values/operator05.out b/testdata/language-features/basic-values/operator05.out
index b6f270bb..58ad31cd 100644
--- a/testdata/language-features/basic-values/operator05.out
+++ b/testdata/language-features/basic-values/operator05.out
@@ -1,5 +1,5 @@
 ------------ desugared source code
-value1 = _rhs \(a := \_ -> \_ -> _rhs HNil) -> a HNil HNil
+value1 = _rhs \(a := \_ _ -> _rhs HNil) -> a HNil HNil
 main is not found
 ------------ trace
 value1 :: ()
diff --git a/testdata/language-features/basic-values/operator06.out b/testdata/language-features/basic-values/operator06.out
index d91194d9..6f5d6982 100644
--- a/testdata/language-features/basic-values/operator06.out
+++ b/testdata/language-features/basic-values/operator06.out
@@ -1,5 +1,5 @@
 ------------ desugared source code
-value1 = _rhs \(a := \_ -> \_ -> _rhs HNil) -> a HNil HNil
+value1 = _rhs \(a := \_ _ -> _rhs HNil) -> a HNil HNil
 main is not found
 ------------ trace
 value1 :: ()
diff --git a/testdata/language-features/basic-values/shadowing03.out b/testdata/language-features/basic-values/shadowing03.out
index 8bfee196..6e0ca5e0 100644
--- a/testdata/language-features/basic-values/shadowing03.out
+++ b/testdata/language-features/basic-values/shadowing03.out
@@ -1,5 +1,5 @@
 ------------ desugared source code
-x = \_ -> \_ -> _rhs HNil
+x = \_ _ -> _rhs HNil
 main is not found
 ------------ trace
 x :: forall a b . a -> b -> ()
diff --git a/testdata/language-features/basic-values/shadowing04.out b/testdata/language-features/basic-values/shadowing04.out
index 281cb141..6d20512d 100644
--- a/testdata/language-features/basic-values/shadowing04.out
+++ b/testdata/language-features/basic-values/shadowing04.out
@@ -1,5 +1,5 @@
 ------------ desugared source code
-__ = \_ -> \_ -> _rhs HNil
+__ = \_ _ -> _rhs HNil
 main is not found
 ------------ trace
 __ :: forall a b . a -> b -> ()
diff --git a/testdata/language-features/basic-values/typesig03.out b/testdata/language-features/basic-values/typesig03.out
index 61adce6b..59bcaa12 100644
--- a/testdata/language-features/basic-values/typesig03.out
+++ b/testdata/language-features/basic-values/typesig03.out
@@ -1,9 +1,9 @@
 ------------ desugared source code
 fun1
-  = (\_ -> \_ -> \_ -> _rhs HNil)
+  = (\_ _ _ -> _rhs HNil)
     :: forall (a :: _) (b :: _) (c :: _) . a -> b -> c -> HList '[]
 fun2
-  = (\_ -> \_ -> \_ -> _rhs HNil)
+  = (\_ _ _ -> _rhs HNil)
     :: forall (a :: _) (b :: _) (c :: _) . a -> b -> c -> HList '[]
 main is not found
 ------------ trace
diff --git a/testdata/language-features/basic-values/typesig04.out b/testdata/language-features/basic-values/typesig04.out
index d37e8d1b..15b67c43 100644
--- a/testdata/language-features/basic-values/typesig04.out
+++ b/testdata/language-features/basic-values/typesig04.out
@@ -1,9 +1,9 @@
 ------------ desugared source code
 fun1
-  = (\_ -> \_ -> _rhs HNil)
+  = (\_ _ -> _rhs HNil)
     :: forall (a :: _) (b :: _) (c :: _) . a -> (b -> c) -> HList '[]
 fun2
-  = (\_ -> \_ -> _rhs HNil)
+  = (\_ _ -> _rhs HNil)
     :: forall (a :: _) (b :: _) (c :: _) . a -> (b -> c) -> HList '[]
 main is not found
 ------------ trace
diff --git a/testdata/language-features/basic-values/typesig05.out b/testdata/language-features/basic-values/typesig05.out
index b2676de8..06c14130 100644
--- a/testdata/language-features/basic-values/typesig05.out
+++ b/testdata/language-features/basic-values/typesig05.out
@@ -1,5 +1,5 @@
 ------------ desugared source code
-funL = \(a :: _) -> \_ -> _rhs a
+funL = \(a :: _) _ -> _rhs a
 funR = \_ (a :: _) -> _rhs a
 value1 = _rhs (funL 'a' "b" :: Char)
 value2 = _rhs (funR 'a' "b" :: String)
diff --git a/testdata/language-features/basic-values/typesig06.out b/testdata/language-features/basic-values/typesig06.out
index 5a4bfa41..bf0f6dea 100644
--- a/testdata/language-features/basic-values/typesig06.out
+++ b/testdata/language-features/basic-values/typesig06.out
@@ -1,6 +1,6 @@
 ------------ desugared source code
-funL = \(a :: _) -> \_ -> _rhs a
-<@ = \(a :: _) -> \_ -> _rhs a
+funL = \(a :: _) _ -> _rhs a
+<@ = \(a :: _) _ -> _rhs a
 value1 = _rhs ("hi" <@ 1.2 :: String)
 value2 = _rhs ("hi" `funL` 1.2 :: String)
 main is not found
diff --git a/testdata/language-features/basic-values/typesig07.out b/testdata/language-features/basic-values/typesig07.out
index f45f79f2..c589424f 100644
--- a/testdata/language-features/basic-values/typesig07.out
+++ b/testdata/language-features/basic-values/typesig07.out
@@ -2,9 +2,9 @@
 value1 = _rhs (fromInt 1) :: Int
 value2 = _rhs (fromInt 2) :: Int
 value3 = _rhs (fromInt 3) :: Int
-value4 = (\_ -> \_ -> _rhs HNil) :: HList '[] -> HList '[] -> HList '[]
-@@@ = (\_ -> \_ -> _rhs HNil) :: HList '[] -> HList '[] -> HList '[]
-value6 = (\_ -> \_ -> _rhs HNil) :: HList '[] -> HList '[] -> HList '[]
+value4 = (\_ _ -> _rhs HNil) :: HList '[] -> HList '[] -> HList '[]
+@@@ = (\_ _ -> _rhs HNil) :: HList '[] -> HList '[] -> HList '[]
+value6 = (\_ _ -> _rhs HNil) :: HList '[] -> HList '[] -> HList '[]
 main is not found
 ------------ trace
 value1 :: Int
diff --git a/testdata/language-features/pattern/uncovered.out b/testdata/language-features/pattern/uncovered.out
index d75adc31..9af16a3f 100644
--- a/testdata/language-features/pattern/uncovered.out
+++ b/testdata/language-features/pattern/uncovered.out
@@ -31,7 +31,7 @@ g
             (\(f :: _) (g :: _) -> case'Bool
               (\_ -> _ :: _)
               (_rhs undefined)
-              (case'List (\_ -> _ :: _) (_rhs False) (\_ -> \_ -> _rhs undefined) g)
+              (case'List (\_ -> _ :: _) (_rhs False) (\_ _ -> _rhs undefined) g)
               f)
             e)
           (_rhs undefined)
@@ -61,14 +61,14 @@ h
                 (\_ -> _ :: _)
                 (case'List
                   (\_ -> _ :: _)
-                  (case'List (\_ -> _ :: _) (_rhs True) (\_ -> \_ -> _rhs undefined) g)
-                  (\_ -> \_ -> _rhs undefined)
+                  (case'List (\_ -> _ :: _) (_rhs True) (\_ _ -> _rhs undefined) g)
+                  (\_ _ -> _rhs undefined)
                   i)
                 (_rhs undefined)
                 h)
               f)
             c)
-          (\_ -> \_ -> _rhs undefined)
+          (\_ _ -> _rhs undefined)
           e)
         d)
       b)
diff --git a/testdata/language-features/section/section01.out b/testdata/language-features/section/section01.out
index 0c51e14e..9af1bf31 100644
--- a/testdata/language-features/section/section01.out
+++ b/testdata/language-features/section/section01.out
@@ -1,5 +1,5 @@
 ------------ desugared source code
-!@! = \_ -> \_ -> _rhs HNil
+!@! = \_ _ -> _rhs HNil
 value1 = \(a :: _) -> _rhs \(b :: _) -> a !@! b
 value2 = \(a :: _) -> _rhs \(b :: _) -> b !@! a
 main is not found
diff --git a/testdata/performance/Material.out b/testdata/performance/Material.out
index 3b623709..76e3c20c 100644
--- a/testdata/performance/Material.out
+++ b/testdata/performance/Material.out
@@ -6,16 +6,13 @@ data Entity :: Type where
         -> Vec (fromInt 4) Float
           -> Vec (fromInt 3) Float -> Vec (fromInt 4) Float -> Entity
 eAmbientLight
-  = \(a :: _) -> case'Entity
-    (\_ -> _ :: _)
-    (\(b :: _) -> \_ -> \_ -> \_ -> _rhs b)
-    a
+  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\(b :: _) _ _ _ -> _rhs b) a
 eDirectedLight
-  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\_ (b :: _) -> \_ -> \_ -> _rhs b) a
+  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\_ (b :: _) _ _ -> _rhs b) a
 eLightDir
-  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\_ -> \_ (b :: _) -> \_ -> _rhs b) a
+  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\_ _ (b :: _) _ -> _rhs b) a
 eShaderRGBA
-  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\_ -> \_ -> \_ (b :: _) -> _rhs b) a
+  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\_ _ _ (b :: _) -> _rhs b) a
 data WaveType :: Type where
     WT_Sin :: WaveType
     WT_Triangle :: WaveType
@@ -118,58 +115,57 @@ data StageAttrs :: Type where
 saBlend
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\(b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs
-      b)
+    (\(b :: _) _ _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
 saRGBGen
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs b)
+    (\_ (b :: _) _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
 saAlphaGen
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs b)
+    (\_ _ (b :: _) _ _ _ _ _ _ _ _ -> _rhs b)
     a
 saTCGen
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs b)
+    (\_ _ _ (b :: _) _ _ _ _ _ _ _ -> _rhs b)
     a
 saTCMod
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs b)
+    (\_ _ _ _ (b :: _) _ _ _ _ _ _ -> _rhs b)
     a
 saTexture
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs b)
+    (\_ _ _ _ _ (b :: _) _ _ _ _ _ -> _rhs b)
     a
 saDepthWrite
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> _rhs b)
+    (\_ _ _ _ _ _ (b :: _) _ _ _ _ -> _rhs b)
     a
 saDepthFunc
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> _rhs b)
+    (\_ _ _ _ _ _ _ (b :: _) _ _ _ -> _rhs b)
     a
 saAlphaFunc
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> _rhs b)
+    (\_ _ _ _ _ _ _ _ (b :: _) _ _ -> _rhs b)
     a
 saDepthMaskExplicit
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> _rhs b)
+    (\_ _ _ _ _ _ _ _ _ (b :: _) _ -> _rhs b)
     a
 saTextureUniform
   = \(a :: _) -> case'StageAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> _rhs b)
+    (\_ _ _ _ _ _ _ _ _ _ (b :: _) -> _rhs b)
     a
 defaultStageAttrs
   = _rhs
@@ -198,75 +194,62 @@ data CommonAttrs :: Type where
 caSkyParms
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\(b
-      :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs
-      b)
+    (\(b :: _) _ _ _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
 caFogParms
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs
-      b)
+    (\_ (b :: _) _ _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
 caPortal
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs
-      b)
+    (\_ _ (b :: _) _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
 caSort
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs
-      b)
+    (\_ _ _ (b :: _) _ _ _ _ _ _ _ _ -> _rhs b)
     a
 caEntityMergable
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs
-      b)
+    (\_ _ _ _ (b :: _) _ _ _ _ _ _ _ -> _rhs b)
     a
 caFogOnly
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs
-      b)
+    (\_ _ _ _ _ (b :: _) _ _ _ _ _ _ -> _rhs b)
     a
 caCull
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> \_ -> _rhs
-      b)
+    (\_ _ _ _ _ _ (b :: _) _ _ _ _ _ -> _rhs b)
     a
 caDeformVertexes
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> \_ -> _rhs
-      b)
+    (\_ _ _ _ _ _ _ (b :: _) _ _ _ _ -> _rhs b)
     a
 caNoMipMaps
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> \_ -> _rhs
-      b)
+    (\_ _ _ _ _ _ _ _ (b :: _) _ _ _ -> _rhs b)
     a
 caPolygonOffset
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> \_ -> _rhs
-      b)
+    (\_ _ _ _ _ _ _ _ _ (b :: _) _ _ -> _rhs b)
     a
 caStages
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> \_ -> _rhs
-      b)
+    (\_ _ _ _ _ _ _ _ _ _ (b :: _) _ -> _rhs b)
     a
 caIsSky
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _ :: _)
-    (\_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ (b :: _) -> _rhs
-      b)
+    (\_ _ _ _ _ _ _ _ _ _ _ (b :: _) -> _rhs b)
     a
 defaultCommonAttrs
   = _rhs
diff --git a/testdata/typeclass.out b/testdata/typeclass.out
index f0bd73a3..407b8154 100644
--- a/testdata/typeclass.out
+++ b/testdata/typeclass.out
@@ -15,7 +15,7 @@ not = \(a :: _) -> case'Bool (\_ -> _ :: _) (_rhs True) (_rhs False) a
       (_rhs ('Empty "no instance of 'Eq on ???")))
     :: Type -> Type
 ==
-  = (\ @a -> \ @_ -> match'Bool
+  = (\ @a @_ -> match'Bool
       (\_ -> _)
       (_rhs
         \(b