26 files changed, 67 insertions, 75 deletions

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