use less wildcards

36 files changed, 285 insertions, 339 deletions

diff --git a/testdata/Builtins.out b/testdata/Builtins.out
index 351b6558..469a2a39 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)))
@@ -15,10 +15,10 @@ mapVec
 'Vec = (\(a :: _) (b :: _) -> _rhs ('VecS b a)) :: Nat -> Type -> Type
 'VecScalar
   = (\(a :: _) (b :: _) -> case'Nat
-      (\_ -> _ :: _)
+      (\_ -> _)
       undefined
       (\(c :: _) -> case'Nat
-        (\_ -> _ :: _)
+        (\_ -> _)
         (_rhs b)
         (\(d :: _) -> _rhs ('Vec (Succ (Succ d)) b))
         c)
@@ -109,19 +109,19 @@ data Mat :: Nat -> Nat -> Type -> Type where
             (\(b :: _) (c :: _) -> match'Float
               (\_ -> _)
               (case'Nat
-                (\_ -> _ :: _)
+                (\_ -> _)
                 (_rhs ('Empty "no instance of 'Component on ???"))
                 (\(d :: _) -> case'Nat
-                  (\_ -> _ :: _)
+                  (\_ -> _)
                   (_rhs ('Empty "no instance of 'Component on ???"))
                   (\(e :: _) -> case'Nat
-                    (\_ -> _ :: _)
+                    (\_ -> _)
                     (_rhs 'Unit)
                     (\(f :: _) -> case'Nat
-                      (\_ -> _ :: _)
+                      (\_ -> _)
                       (_rhs 'Unit)
                       (\(g :: _) -> case'Nat
-                        (\_ -> _ :: _)
+                        (\_ -> _)
                         (_rhs 'Unit)
                         (\_ -> _rhs ('Empty "no instance of 'Component on ???"))
                         g)
@@ -133,19 +133,19 @@ data Mat :: Nat -> Nat -> Type -> Type where
               (match'Bool
                 (\_ -> _)
                 (case'Nat
-                  (\_ -> _ :: _)
+                  (\_ -> _)
                   (_rhs ('Empty "no instance of 'Component on ???"))
                   (\(h :: _) -> case'Nat
-                    (\_ -> _ :: _)
+                    (\_ -> _)
                     (_rhs ('Empty "no instance of 'Component on ???"))
                     (\(i :: _) -> case'Nat
-                      (\_ -> _ :: _)
+                      (\_ -> _)
                       (_rhs 'Unit)
                       (\(j :: _) -> case'Nat
-                        (\_ -> _ :: _)
+                        (\_ -> _)
                         (_rhs 'Unit)
                         (\(k :: _) -> case'Nat
-                          (\_ -> _ :: _)
+                          (\_ -> _)
                           (_rhs 'Unit)
                           (\_ -> _rhs ('Empty "no instance of 'Component on ???"))
                           k)
@@ -180,19 +180,19 @@ zero
             (\(e :: _) (f :: _) -> match'Float
               (\_ -> _)
               (case'Nat
-                (\_ -> _ :: _)
+                (\_ -> _)
                 (_rhs undefined)
                 (\(g :: _) -> case'Nat
-                  (\_ -> _ :: _)
+                  (\_ -> _)
                   (_rhs undefined)
                   (\(h :: _) -> case'Nat
-                    (\_ -> _ :: _)
+                    (\_ -> _)
                     (_rhs \(i := _rhs (V2 0.0 0.0)) -> i)
                     (\(j :: _) -> case'Nat
-                      (\_ -> _ :: _)
+                      (\_ -> _)
                       (_rhs \(k := _rhs (V3 0.0 0.0 0.0)) -> k)
                       (\(l :: _) -> case'Nat
-                        (\_ -> _ :: _)
+                        (\_ -> _)
                         (_rhs \(m := _rhs (V4 0.0 0.0 0.0 0.0)) -> m)
                         (\_ -> _rhs undefined)
                         l)
@@ -204,19 +204,19 @@ zero
               (match'Bool
                 (\_ -> _)
                 (case'Nat
-                  (\_ -> _ :: _)
+                  (\_ -> _)
                   (_rhs undefined)
                   (\(n :: _) -> case'Nat
-                    (\_ -> _ :: _)
+                    (\_ -> _)
                     (_rhs undefined)
                     (\(o :: _) -> case'Nat
-                      (\_ -> _ :: _)
+                      (\_ -> _)
                       (_rhs \(p := _rhs (V2 False False)) -> p)
                       (\(q :: _) -> case'Nat
-                        (\_ -> _ :: _)
+                        (\_ -> _)
                         (_rhs \(r := _rhs (V3 False False False)) -> r)
                         (\(s :: _) -> case'Nat
-                          (\_ -> _ :: _)
+                          (\_ -> _)
                           (_rhs \(t := _rhs (V4 False False False False)) -> t)
                           (\_ -> _rhs undefined)
                           s)
@@ -247,19 +247,19 @@ one
             (\(e :: _) (f :: _) -> match'Float
               (\_ -> _)
               (case'Nat
-                (\_ -> _ :: _)
+                (\_ -> _)
                 (_rhs undefined)
                 (\(g :: _) -> case'Nat
-                  (\_ -> _ :: _)
+                  (\_ -> _)
                   (_rhs undefined)
                   (\(h :: _) -> case'Nat
-                    (\_ -> _ :: _)
+                    (\_ -> _)
                     (_rhs \(i := _rhs (V2 1.0 1.0)) -> i)
                     (\(j :: _) -> case'Nat
-                      (\_ -> _ :: _)
+                      (\_ -> _)
                       (_rhs \(k := _rhs (V3 1.0 1.0 1.0)) -> k)
                       (\(l :: _) -> case'Nat
-                        (\_ -> _ :: _)
+                        (\_ -> _)
                         (_rhs \(m := _rhs (V4 1.0 1.0 1.0 1.0)) -> m)
                         (\_ -> _rhs undefined)
                         l)
@@ -271,19 +271,19 @@ one
               (match'Bool
                 (\_ -> _)
                 (case'Nat
-                  (\_ -> _ :: _)
+                  (\_ -> _)
                   (_rhs undefined)
                   (\(n :: _) -> case'Nat
-                    (\_ -> _ :: _)
+                    (\_ -> _)
                     (_rhs undefined)
                     (\(o :: _) -> case'Nat
-                      (\_ -> _ :: _)
+                      (\_ -> _)
                       (_rhs \(p := _rhs (V2 True True)) -> p)
                       (\(q :: _) -> case'Nat
-                        (\_ -> _ :: _)
+                        (\_ -> _)
                         (_rhs \(r := _rhs (V3 True True True)) -> r)
                         (\(s :: _) -> case'Nat
-                          (\_ -> _ :: _)
+                          (\_ -> _)
                           (_rhs \(t := _rhs (V4 True True True True)) -> t)
                           (\_ -> _rhs undefined)
                           s)
@@ -317,19 +317,19 @@ one
         (\(b :: _) (c :: _) -> match'Float
           (\_ -> _)
           (case'Nat
-            (\_ -> _ :: _)
+            (\_ -> _)
             (_rhs ('Empty "no instance of 'Floating on ???"))
             (\(d :: _) -> case'Nat
-              (\_ -> _ :: _)
+              (\_ -> _)
               (_rhs ('Empty "no instance of 'Floating on ???"))
               (\(e :: _) -> case'Nat
-                (\_ -> _ :: _)
+                (\_ -> _)
                 (_rhs 'Unit)
                 (\(f :: _) -> case'Nat
-                  (\_ -> _ :: _)
+                  (\_ -> _)
                   (_rhs 'Unit)
                   (\(g :: _) -> case'Nat
-                    (\_ -> _ :: _)
+                    (\_ -> _)
                     (_rhs 'Unit)
                     (\_ -> _rhs ('Empty "no instance of 'Floating on ???"))
                     g)
@@ -343,35 +343,35 @@ one
         (match'Mat
           (\_ -> _)
           (\(h :: _) (i :: _) (j :: _) -> case'Nat
-            (\_ -> _ :: _)
+            (\_ -> _)
             (_rhs ('Empty "no instance of 'Floating on ???"))
             (\(k :: _) -> case'Nat
-              (\_ -> _ :: _)
+              (\_ -> _)
               (_rhs ('Empty "no instance of 'Floating on ???"))
               (\(l :: _) -> case'Nat
-                (\_ -> _ :: _)
+                (\_ -> _)
                 (case'Nat
-                  (\_ -> _ :: _)
+                  (\_ -> _)
                   (_rhs ('Empty "no instance of 'Floating on ???"))
                   (\(m :: _) -> case'Nat
-                    (\_ -> _ :: _)
+                    (\_ -> _)
                     (_rhs ('Empty "no instance of 'Floating on ???"))
                     (\(n :: _) -> case'Nat
-                      (\_ -> _ :: _)
+                      (\_ -> _)
                       (match'Float
                         (\_ -> _)
                         (_rhs 'Unit)
                         j
                         (_rhs ('Empty "no instance of 'Floating on ???")))
                       (\(o :: _) -> case'Nat
-                        (\_ -> _ :: _)
+                        (\_ -> _)
                         (match'Float
                           (\_ -> _)
                           (_rhs 'Unit)
                           j
                           (_rhs ('Empty "no instance of 'Floating on ???")))
                         (\(p :: _) -> case'Nat
-                          (\_ -> _ :: _)
+                          (\_ -> _)
                           (match'Float
                             (\_ -> _)
                             (_rhs 'Unit)
@@ -384,29 +384,29 @@ one
                     m)
                   i)
                 (\(q :: _) -> case'Nat
-                  (\_ -> _ :: _)
+                  (\_ -> _)
                   (case'Nat
-                    (\_ -> _ :: _)
+                    (\_ -> _)
                     (_rhs ('Empty "no instance of 'Floating on ???"))
                     (\(r :: _) -> case'Nat
-                      (\_ -> _ :: _)
+                      (\_ -> _)
                       (_rhs ('Empty "no instance of 'Floating on ???"))
                       (\(s :: _) -> case'Nat
-                        (\_ -> _ :: _)
+                        (\_ -> _)
                         (match'Float
                           (\_ -> _)
                           (_rhs 'Unit)
                           j
                           (_rhs ('Empty "no instance of 'Floating on ???")))
                         (\(t :: _) -> case'Nat
-                          (\_ -> _ :: _)
+                          (\_ -> _)
                           (match'Float
                             (\_ -> _)
                             (_rhs 'Unit)
                             j
                             (_rhs ('Empty "no instance of 'Floating on ???")))
                           (\(u :: _) -> case'Nat
-                            (\_ -> _ :: _)
+                            (\_ -> _)
                             (match'Float
                               (\_ -> _)
                               (_rhs 'Unit)
@@ -419,29 +419,29 @@ one
                       r)
                     i)
                   (\(v :: _) -> case'Nat
-                    (\_ -> _ :: _)
+                    (\_ -> _)
                     (case'Nat
-                      (\_ -> _ :: _)
+                      (\_ -> _)
                       (_rhs ('Empty "no instance of 'Floating on ???"))
                       (\(w :: _) -> case'Nat
-                        (\_ -> _ :: _)
+                        (\_ -> _)
                         (_rhs ('Empty "no instance of 'Floating on ???"))
                         (\(x :: _) -> case'Nat
-                          (\_ -> _ :: _)
+                          (\_ -> _)
                           (match'Float
                             (\_ -> _)
                             (_rhs 'Unit)
                             j
                             (_rhs ('Empty "no instance of 'Floating on ???")))
                           (\(y :: _) -> case'Nat
-                            (\_ -> _ :: _)
+                            (\_ -> _)
                             (match'Float
                               (\_ -> _)
                               (_rhs 'Unit)
                               j
                               (_rhs ('Empty "no instance of 'Floating on ???")))
                             (\(z :: _) -> case'Nat
-                              (\_ -> _ :: _)
+                              (\_ -> _)
                               (match'Float
                                 (\_ -> _)
                                 (_rhs 'Unit)
@@ -645,27 +645,23 @@ PrimNoise2 :: forall (a :: _) . VecScalar a Float -> Vec (fromInt 2) Float
 PrimNoise3 :: forall (a :: _) . VecScalar a Float -> Vec (fromInt 3) Float
 PrimNoise4 :: forall (a :: _) . VecScalar a Float -> Vec (fromInt 4) Float
 head
-  = \(a :: _) -> case'List
-    (\_ -> _ :: _)
-    (_rhs undefined)
-    (\(b :: _) _ -> _rhs b)
-    a
+  = \(a :: _) -> case'List (\_ -> _) (_rhs undefined) (\(b :: _) _ -> _rhs b) a
 (++)
   = \(a :: _) (b :: _) -> case'List
-    (\_ -> _ :: _)
+    (\_ -> _)
     (_rhs b)
     (\(c :: _) (d :: _) -> _rhs (c : d ++ b))
     a
 foldr
   = \(a :: _) (b :: _) (c :: _) -> case'List
-    (\_ -> _ :: _)
+    (\_ -> _)
     (_rhs b)
     (\(d :: _) (e :: _) -> _rhs (a d (foldr a b e)))
     c
 concat = _rhs (foldr (++) [])
 map
   = \(a :: _) (b :: _) -> case'List
-    (\_ -> _ :: _)
+    (\_ -> _)
     (_rhs [])
     (\(c :: _) (d :: _) -> _rhs (a c : map a d))
     b
@@ -674,7 +670,7 @@ concatMap
     :: forall (c :: _) (d :: _) . (c -> [d]) -> [c] -> [d]
 len
   = \(a :: _) -> case'List
-    (\_ -> _ :: _)
+    (\_ -> _)
     (_rhs (fromInt 0))
     (\_ (b :: _) -> _rhs (fromInt 1 `primAddInt` len b))
     a
@@ -718,9 +714,9 @@ 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
+  = \(a :: _) -> case'SimpleFragment (\_ -> _) (\_ (b :: _) -> _rhs b) a
 'FragmentStream = \(a :: _) (b :: _) -> _rhs ['Fragment a b]
 customizeDepth
   :: forall (a :: _) (b :: _) . (a -> Float) -> Fragment b a -> Fragment b a
@@ -746,7 +742,7 @@ data ImageKind :: Type where
     Stencil :: ImageKind
 imageType
   = (\(a :: _) -> case'ImageKind
-      (\_ -> _ :: _)
+      (\_ -> _)
       (\(b :: _) -> _rhs b)
       (_rhs 'Float)
       (_rhs 'Int)
@@ -768,23 +764,23 @@ data Swizz :: Type where
     Sw :: Swizz
 swizzscalar
   = (\(a :: _) (b :: _) -> case'VecS
-      (\_ _ -> _ :: _)
+      (\_ _ -> _)
       (\(c :: _) (d :: _) -> case'Swizz
-        (\_ -> _ :: _)
+        (\_ -> _)
         (_rhs c)
         (_rhs d)
         (_rhs undefined)
         (_rhs undefined)
         b)
       (\(e :: _) (f :: _) (g :: _) -> case'Swizz
-        (\_ -> _ :: _)
+        (\_ -> _)
         (_rhs e)
         (_rhs f)
         (_rhs g)
         (_rhs undefined)
         b)
       (\(h :: _) (i :: _) (j :: _) (k :: _) -> case'Swizz
-        (\_ -> _ :: _)
+        (\_ -> _)
         (_rhs h)
         (_rhs i)
         (_rhs j)
@@ -794,7 +790,7 @@ swizzscalar
     :: forall (l :: _) (m :: _) . Vec m l -> Swizz -> l
 definedVec
   = (\(a :: _) -> case'VecS
-      (\_ _ -> _ :: _)
+      (\_ _ -> _)
       (\_ _ -> _rhs True)
       (\_ _ _ -> _rhs True)
       (\_ _ _ _ -> _rhs True)
@@ -802,7 +798,7 @@ definedVec
     :: forall (b :: _) (c :: _) . Vec c b -> Bool
 swizzvector
   = (\(a :: _) (b :: _) -> case'Bool
-      (\_ -> _ :: _)
+      (\_ -> _)
       (_rhs undefined)
       (_rhs (mapVec (swizzscalar a) b))
       (definedVec a))
@@ -933,10 +929,10 @@ rasterizePrimitives
     :: Type -> Nat
 allSame
   = (\(a :: _) -> case'List
-      (\_ -> _ :: _)
+      (\_ -> _)
       (_rhs 'Unit)
       (\(b :: _) (c :: _) -> case'List
-        (\_ -> _ :: _)
+        (\_ -> _)
         (_rhs 'Unit)
         (\(d :: _) (e :: _) -> _rhs ('T2 (b `'EqCTt` d) (allSame (d : e))))
         c)
@@ -947,10 +943,10 @@ data FrameBuffer (_ :: Nat) (_ :: [ImageKind]) :: Type where
     
 imageType'
   = (\(a :: _) -> case'List
-      (\_ -> _ :: _)
+      (\_ -> _)
       (_rhs (map imageType a))
       (\(b :: _) (c :: _) -> case'ImageKind
-        (\_ -> _ :: _)
+        (\_ -> _)
         (\_ -> _rhs (map imageType a))
         (_rhs (map imageType c))
         (_rhs (map imageType a))
@@ -972,10 +968,10 @@ Accumulate
 accumulateWith = \(a :: _) (b :: _) -> _rhs (HCons a (HCons b HNil))
 overlay
   = \(a :: _) (b :: _) -> hlistConsCase
-    (_ :: _)
+    _
     (\(c :: _) (d :: _) -> hlistConsCase
-      (_ :: _)
-      (\(e :: _) (f :: _) -> hlistNilCase (_ :: _) (_rhs (Accumulate c e a)) f)
+      _
+      (\(e :: _) (f :: _) -> hlistNilCase _ (_rhs (Accumulate c e a)) f)
       d)
     b
 infixl 0 overlay
diff --git a/testdata/Internals.out b/testdata/Internals.out
index 78586125..9ae0f3e1 100644
--- a/testdata/Internals.out
+++ b/testdata/Internals.out
@@ -51,15 +51,10 @@ primModInt :: Int -> Int -> Int
 primSqrtFloat :: Float -> Float
 primRound :: Float -> Int
 primIfThenElse
-  = (\(a :: _) (b :: _) (c :: _) -> case'Bool (\_ -> _ :: _) (_rhs c) (_rhs b) a)
+  = (\(a :: _) (b :: _) (c :: _) -> case'Bool (\_ -> _) (_rhs c) (_rhs b) a)
     :: forall (d :: _) . Bool -> d -> d -> d
 isEQ
-  = \(a :: _) -> case'Ordering
-    (\_ -> _ :: _)
-    (_rhs False)
-    (_rhs True)
-    (_rhs False)
-    a
+  = \(a :: _) -> case'Ordering (\_ -> _) (_rhs False) (_rhs True) (_rhs False) a
 'Num
   = (\(a :: _) -> match'Int
       (\_ -> _)
@@ -177,9 +172,9 @@ negate
               (_rhs
                 \(n
                   := \(o :: _) (p :: _) -> case'Bool
-                    (\_ -> _ :: _)
-                    (case'Bool (\_ -> _ :: _) (_rhs True) (_rhs False) p)
-                    (case'Bool (\_ -> _ :: _) (_rhs False) (_rhs True) p)
+                    (\_ -> _)
+                    (case'Bool (\_ -> _) (_rhs True) (_rhs False) p)
+                    (case'Bool (\_ -> _) (_rhs False) (_rhs True) p)
                     o) -> n)
               a
               (match'Nat
@@ -187,13 +182,9 @@ negate
                 (_rhs
                   \(q
                     := \(r :: _) (s :: _) -> case'Nat
-                      (\_ -> _ :: _)
-                      (case'Nat (\_ -> _ :: _) (_rhs True) (\_ -> _rhs False) s)
-                      (\(t :: _) -> case'Nat
-                        (\_ -> _ :: _)
-                        (_rhs False)
-                        (\(u :: _) -> _rhs (t == u))
-                        s)
+                      (\_ -> _)
+                      (case'Nat (\_ -> _) (_rhs True) (\_ -> _rhs False) s)
+                      (\(t :: _) -> case'Nat (\_ -> _) (_rhs False) (\(u :: _) -> _rhs (t == u)) s)
                       r) -> q)
                 a
                 (_rhs undefined)))))))
diff --git a/testdata/Material.out b/testdata/Material.out
index 2665eadb..fa9c9eb4 100644
--- a/testdata/Material.out
+++ b/testdata/Material.out
@@ -5,14 +5,11 @@ data Entity :: Type where
       :: Vec (fromInt 4) Float
         -> Vec (fromInt 4) Float
           -> Vec (fromInt 3) Float -> Vec (fromInt 4) Float -> Entity
-eAmbientLight
-  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\(b :: _) _ _ _ -> _rhs b) a
+eAmbientLight = \(a :: _) -> case'Entity (\_ -> _) (\(b :: _) _ _ _ -> _rhs b) a
 eDirectedLight
-  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\_ (b :: _) _ _ -> _rhs b) a
-eLightDir
-  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\_ _ (b :: _) _ -> _rhs b) a
-eShaderRGBA
-  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\_ _ _ (b :: _) -> _rhs b) a
+  = \(a :: _) -> case'Entity (\_ -> _) (\_ (b :: _) _ _ -> _rhs b) a
+eLightDir = \(a :: _) -> case'Entity (\_ -> _) (\_ _ (b :: _) _ -> _rhs b) a
+eShaderRGBA = \(a :: _) -> case'Entity (\_ -> _) (\_ _ _ (b :: _) -> _rhs b) a
 data WaveType :: Type where
     WT_Sin :: WaveType
     WT_Triangle :: WaveType
@@ -114,57 +111,57 @@ data StageAttrs :: Type where
                   -> Bool -> DepthFunction -> Maybe AlphaFunction -> Bool -> String -> StageAttrs
 saBlend
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\(b :: _) _ _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
 saRGBGen
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ (b :: _) _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
 saAlphaGen
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ (b :: _) _ _ _ _ _ _ _ _ -> _rhs b)
     a
 saTCGen
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ (b :: _) _ _ _ _ _ _ _ -> _rhs b)
     a
 saTCMod
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ (b :: _) _ _ _ _ _ _ -> _rhs b)
     a
 saTexture
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ (b :: _) _ _ _ _ _ -> _rhs b)
     a
 saDepthWrite
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ (b :: _) _ _ _ _ -> _rhs b)
     a
 saDepthFunc
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ _ (b :: _) _ _ _ -> _rhs b)
     a
 saAlphaFunc
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ _ _ (b :: _) _ _ -> _rhs b)
     a
 saDepthMaskExplicit
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ _ _ _ (b :: _) _ -> _rhs b)
     a
 saTextureUniform
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ _ _ _ _ (b :: _) -> _rhs b)
     a
 defaultStageAttrs
@@ -193,62 +190,62 @@ data CommonAttrs :: Type where
                   -> CullType -> [Deform] -> Bool -> Bool -> [StageAttrs] -> Bool -> CommonAttrs
 caSkyParms
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\(b :: _) _ _ _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
 caFogParms
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ (b :: _) _ _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
 caPortal
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ (b :: _) _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
 caSort
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ (b :: _) _ _ _ _ _ _ _ _ -> _rhs b)
     a
 caEntityMergable
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ (b :: _) _ _ _ _ _ _ _ -> _rhs b)
     a
 caFogOnly
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ (b :: _) _ _ _ _ _ _ -> _rhs b)
     a
 caCull
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ (b :: _) _ _ _ _ _ -> _rhs b)
     a
 caDeformVertexes
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ _ (b :: _) _ _ _ _ -> _rhs b)
     a
 caNoMipMaps
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ _ _ (b :: _) _ _ _ -> _rhs b)
     a
 caPolygonOffset
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ _ _ _ (b :: _) _ _ -> _rhs b)
     a
 caStages
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ _ _ _ _ (b :: _) _ -> _rhs b)
     a
 caIsSky
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ _ _ _ _ _ (b :: _) -> _rhs b)
     a
 defaultCommonAttrs
diff --git a/testdata/Prelude.out b/testdata/Prelude.out
index 971fc3a3..56e17569 100644
--- a/testdata/Prelude.out
+++ b/testdata/Prelude.out
@@ -12,30 +12,27 @@ otherwise = _rhs True
 (.) = _rhs \(a :: _) (b :: _) (c :: _) -> a (b c)
 uncurry
   = \(a :: _) (b :: _) -> hlistConsCase
-    (_ :: _)
+    _
     (\(c :: _) (d :: _) -> hlistConsCase
-      (_ :: _)
-      (\(e :: _) (f :: _) -> hlistNilCase (_ :: _) (_rhs (a c e)) f)
+      _
+      (\(e :: _) (f :: _) -> hlistNilCase _ (_rhs (a c e)) f)
       d)
     b
 (***)
   = \(a :: _) (b :: _) (c :: _) -> hlistConsCase
-    (_ :: _)
+    _
     (\(d :: _) (e :: _) -> hlistConsCase
-      (_ :: _)
-      (\(f :: _) (g :: _) -> hlistNilCase
-        (_ :: _)
-        (_rhs (HCons (a d) (HCons (b f) HNil)))
-        g)
+      _
+      (\(f :: _) (g :: _) -> hlistNilCase _ (_rhs (HCons (a d) (HCons (b f) HNil))) g)
       e)
     c
 pi = _rhs 3.141592653589793
 zip
   = (\(a :: _) (b :: _) -> case'List
-      (\_ -> _ :: _)
+      (\_ -> _)
       (_rhs [])
       (\(c :: _) (d :: _) -> case'List
-        (\_ -> _ :: _)
+        (\_ -> _)
         (_rhs [])
         (\(e :: _) (f :: _) -> _rhs (HCons c (HCons e HNil) : zip d f))
         b)
@@ -43,34 +40,28 @@ zip
     :: forall (g :: _) (h :: _) . [g] -> [h] -> [HList (g : h : '[])]
 unzip
   = (\(a :: _) -> case'List
-      (\_ -> _ :: _)
+      (\_ -> _)
       (_rhs (HCons [] (HCons [] HNil)))
       (\(b :: _) (c :: _) -> hlistConsCase
-        (_ :: _)
+        _
         (\(d :: _) (e :: _) -> hlistConsCase
-          (_ :: _)
+          _
           (\(f :: _) (g :: _) -> hlistNilCase
-            (_ :: _)
+            _
             (_rhs
               \(h := _rhs (unzip c))
                 (i
                     := _rhs
                       ((\(k :: _) -> hlistConsCase
-                          (_ :: _)
-                          (\_ (l :: _) -> hlistConsCase
-                            (_ :: _)
-                            (\(m :: _) (n :: _) -> hlistNilCase (_ :: _) m n)
-                            l)
+                          _
+                          (\_ (l :: _) -> hlistConsCase _ (\(m :: _) (n :: _) -> hlistNilCase _ m n) l)
                           k)
                         h))
                   (j
                     := _rhs
                       ((\(o :: _) -> hlistConsCase
-                          (_ :: _)
-                          (\(p :: _) (q :: _) -> hlistConsCase
-                            (_ :: _)
-                            (\_ (r :: _) -> hlistNilCase (_ :: _) p r)
-                            q)
+                          _
+                          (\(p :: _) (q :: _) -> hlistConsCase _ (\_ (r :: _) -> hlistNilCase _ p r) q)
                           o)
                         h)) -> HCons (d : j) (HCons (f : i) HNil))
             g)
@@ -80,70 +71,60 @@ unzip
     :: forall (s :: _) (t :: _) . [HList (s : t : '[])] -> HList ([s] : [t] : '[])
 filter
   = \(a :: _) (b :: _) -> case'List
-    (\_ -> _ :: _)
+    (\_ -> _)
     (_rhs [])
     (\(c :: _) (d :: _) -> _rhs
-      ((\(e :: _) -> case'Bool (\_ -> _ :: _) (filter a d) (c : filter a d) e) (a c)))
+      ((\(e :: _) -> case'Bool (\_ -> _) (filter a d) (c : filter a d) e) (a c)))
     b
 tail
-  = (\(a :: _) -> case'List
-      (\_ -> _ :: _)
-      (_rhs undefined)
-      (\_ (b :: _) -> _rhs b)
-      a)
+  = (\(a :: _) -> case'List (\_ -> _) (_rhs undefined) (\_ (b :: _) -> _rhs b) a)
     :: forall (c :: _) . [c] -> [c]
 pairs
   = (\(a :: _) -> _rhs (zip a (tail a)))
     :: forall (b :: _) . [b] -> [HList (b : b : '[])]
 foldl'
   = \(a :: _) (b :: _) (c :: _) -> case'List
-    (\_ -> _ :: _)
+    (\_ -> _)
     (_rhs b)
     (\(d :: _) (e :: _) -> _rhs (foldl' a (a b d) e))
     c
 foldr1
   = \(a :: _) (b :: _) -> case'List
-    (\_ -> _ :: _)
+    (\_ -> _)
     (_rhs undefined)
     (\(c :: _) (d :: _) -> _rhs (foldr a c d))
     b
 split
   = \(a :: _) -> case'List
-    (\_ -> _ :: _)
+    (\_ -> _)
     (_rhs (HCons [] (HCons [] HNil)))
     (\(b :: _) (c :: _) -> _rhs
       \(d := _rhs (split c))
         (e
             := _rhs
               ((\(g :: _) -> hlistConsCase
-                  (_ :: _)
-                  (\_ (h :: _) -> hlistConsCase
-                    (_ :: _)
-                    (\(i :: _) (j :: _) -> hlistNilCase (_ :: _) i j)
-                    h)
+                  _
+                  (\_ (h :: _) -> hlistConsCase _ (\(i :: _) (j :: _) -> hlistNilCase _ i j) h)
                   g)
                 d))
           (f
             := _rhs
               ((\(k :: _) -> hlistConsCase
-                  (_ :: _)
-                  (\(l :: _) (m :: _) -> hlistConsCase
-                    (_ :: _)
-                    (\_ (n :: _) -> hlistNilCase (_ :: _) l n)
-                    m)
+                  _
+                  (\(l :: _) (m :: _) -> hlistConsCase _ (\_ (n :: _) -> hlistNilCase _ l n) m)
                   k)
                 d)) -> HCons (b : e) (HCons f HNil))
     a
 mergeBy
   = \(a :: _) (b :: _) (c :: _) -> case'List
-    (\_ -> _ :: _)
+    (\_ -> _)
     (_rhs c)
     (\(d :: _) (e :: _) -> case'List
-      (\_ -> _ :: _)
+      (\_ -> _)
       (_rhs b)
       (\(f :: _) (g :: _) -> _rhs
         ((\(h :: _) -> case'Ordering
-            (\_ -> _ :: _)
+            (\_ -> _)
             (d : mergeBy a e (f : g))
             (f : mergeBy a (d : e) g)
             (f : mergeBy a (d : e) g)
@@ -153,10 +134,10 @@ mergeBy
     b
 sortBy
   = \(a :: _) (b :: _) -> case'List
-    (\_ -> _ :: _)
+    (\_ -> _)
     (_rhs [])
     (\(c :: _) (d :: _) -> case'List
-      (\_ -> _ :: _)
+      (\_ -> _)
       (_rhs (c : []))
       (\_ _ -> _rhs (uncurry (mergeBy a) ((sortBy a *** sortBy a) (split b))))
       d)
@@ -166,35 +147,35 @@ iterate
     :: forall (c :: _) . (c -> c) -> c -> [c]
 fst
   = \(a :: _) -> hlistConsCase
-    (_ :: _)
+    _
     (\(b :: _) (c :: _) -> hlistConsCase
-      (_ :: _)
-      (\_ (d :: _) -> hlistNilCase (_ :: _) (_rhs b) d)
+      _
+      (\_ (d :: _) -> hlistNilCase _ (_rhs b) d)
       c)
     a
 snd
   = \(a :: _) -> hlistConsCase
-    (_ :: _)
+    _
     (\_ (b :: _) -> hlistConsCase
-      (_ :: _)
-      (\(c :: _) (d :: _) -> hlistNilCase (_ :: _) (_rhs c) d)
+      _
+      (\(c :: _) (d :: _) -> hlistNilCase _ (_rhs c) d)
       b)
     a
-(|||) = \(a :: _) (b :: _) -> case'Bool (\_ -> _ :: _) (_rhs b) (_rhs True) a
+(|||) = \(a :: _) (b :: _) -> case'Bool (\_ -> _) (_rhs b) (_rhs True) a
 infixr 2 |||
-(&&&) = \(a :: _) (b :: _) -> case'Bool (\_ -> _ :: _) (_rhs False) (_rhs b) a
+(&&&) = \(a :: _) (b :: _) -> case'Bool (\_ -> _) (_rhs False) (_rhs b) a
 infixr 3 &&&
 data RecItem :: Type where
     RecItem :: String -> Type -> RecItem
-recItemType = \(a :: _) -> case'RecItem (\_ -> _ :: _) (\_ (b :: _) -> _rhs b) a
+recItemType = \(a :: _) -> case'RecItem (\_ -> _) (\_ (b :: _) -> _rhs b) a
 data RecordC (_ :: [RecItem]) :: Type where
     RecordCons :: forall (a :: [RecItem]) . HList (map recItemType a) -> RecordC a
 isKeyC
   = \(a :: _) (b :: _) (c :: _) -> case'List
-    (\_ -> _ :: _)
+    (\_ -> _)
     (_rhs ('Empty ""))
     (\(d :: _) (e :: _) -> case'RecItem
-      (\_ -> _ :: _)
+      (\_ -> _)
       (\(f :: _) (g :: _) -> _rhs
         (primIfThenElse (a == f) (b `'EqCTt` g) (isKeyC a b e)))
       d)
@@ -203,14 +184,14 @@ fstTup = _rhs (hlistConsCase (_ :: _) \(a :: _) _ -> a)
 sndTup = _rhs (hlistConsCase (_ :: _) \_ (a :: _) -> a)
 project
   = (\ @(a :: _) @(b :: _) (c :: _) @_ (d :: _) -> case'List
-      (\_ -> _ :: _)
+      (\_ -> _)
       (_rhs undefined)
       (\(e :: _) (f :: _) -> case'RecItem
-        (\_ -> _ :: _)
+        (\_ -> _)
         (\(g :: _) _ -> case'RecordC
-          (\_ -> _ :: _)
+          (\_ -> _)
           (\(h :: _) -> case'Bool
-            (\_ -> _ :: _)
+            (\_ -> _)
             (_rhs
               (project
                 @a
@@ -454,17 +435,17 @@ lookat
 scale = \(a :: _) (b :: _) -> _rhs (b * V4 a a a 1.0)
 fromTo
   = (\(a :: _) (b :: _) -> case'Bool
-      (\_ -> _ :: _)
+      (\_ -> _)
       (_rhs (a : fromTo (a + fromInt 1) b))
       (_rhs [])
       (a > b))
     :: Float -> Float -> [Float]
 (!!)
   = (\(a :: _) (b :: _) -> case'List
-      (\_ -> _ :: _)
+      (\_ -> _)
       (_rhs undefined)
       (\(c :: _) (d :: _) -> case'Bool
-        (\_ -> _ :: _)
+        (\_ -> _)
         (_rhs (d !! (b - fromInt 1)))
         (_rhs c)
         (fromInt 0 == b))
diff --git a/testdata/ambig.out b/testdata/ambig.out
index 00f0bcc8..ce1a76fb 100644
--- a/testdata/ambig.out
+++ b/testdata/ambig.out
@@ -4,10 +4,10 @@ h
     \(c
       := _rhs
         ((\(d :: _) -> hlistConsCase
-            (_ :: _)
+            _
             (\(e :: _) (f :: _) -> hlistConsCase
-              (_ :: _)
-              (\(g :: _) (h :: _) -> hlistNilCase (_ :: _) (a e g) h)
+              _
+              (\(g :: _) (h :: _) -> hlistNilCase _ (a e g) h)
               f)
             d)
           b)) -> c
diff --git a/testdata/complex.out b/testdata/complex.out
index 2154a46f..fa122fcc 100644
--- a/testdata/complex.out
+++ b/testdata/complex.out
@@ -11,17 +11,14 @@ polar
   = (\(a :: _) (b :: _) -> _rhs (Complex a b)) :: Float -> Float -> Complex Polar
 cabs
   = (\ @(a :: _) (b :: _) -> case'Repr
-      (\_ -> _ :: _)
-      (case'Complex
-        (\_ _ -> _ :: _)
-        (\(c :: _) (d :: _) -> _rhs (sqrt (c * c + d * d)))
-        b)
-      (case'Complex (\_ _ -> _ :: _) (\(e :: _) _ -> _rhs e) b)
+      (\_ -> _)
+      (case'Complex (\_ _ -> _) (\(c :: _) (d :: _) -> _rhs (sqrt (c * c + d * d))) 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 +40,20 @@ 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
+it_should_fail = \(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)
@@ -68,13 +64,13 @@ add
     :: forall (i :: _) (j :: _) . Complex i -> Complex j -> Complex i
 mul
   = (\ @(a :: _) @(b :: _) (c :: _) (d :: _) -> case'Repr
-      (\_ -> _ :: _)
+      (\_ -> _)
       (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 ae819782..d1952aed 100644
--- a/testdata/data.out
+++ b/testdata/data.out
@@ -10,7 +10,7 @@ data Data2 :: Type where
     Data24 :: Data2
 x
   = \(a :: _) -> case'Data2
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ -> _rhs undefined)
     (\(b :: _) _ -> _rhs b)
     (\(c :: _) -> _rhs c)
@@ -18,7 +18,7 @@ x
     a
 y
   = \(a :: _) -> case'Data2
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ -> _rhs undefined)
     (\_ (b :: _) -> _rhs b)
     (\_ -> _rhs undefined)
@@ -30,21 +30,21 @@ data Data5 (_ :: Type) (_ :: Type) (_ :: Type) :: Type where
     Data53 :: forall g h i . Int -> g -> Float -> h -> i -> Data5 g h i
 a5
   = \(a :: _) -> case'Data5
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\(b :: _) -> _rhs b)
     (\(c :: _) _ _ -> _rhs c)
     (\_ _ _ _ _ -> _rhs undefined)
     a
 b5
   = \(a :: _) -> case'Data5
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ -> _rhs undefined)
     (\_ (b :: _) _ -> _rhs b)
     (\_ _ _ _ _ -> _rhs undefined)
     a
 c5
   = \(a :: _) -> case'Data5
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ -> _rhs undefined)
     (\_ _ (b :: _) -> _rhs b)
     (\_ _ _ _ _ -> _rhs undefined)
diff --git a/testdata/language-features/basic-list/listcomp09.out b/testdata/language-features/basic-list/listcomp09.out
index 27afb045..96351e61 100644
--- a/testdata/language-features/basic-list/listcomp09.out
+++ b/testdata/language-features/basic-list/listcomp09.out
@@ -1,7 +1,6 @@
 ------------ desugared source code
 value1
-  = _rhs
-    (concatMap (\_ -> (\(a :: _) -> hlistNilCase (_ :: _) "Hello" a) : []) [])
+  = _rhs (concatMap (\_ -> (\(a :: _) -> hlistNilCase _ "Hello" a) : []) [])
 main is not found
 ------------ trace
 value1 :: Type => [() -> String]
diff --git a/testdata/language-features/basic-values/case01.out b/testdata/language-features/basic-values/case01.out
index 75dc7af3..8b4334e6 100644
--- a/testdata/language-features/basic-values/case01.out
+++ b/testdata/language-features/basic-values/case01.out
@@ -1,9 +1,9 @@
 ------------ desugared source code
-value1 = _rhs ((\(a :: _) -> hlistNilCase (_ :: _) HNil a) HNil)
-value2 = _rhs ((\(a :: _) -> hlistNilCase (_ :: _) HNil a) HNil)
-value3 = _rhs ((\(a :: _) -> hlistNilCase (_ :: _) HNil a) HNil)
-value4 = _rhs ((\(a :: _) -> hlistNilCase (_ :: _) HNil a) HNil)
-value5 = _rhs ((\(a :: _) -> hlistNilCase (_ :: _) HNil a) HNil)
+value1 = _rhs ((\(a :: _) -> hlistNilCase _ HNil a) HNil)
+value2 = _rhs ((\(a :: _) -> hlistNilCase _ HNil a) HNil)
+value3 = _rhs ((\(a :: _) -> hlistNilCase _ HNil a) HNil)
+value4 = _rhs ((\(a :: _) -> hlistNilCase _ HNil a) HNil)
+value5 = _rhs ((\(a :: _) -> hlistNilCase _ HNil a) HNil)
 value6 = _rhs ((\_ -> HNil) HNil)
 main is not found
 ------------ trace
diff --git a/testdata/language-features/basic-values/case02.out b/testdata/language-features/basic-values/case02.out
index c762c3fe..a5f57070 100644
--- a/testdata/language-features/basic-values/case02.out
+++ b/testdata/language-features/basic-values/case02.out
@@ -1,12 +1,12 @@
 ------------ desugared source code
 value1
   = _rhs
-    ((\(a :: _) -> case'Bool (\_ -> _ :: _) HNil HNil (fromInt 1 == a)) (fromInt 1))
+    ((\(a :: _) -> case'Bool (\_ -> _) HNil HNil (fromInt 1 == a)) (fromInt 1))
 value2
   = _rhs
     ((\(a :: _) -> case'Bool
-        (\_ -> _ :: _)
-        (case'Bool (\_ -> _ :: _) "_" "2" (fromInt 2 == a))
+        (\_ -> _)
+        (case'Bool (\_ -> _) "_" "2" (fromInt 2 == a))
         "1"
         (fromInt 1 == a))
       (fromInt 2))
diff --git a/testdata/language-features/basic-values/case05.out b/testdata/language-features/basic-values/case05.out
index 5021dfc3..e099d30d 100644
--- a/testdata/language-features/basic-values/case05.out
+++ b/testdata/language-features/basic-values/case05.out
@@ -1,7 +1,7 @@
 ------------ desugared source code
 value
   = \(a :: _) -> _rhs
-    ((\(b :: _) -> case'Bool (\_ -> _ :: _) undefined '1' (fromInt 1 == b)) a)
+    ((\(b :: _) -> case'Bool (\_ -> _) undefined '1' (fromInt 1 == b)) a)
 main is not found
 ------------ trace
 value :: forall a . (Eq a, Num a) => a -> Char
diff --git a/testdata/language-features/basic-values/case06.out b/testdata/language-features/basic-values/case06.out
index ca1b9d5e..aaeff605 100644
--- a/testdata/language-features/basic-values/case06.out
+++ b/testdata/language-features/basic-values/case06.out
@@ -1,7 +1,7 @@
 ------------ desugared source code
 value
   = \(a :: _) -> _rhs
-    ((\(b :: _) -> case'Bool (\_ -> _ :: _) '_' '1' (fromInt 1 == b)) a)
+    ((\(b :: _) -> case'Bool (\_ -> _) '_' '1' (fromInt 1 == b)) a)
 main is not found
 ------------ trace
 value :: forall a . (Eq a, Num a) => a -> Char
diff --git a/testdata/language-features/basic-values/def03.out b/testdata/language-features/basic-values/def03.out
index 726a2061..ceb6a8e1 100644
--- a/testdata/language-features/basic-values/def03.out
+++ b/testdata/language-features/basic-values/def03.out
@@ -1,8 +1,8 @@
 ------------ desugared source code
 fun
   = \(a :: _) -> case'Bool
-    (\_ -> _ :: _)
-    (case'Bool (\_ -> _ :: _) (_rhs undefined) (_rhs '2') (fromInt 2 == a))
+    (\_ -> _)
+    (case'Bool (\_ -> _) (_rhs undefined) (_rhs '2') (fromInt 2 == a))
     (_rhs '1')
     (fromInt 1 == a)
 main is not found
diff --git a/testdata/language-features/basic-values/def04.out b/testdata/language-features/basic-values/def04.out
index 18c66ed9..e52f9d64 100644
--- a/testdata/language-features/basic-values/def04.out
+++ b/testdata/language-features/basic-values/def04.out
@@ -1,14 +1,14 @@
 ------------ desugared source code
 fun
   = \(a :: _) -> case'Bool
-    (\_ -> _ :: _)
-    (case'Bool (\_ -> _ :: _) (_rhs '_') (_rhs '2') (fromInt 2 == a))
+    (\_ -> _)
+    (case'Bool (\_ -> _) (_rhs '_') (_rhs '2') (fromInt 2 == a))
     (_rhs '1')
     (fromInt 1 == a)
 fun2
   = \(a :: _) _ -> case'Bool
-    (\_ -> _ :: _)
-    (case'Bool (\_ -> _ :: _) (_rhs '_') (_rhs '2') (fromInt 2 == a))
+    (\_ -> _)
+    (case'Bool (\_ -> _) (_rhs '_') (_rhs '2') (fromInt 2 == a))
     (_rhs '1')
     (fromInt 1 == a)
 main is not found
diff --git a/testdata/language-features/basic-values/typesyn02.out b/testdata/language-features/basic-values/typesyn02.out
index 8f8e7892..44bc99c8 100644
--- a/testdata/language-features/basic-values/typesyn02.out
+++ b/testdata/language-features/basic-values/typesyn02.out
@@ -1,7 +1,7 @@
 ------------ desugared source code
 'MyUnit = _rhs ('HList [])
 fun
-  = (\_ (a :: _) -> hlistNilCase (_ :: _) (_rhs HNil) a)
+  = (\_ (a :: _) -> hlistNilCase _ (_rhs HNil) a)
     :: forall (b :: _) . b -> MyUnit -> MyUnit
 main is not found
 ------------ trace
diff --git a/testdata/language-features/basic-values/where05.out b/testdata/language-features/basic-values/where05.out
index d11a4dbc..8c082555 100644
--- a/testdata/language-features/basic-values/where05.out
+++ b/testdata/language-features/basic-values/where05.out
@@ -2,7 +2,7 @@
 value1
   = _rhs
     ((\(a :: _) -> case'Bool
-        (\_ -> _ :: _)
+        (\_ -> _)
         HNil
         (\(b := _rhs HNil) -> b)
         (fromInt 1 == a))
@@ -10,7 +10,7 @@ value1
 value2
   = _rhs
     ((\(a :: _) -> case'Bool
-        (\_ -> _ :: _)
+        (\_ -> _)
         HNil
         (\(b := _rhs HNil) -> b)
         (fromInt 1 == a))
@@ -18,18 +18,14 @@ value2
 value3
   = _rhs
     ((\(a :: _) -> case'Bool
-        (\_ -> _ :: _)
+        (\_ -> _)
         HNil
         (\(b := _rhs HNil) -> b)
         (fromInt 1 == a))
       (fromInt 1))
 value4
   = _rhs
-    \(a := _rhs HNil) -> (\(b :: _) -> case'Bool
-        (\_ -> _ :: _)
-        HNil
-        a
-        (fromInt 1 == b))
+    \(a := _rhs HNil) -> (\(b :: _) -> case'Bool (\_ -> _) HNil a (fromInt 1 == b))
       (fromInt 1)
 main is not found
 ------------ trace
diff --git a/testdata/language-features/guard/guard01.out b/testdata/language-features/guard/guard01.out
index e042cf51..b4195756 100644
--- a/testdata/language-features/guard/guard01.out
+++ b/testdata/language-features/guard/guard01.out
@@ -1,5 +1,5 @@
 ------------ desugared source code
-value = case'Bool (\_ -> _ :: _) (_rhs undefined) (_rhs HNil) True
+value = case'Bool (\_ -> _) (_rhs undefined) (_rhs HNil) True
 main is not found
 ------------ trace
 value :: ()
diff --git a/testdata/language-features/guard/guard03.out b/testdata/language-features/guard/guard03.out
index c7cfc230..7d7f8a4d 100644
--- a/testdata/language-features/guard/guard03.out
+++ b/testdata/language-features/guard/guard03.out
@@ -1,8 +1,8 @@
 ------------ desugared source code
 value
   = case'Bool
-    (\_ -> _ :: _)
-    (case'Bool (\_ -> _ :: _) (_rhs undefined) (_rhs "False") False)
+    (\_ -> _)
+    (case'Bool (\_ -> _) (_rhs undefined) (_rhs "False") False)
     (_rhs "True")
     True
 main is not found
diff --git a/testdata/language-features/guard/guard04.out b/testdata/language-features/guard/guard04.out
index 35a1df34..21a9ff19 100644
--- a/testdata/language-features/guard/guard04.out
+++ b/testdata/language-features/guard/guard04.out
@@ -1,5 +1,5 @@
 ------------ desugared source code
-value = case'Bool (\_ -> _ :: _) (_rhs "False") (_rhs "True") True
+value = case'Bool (\_ -> _) (_rhs "False") (_rhs "True") True
 main is not found
 ------------ trace
 value :: String
diff --git a/testdata/language-features/guard/guard07.out b/testdata/language-features/guard/guard07.out
index 8b2af531..acc704ba 100644
--- a/testdata/language-features/guard/guard07.out
+++ b/testdata/language-features/guard/guard07.out
@@ -1,8 +1,8 @@
 ------------ desugared source code
 value
   = case'Bool
-    (\_ -> _ :: _)
-    (case'Bool (\_ -> _ :: _) (_rhs undefined) (_rhs "False") False)
+    (\_ -> _)
+    (case'Bool (\_ -> _) (_rhs undefined) (_rhs "False") False)
     (_rhs "True")
     True
 main is not found
diff --git a/testdata/language-features/guard/guard08.out b/testdata/language-features/guard/guard08.out
index 47b29db9..eeef1da6 100644
--- a/testdata/language-features/guard/guard08.out
+++ b/testdata/language-features/guard/guard08.out
@@ -1,8 +1,8 @@
 ------------ desugared source code
 value
   = case'Bool
-    (\_ -> _ :: _)
-    (case'Bool (\_ -> _ :: _) (_rhs undefined) (_rhs "False") False)
+    (\_ -> _)
+    (case'Bool (\_ -> _) (_rhs undefined) (_rhs "False") False)
     (_rhs "True")
     True
 main is not found
diff --git a/testdata/language-features/guard/guard09.out b/testdata/language-features/guard/guard09.out
index aa6d848f..09a72fa0 100644
--- a/testdata/language-features/guard/guard09.out
+++ b/testdata/language-features/guard/guard09.out
@@ -1,8 +1,8 @@
 ------------ desugared source code
 value
   = case'Bool
-    (\_ -> _ :: _)
-    (case'Bool (\_ -> _ :: _) (_rhs undefined) (_rhs "False") False)
+    (\_ -> _)
+    (case'Bool (\_ -> _) (_rhs undefined) (_rhs "False") False)
     (_rhs "True")
     True
 main is not found
diff --git a/testdata/language-features/guard/guard11.out b/testdata/language-features/guard/guard11.out
index 47bd37ad..1d173fb2 100644
--- a/testdata/language-features/guard/guard11.out
+++ b/testdata/language-features/guard/guard11.out
@@ -1,5 +1,5 @@
 ------------ desugared source code
-fun = \(a :: _) -> case'Bool (\_ -> _ :: _) (_rhs "False") (_rhs "True") a
+fun = \(a :: _) -> case'Bool (\_ -> _) (_rhs "False") (_rhs "True") a
 main is not found
 ------------ trace
 fun :: Bool -> String
diff --git a/testdata/language-features/guard/guard13.out b/testdata/language-features/guard/guard13.out
index 65411e87..e8bd4c84 100644
--- a/testdata/language-features/guard/guard13.out
+++ b/testdata/language-features/guard/guard13.out
@@ -1,5 +1,5 @@
 ------------ desugared source code
-fun = \(a :: _) -> case'Bool (\_ -> _ :: _) (_rhs HNil) (_rhs HNil) a
+fun = \(a :: _) -> case'Bool (\_ -> _) (_rhs HNil) (_rhs HNil) a
 main is not found
 ------------ trace
 fun :: Bool -> ()
diff --git a/testdata/language-features/guard/guard14.out b/testdata/language-features/guard/guard14.out
index 05321956..e0b32348 100644
--- a/testdata/language-features/guard/guard14.out
+++ b/testdata/language-features/guard/guard14.out
@@ -1,6 +1,5 @@
 ------------ desugared source code
-value
-  = _rhs \(a := case'Bool (\_ -> _ :: _) (_rhs HNil) (_rhs HNil) True) -> HNil
+value = _rhs \(a := case'Bool (\_ -> _) (_rhs HNil) (_rhs HNil) True) -> HNil
 main is not found
 ------------ trace
 value :: ()
diff --git a/testdata/language-features/guard/guard15.out b/testdata/language-features/guard/guard15.out
index 50452c29..733c2b34 100644
--- a/testdata/language-features/guard/guard15.out
+++ b/testdata/language-features/guard/guard15.out
@@ -1,6 +1,5 @@
 ------------ desugared source code
-value
-  = _rhs \(a := case'Bool (\_ -> _ :: _) (_rhs HNil) (_rhs HNil) True) -> HNil
+value = _rhs \(a := case'Bool (\_ -> _) (_rhs HNil) (_rhs HNil) True) -> HNil
 main is not found
 ------------ trace
 value :: ()
diff --git a/testdata/language-features/guard/guard16.out b/testdata/language-features/guard/guard16.out
index 710f1ae9..4fc90e30 100644
--- a/testdata/language-features/guard/guard16.out
+++ b/testdata/language-features/guard/guard16.out
@@ -2,9 +2,9 @@
 value
   = _rhs
     ((\(a :: _) -> case'Bool
-        (\_ -> _ :: _)
+        (\_ -> _)
         HNil
-        (case'Bool (\_ -> _ :: _) HNil HNil True)
+        (case'Bool (\_ -> _) HNil HNil True)
         (fromInt 1 == a))
       (fromInt 1))
 main is not found
diff --git a/testdata/language-features/module/import09.out b/testdata/language-features/module/import09.out
index 790fbf72..e7df6502 100644
--- a/testdata/language-features/module/import09.out
+++ b/testdata/language-features/module/import09.out
@@ -1,6 +1,6 @@
 ------------ desugared source code
 fun
-  = (\_ (a :: _) -> hlistNilCase (_ :: _) (_rhs HNil) a)
+  = (\_ (a :: _) -> hlistNilCase _ (_rhs HNil) a)
     :: forall (b :: _) . b -> MyUnit -> MyUnit
 main is not found
 ------------ trace
diff --git a/testdata/language-features/pattern/pattern01.out b/testdata/language-features/pattern/pattern01.out
index 7679e35c..1683fdec 100644
--- a/testdata/language-features/pattern/pattern01.out
+++ b/testdata/language-features/pattern/pattern01.out
@@ -1,9 +1,8 @@
 ------------ desugared source code
-fun1
-  = \(a :: _) -> case'Bool (\_ -> _ :: _) (_rhs '_') (_rhs '0') (fromInt 0 == a)
-fun2 = \(a :: _) -> case'Bool (\_ -> _ :: _) (_rhs '_') (_rhs '0') ("0" == a)
-fun3 = \(a :: _) -> case'Bool (\_ -> _ :: _) (_rhs '_') (_rhs '0') ('0' == a)
-fun4 = \(a :: _) -> hlistNilCase (_ :: _) (_rhs '0') a
+fun1 = \(a :: _) -> case'Bool (\_ -> _) (_rhs '_') (_rhs '0') (fromInt 0 == a)
+fun2 = \(a :: _) -> case'Bool (\_ -> _) (_rhs '_') (_rhs '0') ("0" == a)
+fun3 = \(a :: _) -> case'Bool (\_ -> _) (_rhs '_') (_rhs '0') ('0' == a)
+fun4 = \(a :: _) -> hlistNilCase _ (_rhs '0') a
 main is not found
 ------------ trace
 fun1 :: forall a . (Eq a, Num a) => a -> Char
diff --git a/testdata/language-features/pattern/uncovered.out b/testdata/language-features/pattern/uncovered.out
index 9af16a3f..531a913a 100644
--- a/testdata/language-features/pattern/uncovered.out
+++ b/testdata/language-features/pattern/uncovered.out
@@ -1,37 +1,37 @@
 ------------ desugared source code
 f
   = \(a :: _) (b :: _) (c :: _) -> case'Bool
-    (\_ -> _ :: _)
+    (\_ -> _)
     (case'Bool
-      (\_ -> _ :: _)
-      (case'Bool (\_ -> _ :: _) (_rhs undefined) (_rhs (fromInt 1)) c)
+      (\_ -> _)
+      (case'Bool (\_ -> _) (_rhs undefined) (_rhs (fromInt 1)) c)
       (_rhs (fromInt 2))
       a)
     (case'Bool
-      (\_ -> _ :: _)
+      (\_ -> _)
       (_rhs (fromInt 0))
-      (case'Bool (\_ -> _ :: _) (_rhs (fromInt 1)) (_rhs undefined) a)
+      (case'Bool (\_ -> _) (_rhs (fromInt 1)) (_rhs undefined) a)
       c)
     b
 g
   = \(a :: _) -> case'List
-    (\_ -> _ :: _)
+    (\_ -> _)
     (_rhs undefined)
     (\(b :: _) (c :: _) -> case'Bool
-      (\_ -> _ :: _)
+      (\_ -> _)
       (_rhs undefined)
       (case'List
-        (\_ -> _ :: _)
+        (\_ -> _)
         (_rhs undefined)
         (\(d :: _) (e :: _) -> case'Bool
-          (\_ -> _ :: _)
+          (\_ -> _)
           (case'List
-            (\_ -> _ :: _)
+            (\_ -> _)
             (_rhs undefined)
             (\(f :: _) (g :: _) -> case'Bool
-              (\_ -> _ :: _)
+              (\_ -> _)
               (_rhs undefined)
-              (case'List (\_ -> _ :: _) (_rhs False) (\_ _ -> _rhs undefined) g)
+              (case'List (\_ -> _) (_rhs False) (\_ _ -> _rhs undefined) g)
               f)
             e)
           (_rhs undefined)
@@ -41,27 +41,27 @@ g
     a
 h
   = \(a :: _) -> case'List
-    (\_ -> _ :: _)
+    (\_ -> _)
     (_rhs undefined)
     (\(b :: _) (c :: _) -> case'List
-      (\_ -> _ :: _)
+      (\_ -> _)
       (_rhs undefined)
       (\(d :: _) (e :: _) -> case'Bool
-        (\_ -> _ :: _)
+        (\_ -> _)
         (_rhs undefined)
         (case'List
-          (\_ -> _ :: _)
+          (\_ -> _)
           (case'List
-            (\_ -> _ :: _)
+            (\_ -> _)
             (_rhs undefined)
             (\(f :: _) (g :: _) -> case'List
-              (\_ -> _ :: _)
+              (\_ -> _)
               (_rhs undefined)
               (\(h :: _) (i :: _) -> case'Bool
-                (\_ -> _ :: _)
+                (\_ -> _)
                 (case'List
-                  (\_ -> _ :: _)
-                  (case'List (\_ -> _ :: _) (_rhs True) (\_ _ -> _rhs undefined) g)
+                  (\_ -> _)
+                  (case'List (\_ -> _) (_rhs True) (\_ _ -> _rhs undefined) g)
                   (\_ _ -> _rhs undefined)
                   i)
                 (_rhs undefined)
diff --git a/testdata/language-features/recursion/simplerec01.out b/testdata/language-features/recursion/simplerec01.out
index e264622f..89006870 100644
--- a/testdata/language-features/recursion/simplerec01.out
+++ b/testdata/language-features/recursion/simplerec01.out
@@ -1,7 +1,7 @@
 ------------ desugared source code
 fun
   = \(a :: _) -> case'Bool
-    (\_ -> _ :: _)
+    (\_ -> _)
     (_rhs (fun (fromInt 0)))
     (_rhs 'a')
     (fromInt 0 == a)
diff --git a/testdata/language-features/recursion/simplerec02.out b/testdata/language-features/recursion/simplerec02.out
index 4e95a85e..7f24ea1c 100644
--- a/testdata/language-features/recursion/simplerec02.out
+++ b/testdata/language-features/recursion/simplerec02.out
@@ -4,7 +4,7 @@ value
     \(a
       := primFix
         \(b :: _) (c :: _) -> case'Bool
-          (\_ -> _ :: _)
+          (\_ -> _)
           (_rhs (b (fromInt 0)))
           (_rhs 'a')
           (fromInt 0 == c)) -> HNil
diff --git a/testdata/language-features/recursion/simplerec03.out b/testdata/language-features/recursion/simplerec03.out
index 9bdd104f..512baba5 100644
--- a/testdata/language-features/recursion/simplerec03.out
+++ b/testdata/language-features/recursion/simplerec03.out
@@ -4,7 +4,7 @@ value
     \(a
       := primFix
         \(b :: _) (c :: _) -> case'Bool
-          (\_ -> _ :: _)
+          (\_ -> _)
           (_rhs (b (fromInt 0)))
           (_rhs 'a')
           (fromInt 0 == c)) -> HNil
diff --git a/testdata/performance/Material.out b/testdata/performance/Material.out
index 76e3c20c..ea52e563 100644
--- a/testdata/performance/Material.out
+++ b/testdata/performance/Material.out
@@ -5,14 +5,11 @@ data Entity :: Type where
       :: Vec (fromInt 4) Float
         -> Vec (fromInt 4) Float
           -> Vec (fromInt 3) Float -> Vec (fromInt 4) Float -> Entity
-eAmbientLight
-  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\(b :: _) _ _ _ -> _rhs b) a
+eAmbientLight = \(a :: _) -> case'Entity (\_ -> _) (\(b :: _) _ _ _ -> _rhs b) a
 eDirectedLight
-  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\_ (b :: _) _ _ -> _rhs b) a
-eLightDir
-  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\_ _ (b :: _) _ -> _rhs b) a
-eShaderRGBA
-  = \(a :: _) -> case'Entity (\_ -> _ :: _) (\_ _ _ (b :: _) -> _rhs b) a
+  = \(a :: _) -> case'Entity (\_ -> _) (\_ (b :: _) _ _ -> _rhs b) a
+eLightDir = \(a :: _) -> case'Entity (\_ -> _) (\_ _ (b :: _) _ -> _rhs b) a
+eShaderRGBA = \(a :: _) -> case'Entity (\_ -> _) (\_ _ _ (b :: _) -> _rhs b) a
 data WaveType :: Type where
     WT_Sin :: WaveType
     WT_Triangle :: WaveType
@@ -114,57 +111,57 @@ data StageAttrs :: Type where
                   -> Bool -> DepthFunction -> Maybe AlphaFunction -> Bool -> String -> StageAttrs
 saBlend
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\(b :: _) _ _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
 saRGBGen
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ (b :: _) _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
 saAlphaGen
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ (b :: _) _ _ _ _ _ _ _ _ -> _rhs b)
     a
 saTCGen
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ (b :: _) _ _ _ _ _ _ _ -> _rhs b)
     a
 saTCMod
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ (b :: _) _ _ _ _ _ _ -> _rhs b)
     a
 saTexture
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ (b :: _) _ _ _ _ _ -> _rhs b)
     a
 saDepthWrite
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ (b :: _) _ _ _ _ -> _rhs b)
     a
 saDepthFunc
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ _ (b :: _) _ _ _ -> _rhs b)
     a
 saAlphaFunc
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ _ _ (b :: _) _ _ -> _rhs b)
     a
 saDepthMaskExplicit
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ _ _ _ (b :: _) _ -> _rhs b)
     a
 saTextureUniform
   = \(a :: _) -> case'StageAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ _ _ _ _ (b :: _) -> _rhs b)
     a
 defaultStageAttrs
@@ -193,62 +190,62 @@ data CommonAttrs :: Type where
                   -> CullType -> [Deform] -> Bool -> Bool -> [StageAttrs] -> Bool -> CommonAttrs
 caSkyParms
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\(b :: _) _ _ _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
 caFogParms
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ (b :: _) _ _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
 caPortal
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ (b :: _) _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
 caSort
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ (b :: _) _ _ _ _ _ _ _ _ -> _rhs b)
     a
 caEntityMergable
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ (b :: _) _ _ _ _ _ _ _ -> _rhs b)
     a
 caFogOnly
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ (b :: _) _ _ _ _ _ _ -> _rhs b)
     a
 caCull
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ (b :: _) _ _ _ _ _ -> _rhs b)
     a
 caDeformVertexes
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ _ (b :: _) _ _ _ _ -> _rhs b)
     a
 caNoMipMaps
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ _ _ (b :: _) _ _ _ -> _rhs b)
     a
 caPolygonOffset
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ _ _ _ (b :: _) _ _ -> _rhs b)
     a
 caStages
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ _ _ _ _ (b :: _) _ -> _rhs b)
     a
 caIsSky
   = \(a :: _) -> case'CommonAttrs
-    (\_ -> _ :: _)
+    (\_ -> _)
     (\_ _ _ _ _ _ _ _ _ _ _ (b :: _) -> _rhs b)
     a
 defaultCommonAttrs
diff --git a/testdata/typeclass.out b/testdata/typeclass.out
index 82487126..dcc242da 100644
--- a/testdata/typeclass.out
+++ b/testdata/typeclass.out
@@ -4,9 +4,9 @@ infix 4 /=
 infix 4 <
 infixr 3 &&
 infixr 2 ||
-not = \(a :: _) -> case'Bool (\_ -> _ :: _) (_rhs True) (_rhs False) a
-(&&) = \(a :: _) (b :: _) -> case'Bool (\_ -> _ :: _) (_rhs False) (_rhs b) a
-(||) = \(a :: _) (b :: _) -> case'Bool (\_ -> _ :: _) (_rhs b) (_rhs True) a
+not = \(a :: _) -> case'Bool (\_ -> _) (_rhs True) (_rhs False) a
+(&&) = \(a :: _) (b :: _) -> case'Bool (\_ -> _) (_rhs False) (_rhs b) a
+(||) = \(a :: _) (b :: _) -> case'Bool (\_ -> _) (_rhs b) (_rhs True) a
 'Eq
   = (\(a :: _) -> match'Bool
       (\_ -> _)
@@ -19,11 +19,7 @@ not = \(a :: _) -> case'Bool (\_ -> _ :: _) (_rhs True) (_rhs False) a
       (\_ -> _)
       (_rhs
         \(b
-          := \(c :: _) (d :: _) -> case'Bool
-            (\_ -> _ :: _)
-            (_rhs (not d))
-            (_rhs d)
-            c) -> b)
+          := \(c :: _) (d :: _) -> case'Bool (\_ -> _) (_rhs (not d)) (_rhs d) c) -> b)
       a
       (_rhs undefined))
     :: forall e . Eq e => e -> e -> Bool
diff --git a/testdata/zip01.out b/testdata/zip01.out
index 5471a160..8ba64e69 100644
--- a/testdata/zip01.out
+++ b/testdata/zip01.out
@@ -1,10 +1,10 @@
 ------------ desugared source code
 zip2
   = (\(a :: _) (b :: _) -> case'List
-      (\_ -> _ :: _)
+      (\_ -> _)
       (_rhs [])
       (\(c :: _) (d :: _) -> case'List
-        (\_ -> _ :: _)
+        (\_ -> _)
         (_rhs [])
         (\(e :: _) (f :: _) -> _rhs (HCons c (HCons e HNil) : zip2 d f))
         b)