mutual function definitions

94 files changed, 2272 insertions, 1734 deletions

diff --git a/testdata/Builtins.out b/testdata/Builtins.out
index c47b4fd5..8cfc533f 100644
--- a/testdata/Builtins.out
+++ b/testdata/Builtins.out
@@ -805,45 +805,49 @@ head
       a
 
 (++)
-  = _lhs
-    (++)
-    \(a :: _) (b :: _) -> case'List
-      (\(_ :: _) -> _)
-      (_rhs b)
-      (\(c :: _) (d :: _) -> _rhs (c : d ++ b))
-      a
+  = primFix
+    \(a :: _) -> _lhs
+      (++)
+      \(b :: _) (c :: _) -> case'List
+        (\(_ :: _) -> _)
+        (_rhs c)
+        (\(d :: _) (e :: _) -> _rhs (d : a e c))
+        b
 
 foldr
-  = _lhs
-    foldr
-    \(a :: _) (b :: _) (c :: _) -> case'List
-      (\(_ :: _) -> _)
-      (_rhs b)
-      (\(d :: _) (e :: _) -> _rhs (a d (foldr a b e)))
-      c
+  = primFix
+    \(a :: _) -> _lhs
+      foldr
+      \(b :: _) (c :: _) (d :: _) -> case'List
+        (\(_ :: _) -> _)
+        (_rhs c)
+        (\(e :: _) (f :: _) -> _rhs (b e (a b c f)))
+        d
 
 concat = _lhs concat (_rhs (foldr (++) []))
 
 map
-  = _lhs
-    map
-    \(a :: _) (b :: _) -> case'List
-      (\(_ :: _) -> _)
-      (_rhs [])
-      (\(c :: _) (d :: _) -> _rhs (a c : map a d))
-      b
+  = primFix
+    \(a :: _) -> _lhs
+      map
+      \(b :: _) (c :: _) -> case'List
+        (\(_ :: _) -> _)
+        (_rhs [])
+        (\(d :: _) (e :: _) -> _rhs (b d : a b e))
+        c
 
 concatMap :: forall (a :: _) (b :: _) . (a -> [b]) -> [a] -> [b]
 concatMap = _lhs concatMap \(a :: _) (b :: _) -> _rhs (concat (map a b))
 
 len
-  = _lhs
-    len
-    \(a :: _) -> case'List
-      (\(_ :: _) -> _)
-      (_rhs (fromInt 0))
-      (\(_ :: _) (b :: _) -> _rhs (fromInt 1 `primAddInt` len b))
-      a
+  = primFix
+    \(a :: _) -> _lhs
+      len
+      \(b :: _) -> case'List
+        (\(_ :: _) -> _)
+        (_rhs (fromInt 0))
+        (\(_ :: _) (c :: _) -> _rhs (fromInt 1 `primAddInt` a c))
+        b
 
 data Maybe (_ :: Type) :: Type where
     Nothing :: forall a . Maybe a
@@ -1191,17 +1195,18 @@ rasterizePrimitives
 
 allSame :: forall (a :: _) . [a] -> Constraint
 allSame
-  = _lhs
-    allSame
-    \(a :: _) -> case'List
-      (\(_ :: _) -> _)
-      (_rhs 'CUnit)
-      (\(b :: _) (c :: _) -> case'List
+  = primFix
+    \(a :: forall (b :: _) . [b] -> Constraint) -> _lhs
+      allSame
+      \(c :: _) -> case'List
         (\(_ :: _) -> _)
         (_rhs 'CUnit)
-        (\(d :: _) (e :: _) -> _rhs ('T2 (b `'EqCTt` d) (allSame (d : e))))
-        c)
-      a
+        (\(d :: _) (e :: _) -> case'List
+          (\(_ :: _) -> _)
+          (_rhs 'CUnit)
+          (\(f :: _) (g :: _) -> _rhs ('T2 (d `'EqCTt` f) (a (f : g))))
+          e)
+        c
 
 sameLayerCounts
   = _lhs sameLayerCounts \(a :: _) -> _rhs (allSame (map 'ImageLC a))
@@ -1583,7 +1588,7 @@ accumulationContext = _lhs accumulationContext \(a :: _) -> _rhs a
     (undefined 'ImageKind)
 
 'FragmentStream :: Nat -> Type -> Type
-'FragmentStream = \a b -> _rhs ['Vector a ('Maybe ('SimpleFragment b))]
+'FragmentStream = \a b -> _rhs ['Fragment a b]
 
 'FrameBuffer :: Nat -> [ImageKind] -> Type
 'FrameBuffer = <<type constructor with 0 indices; constructors: >>
@@ -1746,12 +1751,12 @@ accumulationContext = _lhs accumulationContext \(a :: _) -> _rhs a
 ++ :: forall a . [a] -> [a] -> [a]
 ++
   = \a -> primFix
-    ([a] -> [a] -> [a])
+    _
     \b c d -> case'List (\_ -> [a]) (_rhs d) (\e f -> _rhs (e : b f d)) c
 
 Accumulate
   :: forall (a :: [ImageKind]) (b :: Nat) (c :: [Type])
-    . (a ~ (map Type ImageKind FragmentOperationKind c :: [ImageKind]))
+    . (a ~ (map FragmentOperationKind c :: [ImageKind]))
       => HList c
         -> FragmentStream b (HList (imageType' a)) -> FrameBuffer b a -> FrameBuffer b a
 Accumulate = \a b c d e f g -> <<builtin>>
@@ -1851,8 +1856,7 @@ Flat = <<2nd constructor of 'Interpolated>>
 FrameBuffer
   :: forall (a :: [Type])
     . sameLayerCounts a
-      => HList a
-        -> FrameBuffer (ImageLC (head Type a)) (map Type ImageKind GetImageKind a)
+      => HList a -> FrameBuffer (ImageLC (head a)) (map GetImageKind a)
 FrameBuffer = \a b c -> <<builtin>>
 
 FuncAdd :: BlendEquation
@@ -2071,16 +2075,16 @@ PrimAbs :: forall a b (c :: Nat) . (Signed a, b ~ VecScalar c a) => b -> b
 PrimAbs = \a b c d e f -> <<builtin>>
 
 PrimAdd :: forall a . Num (MatVecScalarElem a) => a -> a -> a
-PrimAdd = \a b c d -> <<builtin>>
+PrimAdd = \a b c d -> <<delta function with arity 4>>
 
 PrimAddS :: forall a b . (a ~ MatVecScalarElem b, Num a) => b -> a -> b
-PrimAddS = \a b c d e f -> <<builtin>>
+PrimAddS = \a b c d e f -> <<delta function with arity 6>>
 
 PrimAll :: forall (a :: Nat) . VecScalar a Bool -> Bool
 PrimAll = \a b -> <<builtin>>
 
 PrimAnd :: Bool -> Bool -> Bool
-PrimAnd = \a b -> <<builtin>>
+PrimAnd = \a b -> <<delta function with arity 2>>
 
 PrimAny :: forall (a :: Nat) . VecScalar a Bool -> Bool
 PrimAny = \a b -> <<builtin>>
@@ -2166,21 +2170,21 @@ PrimDistance :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a -> Float
 PrimDistance = \a b c d e -> <<builtin>>
 
 PrimDiv :: forall a b (c :: Nat) . (Num a, b ~ VecScalar c a) => b -> b -> b
-PrimDiv = \a b c d e f g -> <<builtin>>
+PrimDiv = \a b c d e f g -> <<delta function with arity 7>>
 
 PrimDivS :: forall a b (c :: Nat) . (Num a, b ~ VecScalar c a) => b -> a -> b
-PrimDivS = \a b c d e f g -> <<builtin>>
+PrimDivS = \a b c d e f g -> <<delta function with arity 7>>
 
 PrimDot :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a -> Float
 PrimDot = \a b c d e -> <<builtin>>
 
 PrimEqual :: forall a b . (b ~ MatVecScalarElem a) => a -> a -> Bool
-PrimEqual = \a b c d e -> <<builtin>>
+PrimEqual = \a b c d e -> <<delta function with arity 5>>
 
 PrimEqualV
   :: forall a (b :: Nat) c d
     . (Num c, a ~ VecScalar b c, d ~ VecScalar b Bool) => a -> a -> d
-PrimEqualV = \a b c d e f g h i -> <<builtin>>
+PrimEqualV = \a b c d e f g h i -> <<delta function with arity 9>>
 
 PrimExp :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
 PrimExp = \a b c d -> <<builtin>>
@@ -2210,12 +2214,12 @@ PrimFract = \a b c d -> <<builtin>>
 PrimGreaterThan
   :: forall a (b :: Nat) c d
     . (Num c, a ~ VecScalar b c, d ~ VecScalar b Bool) => a -> a -> d
-PrimGreaterThan = \a b c d e f g h i -> <<builtin>>
+PrimGreaterThan = \a b c d e f g h i -> <<delta function with arity 9>>
 
 PrimGreaterThanEqual
   :: forall a (b :: Nat) c d
     . (Num c, a ~ VecScalar b c, d ~ VecScalar b Bool) => a -> a -> d
-PrimGreaterThanEqual = \a b c d e f g h i -> <<builtin>>
+PrimGreaterThanEqual = \a b c d e f g h i -> <<delta function with arity 9>>
 
 PrimIntBitsToFloat :: forall (a :: Nat) . VecScalar a Int -> VecScalar a Float
 PrimIntBitsToFloat = \a b -> <<builtin>>
@@ -2242,12 +2246,12 @@ PrimLength = \a b c d -> <<builtin>>
 PrimLessThan
   :: forall a (b :: Nat) c d
     . (Num c, a ~ VecScalar b c, d ~ VecScalar b Bool) => a -> a -> d
-PrimLessThan = \a b c d e f g h i -> <<builtin>>
+PrimLessThan = \a b c d e f g h i -> <<delta function with arity 9>>
 
 PrimLessThanEqual
   :: forall a (b :: Nat) c d
     . (Num c, a ~ VecScalar b c, d ~ VecScalar b Bool) => a -> a -> d
-PrimLessThanEqual = \a b c d e f g h i -> <<builtin>>
+PrimLessThanEqual = \a b c d e f g h i -> <<delta function with arity 9>>
 
 PrimLine :: forall a . a -> a -> Primitive a 'Line
 PrimLine = <<1st constructor of 'Primitive>>
@@ -2283,16 +2287,16 @@ PrimMixS
 PrimMixS = \a b c d e f -> <<builtin>>
 
 PrimMod :: forall a b (c :: Nat) . (Num a, b ~ VecScalar c a) => b -> b -> b
-PrimMod = \a b c d e f g -> <<builtin>>
+PrimMod = \a b c d e f g -> <<delta function with arity 7>>
 
 PrimModF :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> (a, a)
 PrimModF = \a b c d -> <<builtin>>
 
 PrimModS :: forall a b (c :: Nat) . (Num a, b ~ VecScalar c a) => b -> a -> b
-PrimModS = \a b c d e f g -> <<builtin>>
+PrimModS = \a b c d e f g -> <<delta function with arity 7>>
 
 PrimMul :: forall a . Num (MatVecScalarElem a) => a -> a -> a
-PrimMul = \a b c d -> <<builtin>>
+PrimMul = \a b c d -> <<delta function with arity 4>>
 
 PrimMulMatMat
   :: forall (a :: Nat) (b :: Nat) c (d :: Nat)
@@ -2304,14 +2308,14 @@ PrimMulMatVec
 PrimMulMatVec = \a b c d e -> <<builtin>>
 
 PrimMulS :: forall a b . (a ~ MatVecScalarElem b, Num a) => b -> a -> b
-PrimMulS = \a b c d e f -> <<builtin>>
+PrimMulS = \a b c d e f -> <<delta function with arity 6>>
 
 PrimMulVecMat
   :: forall (a :: Nat) b (c :: Nat) . Vec a b -> Mat a c b -> Vec c b
 PrimMulVecMat = \a b c d e -> <<builtin>>
 
 PrimNeg :: forall a . Signed (MatVecScalarElem a) => a -> a
-PrimNeg = \a b c -> <<builtin>>
+PrimNeg = \a b c -> <<delta function with arity 3>>
 
 PrimNoise1 :: forall (a :: Nat) . VecScalar a Float -> Float
 PrimNoise1 = \a b -> <<builtin>>
@@ -2329,18 +2333,18 @@ PrimNormalize :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
 PrimNormalize = \a b c d -> <<builtin>>
 
 PrimNot :: forall a (b :: Nat) . (a ~ VecScalar b Bool) => a -> a
-PrimNot = \a b c d -> <<builtin>>
+PrimNot = \a b c d -> <<delta function with arity 4>>
 
 PrimNotEqual :: forall a b . (b ~ MatVecScalarElem a) => a -> a -> Bool
-PrimNotEqual = \a b c d e -> <<builtin>>
+PrimNotEqual = \a b c d e -> <<delta function with arity 5>>
 
 PrimNotEqualV
   :: forall a (b :: Nat) c d
     . (Num c, a ~ VecScalar b c, d ~ VecScalar b Bool) => a -> a -> d
-PrimNotEqualV = \a b c d e f g h i -> <<builtin>>
+PrimNotEqualV = \a b c d e f g h i -> <<delta function with arity 9>>
 
 PrimOr :: Bool -> Bool -> Bool
-PrimOr = \a b -> <<builtin>>
+PrimOr = \a b -> <<delta function with arity 2>>
 
 PrimOuterProduct
   :: forall (a :: Nat) b (c :: Nat) . Vec a b -> Vec c b -> Mat c a b
@@ -2393,10 +2397,10 @@ PrimStepS :: forall a (b :: Nat) . (a ~ VecScalar b Float) => Float -> a -> a
 PrimStepS = \a b c d e -> <<builtin>>
 
 PrimSub :: forall a . Num (MatVecScalarElem a) => a -> a -> a
-PrimSub = \a b c d -> <<builtin>>
+PrimSub = \a b c d -> <<delta function with arity 4>>
 
 PrimSubS :: forall a b . (a ~ MatVecScalarElem b, Num a) => b -> a -> b
-PrimSubS = \a b c d e f -> <<builtin>>
+PrimSubS = \a b c d e f -> <<delta function with arity 6>>
 
 PrimTan :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
 PrimTan = \a b c d -> <<builtin>>
@@ -2417,7 +2421,7 @@ PrimUIntBitsToFloat :: forall (a :: Nat) . VecScalar a Word -> VecScalar a Float
 PrimUIntBitsToFloat = \a b -> <<builtin>>
 
 PrimXor :: Bool -> Bool -> Bool
-PrimXor = \a b -> <<builtin>>
+PrimXor = \a b -> <<delta function with arity 2>>
 
 PrjImage :: forall (a :: ImageKind) . FrameBuffer 1 ' [a] -> Image 1 a
 PrjImage = \a b -> <<builtin>>
@@ -2522,31 +2526,20 @@ ZeroBF = <<0th constructor of 'BlendingFactor>>
 accumulate
   :: forall (a :: Nat) (b :: [Type]) c
     . HList b
-      -> (c -> HList (imageType' (map Type ImageKind FragmentOperationKind b)))
+      -> (c -> HList (imageType' (map FragmentOperationKind b)))
         -> [Vector a (Maybe (SimpleFragment c))]
-          -> FrameBuffer a (map Type ImageKind FragmentOperationKind b)
-            -> FrameBuffer a (map Type ImageKind FragmentOperationKind b)
+          -> FrameBuffer a (map FragmentOperationKind b)
+            -> FrameBuffer a (map FragmentOperationKind b)
 accumulate
   = \a b c d e f g -> _rhs
     (Accumulate
-      (map Type 'ImageKind 'FragmentOperationKind b)
+      (map 'FragmentOperationKind b)
       a
       b
       TT
       d
       (map
-        ('Vector a ('Maybe ('SimpleFragment c)))
-        ('Vector
-          a
-          ('Maybe
-            ('SimpleFragment
-              ('HList (imageType' (map Type 'ImageKind 'FragmentOperationKind b))))))
-        (\h -> mapFragment
-          c
-          ('HList (imageType' (map Type 'ImageKind 'FragmentOperationKind b)))
-          a
-          e
-          h)
+        (\h -> mapFragment c ('HList (imageType' (map 'FragmentOperationKind b))) a e h)
         f)
       g)
 
@@ -2554,21 +2547,21 @@ accumulateWith :: forall a b . a -> b -> (a, b)
 accumulateWith = \a b c d -> _rhs (c, d)
 
 accumulationContext :: forall a . a -> a
-accumulationContext = \_ a -> _rhs a
+accumulationContext = \a b -> _rhs b
 
 allSame :: forall a . [a] -> Constraint
 allSame
   = primFix
-    (forall a . [a] -> 'Constraint)
-    \b c d -> case'List
+    _
+    \a b c -> case'List
       (\_ -> 'Constraint)
       (_rhs CUnit)
-      (\e f -> case'List
+      (\d e -> case'List
         (\_ -> 'Constraint)
         (_rhs CUnit)
-        (\g h -> _rhs ('T2 (e ~ (g :: c)) (b c (g : h))))
-        f)
-      d
+        (\f g -> _rhs ('T2 (d ~ (f :: b)) (a b (f : g))))
+        e)
+      c
 
 case'BlendEquation
   :: forall (a :: BlendEquation -> Type)
@@ -2863,10 +2856,10 @@ case'Vector
 case'Vector = \_ _ a b -> <<case function of a type with 2 parameters>>
 
 concat :: forall a . [[a]] -> [a]
-concat = \a -> _rhs (foldr [a] [a] ((++) a) [])
+concat = \a -> _rhs (foldr (++) [])
 
 concatMap :: forall a b . (a -> [b]) -> [a] -> [b]
-concatMap = \a b c d -> _rhs (foldr [b] [b] ((++) b) [] (map a [b] c d))
+concatMap = \a b c d -> _rhs (foldr (++) [] (map c d))
 
 customizeDepth
   :: forall a (b :: Nat) . (a -> Float) -> Fragment b a -> Fragment b a
@@ -2877,12 +2870,7 @@ customizeDepths
     . (a -> Float)
       -> [Vector b (Maybe (SimpleFragment a))]
         -> [Vector b (Maybe (SimpleFragment a))]
-customizeDepths
-  = \a b c -> _rhs
-    (map
-      ('Vector b ('Maybe ('SimpleFragment a)))
-      ('Vector b ('Maybe ('SimpleFragment a)))
-      \d -> customizeDepth a b c d)
+customizeDepths = \a b c -> _rhs (map \d -> customizeDepth a b c d)
 
 definedVec :: forall a (b :: Nat) . Vec b a -> Bool
 definedVec
@@ -2908,15 +2896,14 @@ fetch = \a b c d -> <<builtin>>
 
 fetchArrays
   :: forall (a :: PrimitiveType) (b :: [Type]) (c :: [Type])
-    . (b ~ (map Type Type ListElem c :: [Type]))
-      => HList c -> PrimitiveStream a (HList b)
+    . (b ~ (map ListElem c :: [Type])) => HList c -> PrimitiveStream a (HList b)
 fetchArrays = \a b c d e -> <<builtin>>
 
 fetchStream
   :: forall (a :: PrimitiveType) (b :: [Type])
     . String
       -> forall (c :: [String])
-        -> (len String c ~ (len Type b :: Int)) => PrimitiveStream a (HList b)
+        -> (len c ~ (len b :: Int)) => PrimitiveStream a (HList b)
 fetchStream = \a b c d e -> <<builtin>>
 
 filterFragment
@@ -2928,30 +2915,24 @@ filterFragments
     . (a -> Bool)
       -> [Vector b (Maybe (SimpleFragment a))]
         -> [Vector b (Maybe (SimpleFragment a))]
-filterFragments
-  = \a b c -> _rhs
-    (map
-      ('Vector b ('Maybe ('SimpleFragment a)))
-      ('Vector b ('Maybe ('SimpleFragment a)))
-      \d -> filterFragment a b c d)
+filterFragments = \a b c -> _rhs (map \d -> filterFragment a b c d)
 
 foldr :: forall a b . (b -> a -> a) -> a -> [b] -> a
 foldr
   = \a b -> primFix
-    ((b -> a -> a) -> a -> [b] -> a)
+    _
     \c d e f -> case'List (\_ -> a) (_rhs e) (\g h -> _rhs (d g (c d e h))) f
 
 head :: forall a . [a] -> a
 head = \a b -> case'List (\_ -> a) (_rhs (undefined a)) (\c _ -> _rhs c) b
 
 id :: forall a . a -> a
-id = \_ a -> _rhs a
+id = \a b -> _rhs b
 
 imageFrame
   :: forall (a :: [Type])
     . sameLayerCounts a
-      => HList a
-        -> FrameBuffer (ImageLC (head Type a)) (map Type ImageKind GetImageKind a)
+      => HList a -> FrameBuffer (ImageLC (head a)) (map GetImageKind a)
 imageFrame = _rhs \a b c -> FrameBuffer a b c
 
 imageType :: ImageKind -> Type
@@ -2962,25 +2943,25 @@ imageType' :: [ImageKind] -> [Type]
 imageType'
   = \a -> case'List
     (\_ -> [Type])
-    (_rhs (map 'ImageKind Type imageType a))
+    (_rhs (map imageType a))
     (\b c -> case'ImageKind
       (\_ -> [Type])
-      (\_ -> _rhs (map 'ImageKind Type imageType a))
-      (_rhs (map 'ImageKind Type imageType c))
-      (_rhs (map 'ImageKind Type imageType a))
+      (\_ -> _rhs (map imageType a))
+      (_rhs (map imageType c))
+      (_rhs (map imageType a))
       b)
     a
 
 len :: forall a . [a] -> Int
 len
   = \a -> primFix
-    ([a] -> 'Int)
+    _
     \b c -> case'List (\_ -> 'Int) (_rhs 0) (\_ d -> _rhs (primAddInt 1 (b d))) c
 
 map :: forall a b . (a -> b) -> [a] -> [b]
 map
   = \a b -> primFix
-    ((a -> b) -> [a] -> [b])
+    _
     \c d e -> case'List (\_ -> [b]) (_rhs []) (\f g -> _rhs (d f : c d g)) e
 
 mapFragment :: forall a b (c :: Nat) . (a -> b) -> Fragment c a -> Fragment c b
@@ -2991,12 +2972,7 @@ mapFragments
     . (a -> b)
       -> [Vector c (Maybe (SimpleFragment a))]
         -> [Vector c (Maybe (SimpleFragment b))]
-mapFragments
-  = \a b c d -> _rhs
-    (map
-      ('Vector c ('Maybe ('SimpleFragment a)))
-      ('Vector c ('Maybe ('SimpleFragment b)))
-      \e -> mapFragment a b c d e)
+mapFragments = \a b c d -> _rhs (map \e -> mapFragment a b c d e)
 
 mapPrimitive
   :: forall a b (c :: PrimitiveType) . (a -> b) -> Primitive a c -> Primitive b c
@@ -3005,9 +2981,7 @@ mapPrimitive = \a b c d e -> <<builtin>>
 mapPrimitives
   :: forall a b (c :: PrimitiveType)
     . (a -> b) -> [Primitive a c] -> [Primitive b c]
-mapPrimitives
-  = \a b c d -> _rhs
-    (map ('Primitive a c) ('Primitive b c) \e -> mapPrimitive a b c d e)
+mapPrimitives = \a b c d -> _rhs (map \e -> mapPrimitive a b c d e)
 
 mapVec :: forall a b (c :: Nat) . (a -> b) -> VecS a c -> VecS b c
 mapVec
@@ -3238,32 +3212,21 @@ one
 
 overlay
   :: forall (a :: Nat) (b :: [Type])
-    . FrameBuffer a (map Type ImageKind FragmentOperationKind b)
-      -> (HList b
-        , [Fragment
-          a
-          (HList (imageType' (map Type ImageKind FragmentOperationKind b)))])
-        -> FrameBuffer a (map Type ImageKind FragmentOperationKind b)
+    . FrameBuffer a (map FragmentOperationKind b)
+      -> (HList b, [Fragment a (HList (imageType' (map FragmentOperationKind b)))])
+        -> FrameBuffer a (map FragmentOperationKind b)
 overlay
   = \a b c d -> hlistConsCase
     ('HList b)
-    [['Vector
-      a
-      ('Maybe
-        ('SimpleFragment
-          ('HList (imageType' (map Type 'ImageKind 'FragmentOperationKind b)))))]]
-    ('FrameBuffer a (map Type 'ImageKind 'FragmentOperationKind b))
+    [['Fragment a ('HList (imageType' (map 'FragmentOperationKind b)))]]
+    ('FrameBuffer a (map 'FragmentOperationKind b))
     (\e f -> hlistConsCase
-      ['Vector
-        a
-        ('Maybe
-          ('SimpleFragment
-            ('HList (imageType' (map Type 'ImageKind 'FragmentOperationKind b)))))]
+      ['Fragment a ('HList (imageType' (map 'FragmentOperationKind b)))]
       []
-      ('FrameBuffer a (map Type 'ImageKind 'FragmentOperationKind b))
+      ('FrameBuffer a (map 'FragmentOperationKind b))
       (\g h -> hlistNilCase
-        ('FrameBuffer a (map Type 'ImageKind 'FragmentOperationKind b))
-        (_rhs (Accumulate (map Type 'ImageKind 'FragmentOperationKind b) a b TT e g c))
+        ('FrameBuffer a (map 'FragmentOperationKind b))
+        (_rhs (Accumulate (map 'FragmentOperationKind b) a b TT e g c))
         h)
       f)
     d
@@ -3273,8 +3236,7 @@ primTexture = \a b -> <<builtin>>
 
 rasterizePrimitive
   :: forall (a :: [Type]) (b :: [Type]) (c :: [Type]) (d :: PrimitiveType)
-    . (map Type Type Interpolated a ~ (b :: [Type])
-      , c ~ (Vec 4 Float : a :: [Type]))
+    . (map Interpolated a ~ (b :: [Type]), c ~ (Vec 4 Float : a :: [Type]))
       => HList b
         -> RasterContext (HList c) d
           -> Primitive (HList c) d -> FragmentStream 1 (HList a)
@@ -3283,23 +3245,19 @@ rasterizePrimitive = \a b c d e f g h i -> <<builtin>>
 rasterizePrimitives
   :: forall (a :: [Type]) (b :: PrimitiveType)
     . RasterContext (HList (Vec 4 Float : a)) b
-      -> HList (map Type Type Interpolated a)
+      -> HList (map Interpolated a)
         -> [Primitive (HList (Vec 4 Float : a)) b]
           -> [Vector 1 (Maybe (SimpleFragment (HList a)))]
 rasterizePrimitives
   = \a b c d e -> _rhs
     (foldr
-      ['Vector 1 ('Maybe ('SimpleFragment ('HList a)))]
-      ['Vector 1 ('Maybe ('SimpleFragment ('HList a)))]
-      ((++) ('Vector 1 ('Maybe ('SimpleFragment ('HList a)))))
+      (++)
       []
       (map
-        ('Primitive ('HList ('VecS 'Float 4 : a)) b)
-        ['Vector 1 ('Maybe ('SimpleFragment ('HList a)))]
         (\f -> rasterizePrimitive
           a
-          (map Type Type 'Interpolated a)
-          ('VecS 'Float 4 : a)
+          (map 'Interpolated a)
+          ('Vec 4 'Float : a)
           b
           TT
           TT
@@ -3313,13 +3271,13 @@ renderFrame = _rhs ScreenOut
 
 sFragmentCoords :: forall a . SimpleFragment a -> VecS Float 3
 sFragmentCoords
-  = \_ a -> case'SimpleFragment (\_ -> 'VecS 'Float 3) (\b _ -> _rhs b) a
+  = \a b -> case'SimpleFragment (\_ -> 'VecS 'Float 3) (\c _ -> _rhs c) b
 
 sFragmentValue :: forall a . SimpleFragment a -> a
 sFragmentValue = \a b -> case'SimpleFragment (\_ -> a) (\_ c -> _rhs c) b
 
 sameLayerCounts :: [Type] -> Constraint
-sameLayerCounts = \a -> _rhs (allSame 'Nat (map Type 'Nat 'ImageLC a))
+sameLayerCounts = \a -> _rhs (allSame 'Nat (map 'ImageLC a))
 
 swizzscalar :: forall a (b :: Nat) . Vec b a -> Swizz -> a
 swizzscalar
@@ -6764,8 +6722,7 @@ testdata/Builtins.lc 255:45-255:46
     Type
 testdata/Builtins.lc 260:1-260:12
     forall (a :: PrimitiveType) (b :: [Type]) (c :: [Type])
-      . (b ~ (map Type Type ListElem c :: [Type]))
-        => HList c -> PrimitiveStream a (HList b)
+      . (b ~ (map ListElem c :: [Type])) => HList c -> PrimitiveStream a (HList b)
 testdata/Builtins.lc 260:32-260:119
     Type | Type | Type
 testdata/Builtins.lc 260:56-260:57
@@ -6849,7 +6806,7 @@ testdata/Builtins.lc 266:1-266:12
     forall (a :: PrimitiveType) (b :: [Type])
       . String
         -> forall (c :: [String])
-          -> (len String c ~ (len Type b :: Int)) => PrimitiveStream a (HList b)
+          -> (len c ~ (len b :: Int)) => PrimitiveStream a (HList b)
 testdata/Builtins.lc 266:31-266:37
     Type
 testdata/Builtins.lc 266:31-266:123
@@ -8065,8 +8022,7 @@ testdata/Builtins.lc 478:55-478:56
     Type
 testdata/Builtins.lc 480:1-480:19
     forall (a :: [Type]) (b :: [Type]) (c :: [Type]) (d :: PrimitiveType)
-      . (map Type Type Interpolated a ~ (b :: [Type])
-        , c ~ (Vec 4 Float : a :: [Type]))
+      . (map Interpolated a ~ (b :: [Type]), c ~ (Vec 4 Float : a :: [Type]))
         => HList b
           -> RasterContext (HList c) d
             -> Primitive (HList c) d -> FragmentStream 1 (HList a)
@@ -8175,7 +8131,7 @@ testdata/Builtins.lc 486:32-486:33
 testdata/Builtins.lc 488:1-488:20
     forall (a :: [Type]) (b :: PrimitiveType)
       . RasterContext (HList (Vec 4 Float : a)) b
-        -> HList (map Type Type Interpolated a)
+        -> HList (map Interpolated a)
           -> [Primitive (HList (Vec 4 Float : a)) b]
             -> [Vector 1 (Maybe (SimpleFragment (HList a)))]
 testdata/Builtins.lc 488:32-488:38
@@ -8190,8 +8146,7 @@ testdata/Builtins.lc 488:40-488:73
     [[Fragment 1 (HList _b)]]
 testdata/Builtins.lc 488:45-488:63
     forall (a :: [Type]) (b :: [Type]) (c :: [Type]) (d :: PrimitiveType)
-      . (map Type Type Interpolated a ~ (b :: [Type])
-        , c ~ (Vec 4 Float : a :: [Type]))
+      . (map Interpolated a ~ (b :: [Type]), c ~ (Vec 4 Float : a :: [Type]))
         => HList b
           -> RasterContext (HList c) d
             -> Primitive (HList c) d -> FragmentStream 1 (HList a)
@@ -8216,8 +8171,6 @@ testdata/Builtins.lc 492:12-492:15
     Type
 testdata/Builtins.lc 492:12-492:29
     Type
-testdata/Builtins.lc 492:12-495:50
-    forall a . [a] -> Constraint
 testdata/Builtins.lc 492:13-492:14
     _b
 testdata/Builtins.lc 492:19-492:29
@@ -8330,7 +8283,7 @@ testdata/Builtins.lc 515:102-515:103
     ImageKind
 testdata/Builtins.lc 517:1-517:11
     forall (a :: [ImageKind]) (b :: Nat) (c :: [Type])
-      . (a ~ (map Type ImageKind FragmentOperationKind c :: [ImageKind]))
+      . (a ~ (map FragmentOperationKind c :: [ImageKind]))
         => HList c
           -> FragmentStream b (HList (imageType' a)) -> FrameBuffer b a -> FrameBuffer b a
 testdata/Builtins.lc 517:15-517:174
@@ -8423,32 +8376,25 @@ testdata/Builtins.lc 519:30-519:31
     _e | ((_b))
 testdata/Builtins.lc 520:1-520:8
     forall (a :: Nat) (b :: [Type])
-      . FrameBuffer a (map Type ImageKind FragmentOperationKind b)
-        -> (HList b
-          , [Fragment
-            a
-            (HList (imageType' (map Type ImageKind FragmentOperationKind b)))])
-          -> FrameBuffer a (map Type ImageKind FragmentOperationKind b)
+      . FrameBuffer a (map FragmentOperationKind b)
+        -> (HList b, [Fragment a (HList (imageType' (map FragmentOperationKind b)))])
+          -> FrameBuffer a (map FragmentOperationKind b)
 testdata/Builtins.lc 520:25-520:35
     forall (a :: [ImageKind]) (b :: Nat) (c :: [Type])
-      . (a ~ (map Type ImageKind FragmentOperationKind c :: [ImageKind]))
+      . (a ~ (map FragmentOperationKind c :: [ImageKind]))
         => HList c
           -> FragmentStream b (HList (imageType' a)) -> FrameBuffer b a -> FrameBuffer b a
 testdata/Builtins.lc 520:25-520:39
-    FragmentStream
-        _b
-        (HList (imageType' (map Type ImageKind FragmentOperationKind _a)))
-      -> FrameBuffer _b (map Type ImageKind FragmentOperationKind _a)
-        -> FrameBuffer _b (map Type ImageKind FragmentOperationKind _a)
+    FragmentStream _b (HList (imageType' (map FragmentOperationKind _a)))
+      -> FrameBuffer _b (map FragmentOperationKind _a)
+        -> FrameBuffer _b (map FragmentOperationKind _a)
 testdata/Builtins.lc 520:25-520:43
-    FrameBuffer _b (map Type ImageKind FragmentOperationKind _a)
-      -> FrameBuffer _b (map Type ImageKind FragmentOperationKind _a)
+    FrameBuffer _b (map FragmentOperationKind _a)
+      -> FrameBuffer _b (map FragmentOperationKind _a)
 testdata/Builtins.lc 520:25-520:46
-    FrameBuffer _b (map Type ImageKind FragmentOperationKind _a) | FrameBuffer
-      _b
-      (map Type ImageKind FragmentOperationKind _a) | FrameBuffer
+    FrameBuffer _b (map FragmentOperationKind _a) | FrameBuffer
       _b
-      (map Type ImageKind FragmentOperationKind _a)
+      (map FragmentOperationKind _a) | FrameBuffer _b (map FragmentOperationKind _a)
 testdata/Builtins.lc 520:36-520:39
     _m
 testdata/Builtins.lc 520:40-520:43
@@ -8464,8 +8410,7 @@ testdata/Builtins.lc 524:74-524:75
 testdata/Builtins.lc 530:1-530:12
     forall (a :: [Type])
       . sameLayerCounts a
-        => HList a
-          -> FrameBuffer (ImageLC (head Type a)) (map Type ImageKind GetImageKind a)
+        => HList a -> FrameBuffer (ImageLC (head a)) (map GetImageKind a)
 testdata/Builtins.lc 530:30-530:36
     Type
 testdata/Builtins.lc 530:31-530:35
@@ -8515,36 +8460,32 @@ testdata/Builtins.lc 530:123-530:124
 testdata/Builtins.lc 532:1-532:11
     forall (a :: [Type])
       . sameLayerCounts a
-        => HList a
-          -> FrameBuffer (ImageLC (head Type a)) (map Type ImageKind GetImageKind a)
+        => HList a -> FrameBuffer (ImageLC (head a)) (map GetImageKind a)
 testdata/Builtins.lc 532:14-532:25
     forall (a :: [Type])
       . sameLayerCounts a
-        => HList a
-          -> FrameBuffer (ImageLC (head Type a)) (map Type ImageKind GetImageKind a)
+        => HList a -> FrameBuffer (ImageLC (head a)) (map GetImageKind a)
 testdata/Builtins.lc 534:1-534:11
     forall (a :: Nat) (b :: [Type]) c
       . HList b
-        -> (c -> HList (imageType' (map Type ImageKind FragmentOperationKind b)))
+        -> (c -> HList (imageType' (map FragmentOperationKind b)))
           -> [Vector a (Maybe (SimpleFragment c))]
-            -> FrameBuffer a (map Type ImageKind FragmentOperationKind b)
-              -> FrameBuffer a (map Type ImageKind FragmentOperationKind b)
+            -> FrameBuffer a (map FragmentOperationKind b)
+              -> FrameBuffer a (map FragmentOperationKind b)
 testdata/Builtins.lc 534:34-534:44
     forall (a :: [ImageKind]) (b :: Nat) (c :: [Type])
-      . (a ~ (map Type ImageKind FragmentOperationKind c :: [ImageKind]))
+      . (a ~ (map FragmentOperationKind c :: [ImageKind]))
         => HList c
           -> FragmentStream b (HList (imageType' a)) -> FrameBuffer b a -> FrameBuffer b a
 testdata/Builtins.lc 534:34-534:48
-    FragmentStream
-        _b
-        (HList (imageType' (map Type ImageKind FragmentOperationKind _a)))
-      -> FrameBuffer _b (map Type ImageKind FragmentOperationKind _a)
-        -> FrameBuffer _b (map Type ImageKind FragmentOperationKind _a)
+    FragmentStream _b (HList (imageType' (map FragmentOperationKind _a)))
+      -> FrameBuffer _b (map FragmentOperationKind _a)
+        -> FrameBuffer _b (map FragmentOperationKind _a)
 testdata/Builtins.lc 534:34-534:76
-    FrameBuffer _c (map Type ImageKind FragmentOperationKind _b)
-      -> FrameBuffer _c (map Type ImageKind FragmentOperationKind _b)
+    FrameBuffer _c (map FragmentOperationKind _b)
+      -> FrameBuffer _c (map FragmentOperationKind _b)
 testdata/Builtins.lc 534:34-534:79
-    FrameBuffer _c (map Type ImageKind FragmentOperationKind _b)
+    FrameBuffer _c (map FragmentOperationKind _b)
 testdata/Builtins.lc 534:45-534:48
     _j
 testdata/Builtins.lc 534:50-534:62
@@ -8558,9 +8499,7 @@ testdata/Builtins.lc 534:50-534:70
 testdata/Builtins.lc 534:50-534:75
     [Vector
       _c
-      (Maybe
-        (SimpleFragment
-          (HList (imageType' (map Type ImageKind FragmentOperationKind _b)))))]
+      (Maybe (SimpleFragment (HList (imageType' (map FragmentOperationKind _b)))))]
 testdata/Builtins.lc 534:63-534:70
     _k
 testdata/Builtins.lc 534:71-534:75
diff --git a/testdata/HyperbolicParaboloic.out b/testdata/HyperbolicParaboloic.out
index 08a0239b..e8d52faf 100644
--- a/testdata/HyperbolicParaboloic.out
+++ b/testdata/HyperbolicParaboloic.out
@@ -35,15 +35,16 @@ Pipeline
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
-              float t;
+              vec4 v3FToV4F(vec3 z0) {
+                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
+              }
               void main() {
-                  t = (Mouse).y;
                   gl_Position = scale (0.1
-                                      ,(MVP) * (vec4 ((t) * ((vi1).x)
+                                      ,(MVP) * (vec4 (((Mouse).y) * ((vi1).x)
                                                      ,(((0.5) * ((Mouse).x)) * ((vi1).x)) * ((vi1).y)
-                                                     ,(t) * ((vi1).y)
+                                                     ,((Mouse).y) * ((vi1).y)
                                                      ,1.0)));
-                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
+                  vo1 = v3FToV4F (vi1);
               }
               """
           , geometryShader = Nothing
diff --git a/testdata/Hyperboloid.out b/testdata/Hyperboloid.out
index 0d39c7ed..3bcaff73 100644
--- a/testdata/Hyperboloid.out
+++ b/testdata/Hyperboloid.out
@@ -32,20 +32,20 @@ Pipeline
               uniform vec2 Mouse;
               in vec3 vi1;
               smooth out vec4 vo1;
-              float k;
-              float r;
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
+              vec4 v3FToV4F(vec3 z0) {
+                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
+              }
               void main() {
-                  k = (2.0) * ((Mouse).y);
-                  r = (Mouse).x;
                   gl_Position = scale (0.1
-                                      ,(MVP) * (vec4 ((k) * (sin (((0.7) * ((vi1).x)) + ((r) * ((vi1).y))))
+                                      ,(MVP) * (vec4 (((2.0) * ((Mouse).y)) * (sin
+                                                     (((0.7) * ((vi1).x)) + (((Mouse).x) * ((vi1).y))))
                                                      ,(vi1).y
-                                                     ,(k) * (cos (((0.7) * ((vi1).x)) + ((r) * ((vi1).y))))
+                                                     ,((2.0) * ((Mouse).y)) * (cos (((0.7) * ((vi1).x)) + (((Mouse).x) * ((vi1).y))))
                                                      ,1.0)));
-                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
+                  vo1 = v3FToV4F (vi1);
               }
               """
           , geometryShader = Nothing
diff --git a/testdata/Internals.out b/testdata/Internals.out
index a04281f0..f8a38c6f 100644
--- a/testdata/Internals.out
+++ b/testdata/Internals.out
@@ -230,63 +230,64 @@ negate
 
 (==) :: forall a . Eq a => a -> a -> Bool
 (==)
-  = _lhs
-    (==)
-    \ @a @(_ :: _) -> match'String
-      (\(_ :: _) -> _)
-      (_rhs
-        let
-          b = _lhs (==) \(c :: _) (d :: _) -> _rhs (isEQ (primCompareString c d))
-          in b)
-      a
-      (match'Char
+  = primFix
+    \(a :: forall b . Eq b => b -> b -> Bool) -> _lhs
+      (==)
+      \ @c @(_ :: _) -> match'String
         (\(_ :: _) -> _)
         (_rhs
-          let e = _lhs (==) \(f :: _) (g :: _) -> _rhs (isEQ (primCompareChar f g)) in e)
-        a
-        (match'Int
+          let
+            d = _lhs (==) \(e :: _) (f :: _) -> _rhs (isEQ (primCompareString e f))
+            in d)
+        c
+        (match'Char
           (\(_ :: _) -> _)
           (_rhs
-            let h = _lhs (==) \(i :: _) (j :: _) -> _rhs (isEQ (primCompareInt i j)) in h)
-          a
-          (match'Float
+            let g = _lhs (==) \(h :: _) (i :: _) -> _rhs (isEQ (primCompareChar h i)) in g)
+          c
+          (match'Int
             (\(_ :: _) -> _)
             (_rhs
-              let k = _lhs (==) \(l :: _) (m :: _) -> _rhs (isEQ (primCompareFloat l m)) in k)
-            a
-            (match'Bool
+              let j = _lhs (==) \(k :: _) (l :: _) -> _rhs (isEQ (primCompareInt k l)) in j)
+            c
+            (match'Float
               (\(_ :: _) -> _)
               (_rhs
-                let
-                  n
-                    = _lhs
-                      (==)
-                      \(o :: _) (p :: _) -> case'Bool
-                        (\(_ :: _) -> _)
-                        (case'Bool (\(_ :: _) -> _) (_rhs True) (_rhs False) p)
-                        (case'Bool (\(_ :: _) -> _) (_rhs False) (_rhs True) p)
-                        o
-                  in n)
-              a
-              (match'Nat
+                let m = _lhs (==) \(n :: _) (o :: _) -> _rhs (isEQ (primCompareFloat n o)) in m)
+              c
+              (match'Bool
                 (\(_ :: _) -> _)
                 (_rhs
                   let
-                    q
+                    p
                       = _lhs
                         (==)
-                        \(r :: _) (s :: _) -> case'Nat
+                        \(q :: _) (r :: _) -> case'Bool
                           (\(_ :: _) -> _)
-                          (case'Nat (\(_ :: _) -> _) (_rhs True) (\(_ :: _) -> _rhs False) s)
-                          (\(t :: _) -> case'Nat
+                          (case'Bool (\(_ :: _) -> _) (_rhs True) (_rhs False) r)
+                          (case'Bool (\(_ :: _) -> _) (_rhs False) (_rhs True) r)
+                          q
+                    in p)
+                c
+                (match'Nat
+                  (\(_ :: _) -> _)
+                  (_rhs
+                    let
+                      s
+                        = _lhs
+                          (==)
+                          \(t :: _) (u :: _) -> case'Nat
                             (\(_ :: _) -> _)
-                            (_rhs False)
-                            (\(u :: _) -> _rhs (t == u))
-                            s)
-                          r
-                    in q)
-                a
-                (_rhs undefined))))))
+                            (case'Nat (\(_ :: _) -> _) (_rhs True) (\(_ :: _) -> _rhs False) u)
+                            (\(v :: _) -> case'Nat
+                              (\(_ :: _) -> _)
+                              (_rhs False)
+                              (\(w :: _) -> _rhs (a v w))
+                              u)
+                            t
+                      in s)
+                  c
+                  (_rhs undefined))))))
 
 infix 4 ==
 
@@ -310,7 +311,7 @@ hlistConsCase
 'Bool = <<type constructor with 0 indices; constructors: False, True>>
 
 'CW :: Constraint -> Type
-'CW = \a -> <<builtin>>
+'CW = \a -> <<delta function with arity 1>>
 
 'Char :: Type
 'Char = <<type constructor with 0 indices; constructors: >>
@@ -397,7 +398,7 @@ hlistConsCase
 'String = <<type constructor with 0 indices; constructors: >>
 
 'T2 :: Constraint -> Constraint -> Constraint
-'T2 = \a b -> <<builtin>>
+'T2 = \a b -> <<delta function with arity 2>>
 
 'Unit :: Type
 'Unit = <<type constructor with 0 indices; constructors: TT>>
@@ -411,32 +412,32 @@ hlistConsCase
 == :: forall a . Eq a => a -> a -> Bool
 ==
   = primFix
-    (forall a . 'Eq a => a -> a -> 'Bool)
-    \b c _ -> match'String
-      (\d -> d -> d -> 'Bool)
+    _
+    \a b _ -> match'String
+      (\c -> c -> c -> 'Bool)
       (_rhs (==))
-      c
+      b
       (match'Char
-        (\e -> e -> e -> 'Bool)
+        (\d -> d -> d -> 'Bool)
         (_rhs (==))
-        c
+        b
         (match'Int
-          (\f -> f -> f -> 'Bool)
+          (\e -> e -> e -> 'Bool)
           (_rhs (==))
-          c
+          b
           (match'Float
-            (\g -> g -> g -> 'Bool)
+            (\f -> f -> f -> 'Bool)
             (_rhs (==))
-            c
+            b
             (match'Bool
-              (\h -> h -> h -> 'Bool)
+              (\g -> g -> g -> 'Bool)
               (_rhs (==))
-              c
+              b
               (match'Nat
-                (\i -> i -> i -> 'Bool)
-                (_rhs ((==) b))
-                c
-                (_rhs (undefined (c -> c -> 'Bool))))))))
+                (\h -> h -> h -> 'Bool)
+                (_rhs (==))
+                b
+                (_rhs (undefined (b -> b -> 'Bool))))))))
 
 CEmpty :: String -> Constraint
 CEmpty = <<1st constructor of 'Constraint>>
@@ -578,10 +579,10 @@ fromInt
 hlistConsCase
   :: forall a (b :: [Type])
     . forall c -> (a -> HList b -> c) -> HList (a : b) -> c
-hlistConsCase = \a b c d e -> <<builtin>>
+hlistConsCase = \a b c d e -> <<delta function with arity 5>>
 
 hlistNilCase :: forall a -> a -> () -> a
-hlistNilCase = \a b c -> <<builtin>>
+hlistNilCase = \a b c -> <<delta function with arity 3>>
 
 isEQ :: Ordering -> Bool
 isEQ = \a -> case'Ordering (\_ -> 'Bool) (_rhs False) (_rhs True) (_rhs False) a
@@ -656,46 +657,46 @@ negate
           (_rhs (undefined (a -> a))))))
 
 parEval :: forall a -> a -> a -> a
-parEval = \a b c -> <<builtin>>
+parEval = \a b c -> <<delta function with arity 3>>
 
 parens :: forall a . a -> a
-parens = \_ a -> _rhs a
+parens = \a b -> _rhs b
 
 primAddInt :: Int -> Int -> Int
-primAddInt = \a b -> <<builtin>>
+primAddInt = \a b -> <<delta function with arity 2>>
 
 primCompareChar :: Char -> Char -> Ordering
-primCompareChar = \a b -> <<builtin>>
+primCompareChar = \a b -> <<delta function with arity 2>>
 
 primCompareFloat :: Float -> Float -> Ordering
-primCompareFloat = \a b -> <<builtin>>
+primCompareFloat = \a b -> <<delta function with arity 2>>
 
 primCompareInt :: Int -> Int -> Ordering
-primCompareInt = \a b -> <<builtin>>
+primCompareInt = \a b -> <<delta function with arity 2>>
 
 primCompareString :: String -> String -> Ordering
-primCompareString = \a b -> <<builtin>>
+primCompareString = \a b -> <<delta function with arity 2>>
 
 primCompareWord :: Word -> Word -> Ordering
 primCompareWord = \a b -> <<builtin>>
 
 primFix :: forall a . (a -> a) -> a
-primFix = \a b -> <<builtin>>
+primFix = \a b -> primFix _ b
 
 primIfThenElse :: forall a . Bool -> a -> a -> a
 primIfThenElse = \a b c d -> case'Bool (\_ -> a) (_rhs d) (_rhs c) b
 
 primIntToFloat :: Int -> Float
-primIntToFloat = \a -> <<builtin>>
+primIntToFloat = \a -> <<delta function with arity 1>>
 
 primIntToNat :: Int -> Nat
-primIntToNat = \a -> <<builtin>>
+primIntToNat = \a -> <<delta function with arity 1>>
 
 primIntToWord :: Int -> Word
 primIntToWord = \a -> <<builtin>>
 
 primModInt :: Int -> Int -> Int
-primModInt = \a b -> <<builtin>>
+primModInt = \a b -> <<delta function with arity 2>>
 
 primNegateFloat :: Float -> Float
 primNegateFloat = \a -> <<builtin>>
@@ -707,25 +708,25 @@ primNegateWord :: Word -> Word
 primNegateWord = \a -> <<builtin>>
 
 primRound :: Float -> Int
-primRound = \a -> <<builtin>>
+primRound = \a -> <<delta function with arity 1>>
 
 primSqrtFloat :: Float -> Float
-primSqrtFloat = \a -> <<builtin>>
+primSqrtFloat = \a -> <<delta function with arity 1>>
 
 primSubInt :: Int -> Int -> Int
-primSubInt = \a b -> <<builtin>>
+primSubInt = \a b -> <<delta function with arity 2>>
 
 t2C :: Unit -> Unit -> Unit
-t2C = \a b -> <<builtin>>
+t2C = \a b -> <<delta function with arity 2>>
 
 typeAnn :: forall a . a -> a
-typeAnn = \_ a -> _rhs a
+typeAnn = \a b -> _rhs b
 
 undefined :: forall a . a
 undefined = \a -> <<builtin>>
 
 unsafeCoerce :: forall a b . a -> b
-unsafeCoerce = \a b c -> <<builtin>>
+unsafeCoerce = \a b c -> <<delta function with arity 3>>
 ------------ tooltips
 testdata/Internals.lc 6:1-6:8
     forall a . a -> a
@@ -1152,8 +1153,6 @@ testdata/Internals.lc 118:7-118:9
     Type -> Constraint | Type -> Constraint | Constraint
 testdata/Internals.lc 118:7-119:27
     Type
-testdata/Internals.lc 118:7-134:29
-    forall a . Eq a => a -> a -> Bool
 testdata/Internals.lc 119:6-119:8
     forall a . Eq a => a -> a -> Bool
 testdata/Internals.lc 119:13-119:14
diff --git a/testdata/Prelude.out b/testdata/Prelude.out
index ea497d05..d080c7e4 100644
--- a/testdata/Prelude.out
+++ b/testdata/Prelude.out
@@ -48,74 +48,70 @@ pi = _lhs pi (_rhs 3.141592653589793)
 
 zip :: forall (a :: _) (b :: _) . [a] -> [b] -> [(a, b)]
 zip
-  = _lhs
-    zip
-    \(a :: _) (b :: _) -> case'List
-      (\(_ :: _) -> _)
-      (_rhs [])
-      (\(c :: _) (d :: _) -> case'List
+  = primFix
+    \(a :: forall (b :: _) (c :: _) . [b] -> [c] -> [(b, c)]) -> _lhs
+      zip
+      \(d :: _) (e :: _) -> case'List
         (\(_ :: _) -> _)
         (_rhs [])
-        (\(e :: _) (f :: _) -> _rhs ((c, e) : zip d f))
-        b)
-      a
+        (\(f :: _) (g :: _) -> case'List
+          (\(_ :: _) -> _)
+          (_rhs [])
+          (\(h :: _) (i :: _) -> _rhs ((f, h) : a g i))
+          e)
+        d
 
 unzip :: forall (a :: _) (b :: _) . [(a, b)] -> ([a], [b])
 unzip
-  = _lhs
-    unzip
-    \(a :: _) -> case'List
-      (\(_ :: _) -> _)
-      (_rhs ([], []))
-      (\(b :: _) (c :: _) -> hlistConsCase
-        _
-        (\(d :: _) (e :: _) -> hlistConsCase
+  = primFix
+    \(a :: forall (b :: _) (c :: _) . [(b, c)] -> ([b], [c])) -> _lhs
+      unzip
+      \(d :: _) -> case'List
+        (\(_ :: _) -> _)
+        (_rhs ([], []))
+        (\(e :: _) (f :: _) -> hlistConsCase
           _
-          (\(f :: _) (g :: _) -> hlistNilCase
+          (\(g :: _) (h :: _) -> hlistConsCase
             _
-            (_rhs
-              let
-                h = _lhs _bs_as (_rhs (unzip c));
-                i
-                  = _lhs
-                    bs
-                    (_rhs
-                      ((\(k :: _) -> hlistConsCase
-                          _
-                          (\(_ :: _) (l :: _) -> hlistConsCase
-                            _
-                            (\(m :: _) (n :: _) -> hlistNilCase _ m n)
-                            l)
-                          k)
-                        h));
-                j
-                  = _lhs
-                    as
-                    (_rhs
-                      ((\(o :: _) -> hlistConsCase
+            (\(i :: _) (j :: _) -> hlistNilCase
+              _
+              (_rhs
+                let
+                  k = a f;
+                  l
+                    = (\(n :: _) -> hlistConsCase
+                        _
+                        (\(_ :: _) (o :: _) -> hlistConsCase
                           _
-                          (\(p :: _) (q :: _) -> hlistConsCase
-                            _
-                            (\(_ :: _) (r :: _) -> hlistNilCase _ p r)
-                            q)
+                          (\(p :: _) (q :: _) -> hlistNilCase _ p q)
                           o)
-                        h))
-                in (d : j, f : i))
-            g)
+                        n)
+                      k;
+                  m
+                    = (\(r :: _) -> hlistConsCase
+                        _
+                        (\(s :: _) (t :: _) -> hlistConsCase
+                          _
+                          (\(_ :: _) (u :: _) -> hlistNilCase _ s u)
+                          t)
+                        r)
+                      k
+                  in (g : m, i : l))
+              j)
+            h)
           e)
-        b)
-      a
+        d
 
 filter
-  = _lhs
-    filter
-    \(a :: _) (b :: _) -> case'List
-      (\(_ :: _) -> _)
-      (_rhs [])
-      (\(c :: _) (d :: _) -> _rhs
-        ((\(e :: _) -> case'Bool (\(_ :: _) -> _) (filter a d) (c : filter a d) e)
-          (a c)))
-      b
+  = primFix
+    \(a :: _) -> _lhs
+      filter
+      \(b :: _) (c :: _) -> case'List
+        (\(_ :: _) -> _)
+        (_rhs [])
+        (\(d :: _) (e :: _) -> _rhs
+          ((\(f :: _) -> case'Bool (\(_ :: _) -> _) (a b e) (d : a b e) f) (b d)))
+        c
 
 tail :: forall (a :: _) . [a] -> [a]
 tail
@@ -131,13 +127,14 @@ pairs :: forall (a :: _) . [a] -> [(a, a)]
 pairs = _lhs pairs \(a :: _) -> _rhs (zip a (tail a))
 
 foldl'
-  = _lhs
-    foldl'
-    \(a :: _) (b :: _) (c :: _) -> case'List
-      (\(_ :: _) -> _)
-      (_rhs b)
-      (\(d :: _) (e :: _) -> _rhs (foldl' a (a b d) e))
-      c
+  = primFix
+    \(a :: _) -> _lhs
+      foldl'
+      \(b :: _) (c :: _) (d :: _) -> case'List
+        (\(_ :: _) -> _)
+        (_rhs c)
+        (\(e :: _) (f :: _) -> _rhs (a b (b c e) f))
+        d
 
 foldr1
   = _lhs
@@ -149,77 +146,77 @@ foldr1
       b
 
 split
-  = _lhs
-    split
-    \(a :: _) -> case'List
-      (\(_ :: _) -> _)
-      (_rhs ([], []))
-      (\(b :: _) (c :: _) -> _rhs
-        let
-          d = _lhs _bs_as (_rhs (split c));
-          e
-            = _lhs
-              bs
-              (_rhs
-                ((\(g :: _) -> hlistConsCase
+  = primFix
+    \(a :: _) -> _lhs
+      split
+      \(b :: _) -> case'List
+        (\(_ :: _) -> _)
+        (_rhs ([], []))
+        (\(c :: _) (d :: _) -> _rhs
+          let
+            e = a d;
+            f
+              = (\(h :: _) -> hlistConsCase
+                  _
+                  (\(_ :: _) (i :: _) -> hlistConsCase
                     _
-                    (\(_ :: _) (h :: _) -> hlistConsCase
-                      _
-                      (\(i :: _) (j :: _) -> hlistNilCase _ i j)
-                      h)
-                    g)
-                  d));
-          f
-            = _lhs
-              as
-              (_rhs
-                ((\(k :: _) -> hlistConsCase
+                    (\(j :: _) (k :: _) -> hlistNilCase _ j k)
+                    i)
+                  h)
+                e;
+            g
+              = (\(l :: _) -> hlistConsCase
+                  _
+                  (\(m :: _) (n :: _) -> hlistConsCase
                     _
-                    (\(l :: _) (m :: _) -> hlistConsCase
-                      _
-                      (\(_ :: _) (n :: _) -> hlistNilCase _ l n)
-                      m)
-                    k)
-                  d))
-          in (b : e, f))
-      a
+                    (\(_ :: _) (o :: _) -> hlistNilCase _ m o)
+                    n)
+                  l)
+                e
+            in (c : f, g))
+        b
 
 mergeBy
-  = _lhs
-    mergeBy
-    \(a :: _) (b :: _) (c :: _) -> case'List
-      (\(_ :: _) -> _)
-      (_rhs c)
-      (\(d :: _) (e :: _) -> case'List
+  = primFix
+    \(a :: _) -> _lhs
+      mergeBy
+      \(b :: _) (c :: _) (d :: _) -> 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)
-              h)
-            (a d f)))
-        c)
-      b
+        (_rhs d)
+        (\(e :: _) (f :: _) -> case'List
+          (\(_ :: _) -> _)
+          (_rhs c)
+          (\(g :: _) (h :: _) -> _rhs
+            ((\(i :: _) -> case'Ordering
+                (\(_ :: _) -> _)
+                (e : a b f (g : h))
+                (g : a b (e : f) h)
+                (g : a b (e : f) h)
+                i)
+              (b e g)))
+          d)
+        c
 
 sortBy
-  = _lhs
-    sortBy
-    \(a :: _) (b :: _) -> case'List
-      (\(_ :: _) -> _)
-      (_rhs [])
-      (\(c :: _) (d :: _) -> case'List
+  = primFix
+    \(a :: _) -> _lhs
+      sortBy
+      \(b :: _) (c :: _) -> case'List
         (\(_ :: _) -> _)
-        (_rhs [c])
-        (\(_ :: _) (_ :: _) -> _rhs
-          (uncurry (mergeBy a) ((sortBy a *** sortBy a) (split b))))
-        d)
-      b
+        (_rhs [])
+        (\(d :: _) (e :: _) -> case'List
+          (\(_ :: _) -> _)
+          (_rhs [d])
+          (\(_ :: _) (_ :: _) -> _rhs (uncurry (mergeBy b) ((a b *** a b) (split c))))
+          e)
+        c
 
 iterate :: forall (a :: _) . (a -> a) -> a -> [a]
-iterate = _lhs iterate \(a :: _) (b :: _) -> _rhs (b : iterate a (a b))
+iterate
+  = primFix
+    \(a :: forall (b :: _) . (b -> b) -> b -> [b]) -> _lhs
+      iterate
+      \(c :: _) (d :: _) -> _rhs (d : a c (c d))
 
 fst
   = _lhs
@@ -269,17 +266,17 @@ data RecordC (_ :: [RecItem]) :: Type where
     RecordCons :: forall (a :: [RecItem]) . HList (map recItemType a) -> RecordC a
 
 isKeyC
-  = _lhs
-    isKeyC
-    \(a :: _) (b :: _) (c :: _) -> case'List
-      (\(_ :: _) -> _)
-      (_rhs ('CEmpty ""))
-      (\(d :: _) (e :: _) -> case'RecItem
+  = primFix
+    \(a :: _) -> _lhs
+      isKeyC
+      \(b :: _) (c :: _) (d :: _) -> case'List
         (\(_ :: _) -> _)
-        (\(f :: _) (g :: _) -> _rhs
-          (primIfThenElse (a == f) (b `'EqCTt` g) (isKeyC a b e)))
-        d)
-      c
+        (_rhs ('CEmpty ""))
+        (\(e :: _) (f :: _) -> case'RecItem
+          (\(_ :: _) -> _)
+          (\(g :: _) (h :: _) -> _rhs (primIfThenElse (b == g) (c `'EqCTt` h) (a b c f)))
+          e)
+        d
 
 fstTup = _lhs fstTup (_rhs (hlistConsCase (_ :: _) \(a :: _) (_ :: _) -> a))
 
@@ -289,30 +286,34 @@ project
   :: forall (a :: _) (b :: [RecItem])
     . forall (c :: String) -> isKeyC c a b => RecordC b -> a
 project
-  = _lhs
-    project
-    \ @(a :: _) @(b :: _) (c :: _) @(_ :: _) (d :: _) -> case'List
-      (\(_ :: _) -> _)
-      (_rhs undefined)
-      (\(e :: _) (f :: _) -> case'RecItem
+  = primFix
+    \(a
+        :: forall (b :: _) (c :: [RecItem])
+          . forall (d :: String) -> isKeyC d b c => RecordC c -> b)
+      -> _lhs
+      project
+      \ @(e :: _) @(f :: _) (g :: _) @(_ :: _) (h :: _) -> case'List
         (\(_ :: _) -> _)
-        (\(g :: _) (_ :: _) -> case'RecordC
+        (_rhs undefined)
+        (\(i :: _) (j :: _) -> case'RecItem
           (\(_ :: _) -> _)
-          (\(h :: _) -> case'Bool
+          (\(k :: _) (_ :: _) -> case'RecordC
             (\(_ :: _) -> _)
-            (_rhs
-              (project
-                @a
-                @f
-                c
-                @(undefined @('CW (isKeyC c a f)))
-                (RecordCons
-                  (sndTup (unsafeCoerce @(_ :: _) @('HList (a : map recItemType f)) h)))))
-            (_rhs (fstTup (unsafeCoerce @(_ :: _) @('HList (a : map recItemType f)) h)))
-            (c == g))
-          d)
-        e)
-      b
+            (\(l :: _) -> case'Bool
+              (\(_ :: _) -> _)
+              (_rhs
+                (a
+                  @e
+                  @j
+                  g
+                  @(undefined @('CW (isKeyC g e j)))
+                  (RecordCons
+                    (sndTup (unsafeCoerce @(_ :: _) @('HList (e : map recItemType j)) l)))))
+              (_rhs (fstTup (unsafeCoerce @(_ :: _) @('HList (e : map recItemType j)) l)))
+              (g == k))
+            h)
+          i)
+        f
 
 rgb = _lhs rgb \(a :: _) (b :: _) (c :: _) -> _rhs (V4 a b c 1.0)
 
@@ -620,10 +621,7 @@ perspective
     perspective
     \(a :: _) (b :: _) (c :: _) (d :: _) -> _rhs
       let
-        e = _lhs t (_rhs (a * tan (c / fromInt 2)));
-        f = _lhs b (_rhs (fromInt 0 - e));
-        g = _lhs r (_rhs (d * e));
-        h = _lhs l (_rhs (fromInt 0 - g))
+        e = a * tan (c / fromInt 2); f = fromInt 0 - e; g = d * e; h = fromInt 0 - g
         in M44F
         (V4 (fromInt 2 * a / (g - h)) (fromInt 0) (fromInt 0) (fromInt 0))
         (V4 (fromInt 0) (fromInt 2 * a / (e - f)) (fromInt 0) (fromInt 0))
@@ -642,7 +640,7 @@ rotMatrixZ
   = _lhs
     rotMatrixZ
     \(a :: _) -> _rhs
-      let b = _lhs c (_rhs (cos a)); c = _lhs s (_rhs (sin a)) in M44F
+      let b = cos a; c = sin a in M44F
         (V4 b c (fromInt 0) (fromInt 0))
         (V4 (fromInt 0 - c) b (fromInt 0) (fromInt 0))
         (V4 (fromInt 0) (fromInt 0) (fromInt 1) (fromInt 0))
@@ -652,7 +650,7 @@ rotMatrixY
   = _lhs
     rotMatrixY
     \(a :: _) -> _rhs
-      let b = _lhs c (_rhs (cos a)); c = _lhs s (_rhs (sin a)) in M44F
+      let b = cos a; c = sin a in M44F
         (V4 b (fromInt 0) (fromInt 0 - c) (fromInt 0))
         (V4 (fromInt 0) (fromInt 1) (fromInt 0) (fromInt 0))
         (V4 c (fromInt 0) b (fromInt 0))
@@ -662,7 +660,7 @@ rotMatrixX
   = _lhs
     rotMatrixX
     \(a :: _) -> _rhs
-      let b = _lhs c (_rhs (cos a)); c = _lhs s (_rhs (sin a)) in M44F
+      let b = cos a; c = sin a in M44F
         (V4 (fromInt 1) (fromInt 0) (fromInt 0) (fromInt 0))
         (V4 (fromInt 0) b c (fromInt 0))
         (V4 (fromInt 0) (fromInt 0 - c) b (fromInt 0))
@@ -680,13 +678,10 @@ translateBefore4
     translateBefore4
     \(a :: _) -> _rhs
       let
-        b = _lhs r1 (_rhs (V4 (fromInt 1) (fromInt 0) (fromInt 0) (fromInt 0)));
-        c = _lhs r2 (_rhs (V4 (fromInt 0) (fromInt 1) (fromInt 0) (fromInt 0)));
-        d = _lhs r3 (_rhs (V4 (fromInt 0) (fromInt 0) (fromInt 1) (fromInt 0)));
-        e
-          = _lhs
-            r4
-            (_rhs (V4 (swizzscalar a Sx) (swizzscalar a Sy) (swizzscalar a Sz) (fromInt 1)))
+        b = V4 (fromInt 1) (fromInt 0) (fromInt 0) (fromInt 0);
+        c = V4 (fromInt 0) (fromInt 1) (fromInt 0) (fromInt 0);
+        d = V4 (fromInt 0) (fromInt 0) (fromInt 1) (fromInt 0);
+        e = V4 (swizzscalar a Sx) (swizzscalar a Sy) (swizzscalar a Sz) (fromInt 1)
         in M44F b c d e
 
 lookat
@@ -703,59 +698,58 @@ lookat
             ext0
             \(i :: _) -> _rhs
               (V4 (swizzscalar i Sx) (swizzscalar i Sy) (swizzscalar i Sz) (fromInt 0));
-        e = _lhs w (_rhs (normalize $ a - b));
-        f = _lhs u (_rhs (normalize $ c `cross` e));
-        g = _lhs v (_rhs (e `cross` f));
+        e = normalize $ a - b;
+        f = normalize $ c `cross` e;
+        g = e `cross` f;
         h
-          = _lhs
-            r
-            (_rhs
-              (transpose
-                $ M44F (d f) (d g) (d e) (V4 (fromInt 0) (fromInt 0) (fromInt 0) (fromInt 1))))
+          = transpose
+            $ M44F (d f) (d g) (d e) (V4 (fromInt 0) (fromInt 0) (fromInt 0) (fromInt 1))
         in h .*. translateBefore4 (neg a)
 
 scale = _lhs scale \(a :: _) (b :: _) -> _rhs (b * V4 a a a 1.0)
 
 fromTo :: Float -> Float -> [Float]
 fromTo
-  = _lhs
-    fromTo
-    \(a :: _) (b :: _) -> case'Bool
-      (\(_ :: _) -> _)
-      (_rhs (a : fromTo (a + fromInt 1) b))
-      (_rhs [])
-      (a > b)
+  = primFix
+    \(a :: Float -> Float -> [Float]) -> _lhs
+      fromTo
+      \(b :: _) (c :: _) -> case'Bool
+        (\(_ :: _) -> _)
+        (_rhs (b : a (b + fromInt 1) c))
+        (_rhs [])
+        (b > c)
 
 (!!) :: forall (a :: _) . [a] -> Int -> a
 (!!)
-  = _lhs
-    (!!)
-    \(a :: _) (b :: _) -> case'List
-      (\(_ :: _) -> _)
-      (_rhs undefined)
-      (\(c :: _) (d :: _) -> case'Bool
+  = primFix
+    \(a :: forall (b :: _) . [b] -> Int -> b) -> _lhs
+      (!!)
+      \(c :: _) (d :: _) -> case'List
         (\(_ :: _) -> _)
-        (_rhs (d !! (b - fromInt 1)))
-        (_rhs c)
-        (fromInt 0 == b))
-      a
+        (_rhs undefined)
+        (\(e :: _) (f :: _) -> case'Bool
+          (\(_ :: _) -> _)
+          (_rhs (a f (d - fromInt 1)))
+          (_rhs e)
+          (fromInt 0 == d))
+        c
 ------------ core code
 !! :: forall a . [a] -> Int -> a
 !!
   = primFix
-    (forall a . [a] -> 'Int -> a)
-    \b c d e -> case'List
-      (\_ -> c)
-      (_rhs (undefined c))
-      (\f g -> case'Bool
-        (\_ -> c)
-        (_rhs (b c g (PrimSub 'Int TT e 1)))
-        (_rhs f)
-        (isEQ (primCompareInt 0 e)))
-      d
+    _
+    \a b c d -> case'List
+      (\_ -> b)
+      (_rhs (undefined b))
+      (\e f -> case'Bool
+        (\_ -> b)
+        (_rhs (a b f (d - 1)))
+        (_rhs e)
+        (isEQ (primCompareInt 0 d)))
+      c
 
 $ :: forall a b . (a -> b) -> a -> b
-$ = \_ _ -> _rhs \a b -> a b
+$ = \a b -> _rhs \c d -> c d
 
 %
   :: forall a (b :: Nat)
@@ -766,7 +760,7 @@ $ = \_ _ -> _rhs \a b -> a b
 %! = \a b c d e -> _rhs (PrimModS a ('VecScalar b a) b c TT d e)
 
 & :: forall a b . a -> (a -> b) -> b
-& = \_ _ a b -> _rhs (b a)
+& = \a b c d -> _rhs (d c)
 
 && :: Bool -> Bool -> Bool
 && = \a b -> _rhs (PrimAnd a b)
@@ -816,7 +810,7 @@ $ = \_ _ -> _rhs \a b -> a b
 -! = \a b c d -> _rhs (PrimSubS ('MatVecScalarElem a) a TT b c d)
 
 . :: forall a b c . (b -> c) -> (a -> b) -> a -> c
-. = \_ _ _ -> _rhs \a b c -> a (b c)
+. = \a b c -> _rhs \d e f -> d (e f)
 
 .* :: forall (a :: Nat) b (c :: Nat) . VecS b a -> Mat a c b -> Vec c b
 .* = \a b c d e -> _rhs (PrimMulVecMat a b c d e)
@@ -868,8 +862,7 @@ $ = \_ _ -> _rhs \a b -> a b
 RecItem :: String -> Type -> RecItem
 RecItem = <<0th constructor of 'RecItem>>
 
-RecordCons
-  :: forall (a :: [RecItem]) . HList (map RecItem Type recItemType a) -> RecordC a
+RecordCons :: forall (a :: [RecItem]) . HList (map recItemType a) -> RecordC a
 RecordCons = <<0th constructor of 'RecordC>>
 
 abs :: forall a b (c :: Nat) . (Signed a, b ~ VecScalar c a) => b -> b
@@ -940,7 +933,7 @@ case'RecItem = \a b c -> <<case function of a type with 0 parameters>>
 case'RecordC
   :: forall (a :: [RecItem])
     . forall (b :: RecordC a -> Type)
-      -> (forall (c :: HList (map RecItem Type recItemType a)) -> b ('RecordCons c))
+      -> (forall (c :: HList (map recItemType a)) -> b ('RecordCons c))
         -> forall (d :: RecordC a) -> b d
 case'RecordC = \_ a b c -> <<case function of a type with 1 parameters>>
 
@@ -962,7 +955,7 @@ colorImage2
 colorImage2 = _rhs \a b c d e f -> ColorImage 2 a b c d e f
 
 const :: forall a b . a -> b -> a
-const = \_ _ a _ -> _rhs a
+const = \a b c _ -> _rhs c
 
 cos :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
 cos = _rhs \a b c d -> PrimCos a b c d
@@ -1009,7 +1002,7 @@ faceforward = _rhs \a b c d e f -> PrimFaceForward a b c d e f
 filter :: forall a . (a -> Bool) -> [a] -> [a]
 filter
   = \a -> primFix
-    ((a -> 'Bool) -> [a] -> [a])
+    _
     \b c d -> case'List
       (\_ -> [a])
       (_rhs [])
@@ -1028,7 +1021,7 @@ floor = _rhs \a b c d -> PrimFloor a b c d
 foldl' :: forall a b . (a -> b -> a) -> a -> [b] -> a
 foldl'
   = \a b -> primFix
-    ((a -> b -> a) -> a -> [b] -> a)
+    _
     \c d e f -> case'List (\_ -> a) (_rhs e) (\g h -> _rhs (c d (d e g) h)) f
 
 foldr1 :: forall a . (a -> a -> a) -> [a] -> a
@@ -1036,7 +1029,7 @@ foldr1
   = \a b c -> case'List
     (\_ -> a)
     (_rhs (undefined a))
-    (\d e -> _rhs (foldr a a b d e))
+    (\d e -> _rhs (foldr b d e))
     c
 
 fract :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
@@ -1045,12 +1038,21 @@ fract = _rhs \a b c d -> PrimFract a b c d
 fromTo :: Float -> Float -> [Float]
 fromTo
   = primFix
-    ('Float -> 'Float -> ['Float])
+    _
     \a b c -> case'Bool
       (\_ -> ['Float])
-      (_rhs (b : a (PrimAdd 'Float TT b 1.0) c))
+      (_rhs (b : a (b + 1.0) c))
       (_rhs [])
-      (PrimGreaterThan 'Float 1 'Float 'Bool TT TT TT b c)
+      (PrimGreaterThan
+        ('VecScalar 1 'Float)
+        1
+        'Float
+        ('VecScalar 1 'Bool)
+        TT
+        TT
+        TT
+        b
+        c)
 
 fst :: forall a b . (a, b) -> a
 fst
@@ -1090,14 +1092,13 @@ isInf = _rhs \a b c d e f -> PrimIsInf a b c d e f
 isKeyC :: String -> Type -> [RecItem] -> Constraint
 isKeyC
   = primFix
-    ('String -> Type -> ['RecItem] -> 'Constraint)
+    _
     \a b c d -> case'List
       (\_ -> 'Constraint)
       (_rhs (CEmpty ""))
       (\e f -> case'RecItem
         (\_ -> 'Constraint)
-        (\g h -> _rhs
-          (primIfThenElse 'Constraint (isEQ (primCompareString b g)) (c ~ h) (a b c f)))
+        (\g h -> _rhs (primIfThenElse 'Constraint (b == g) (c ~ h) (a b c f)))
         e)
       d
 
@@ -1107,8 +1108,7 @@ isNan
 isNan = _rhs \a b c d e f -> PrimIsNan a b c d e f
 
 iterate :: forall a . (a -> a) -> a -> [a]
-iterate
-  = primFix (forall a . (a -> a) -> a -> [a]) \b c d e -> _rhs (e : b c d (d e))
+iterate = primFix _ \a b c d -> _rhs (d : a b c (c d))
 
 length :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> Float
 length = _rhs \a b c d -> PrimLength a b c d
@@ -1135,127 +1135,33 @@ lookat
         4
         'Float
         (M44F
-          (V4
-            (swizzscalar
-              'Float
+          (ext0
+            (PrimNormalize
+              ('VecScalar 3 'Float)
               3
-              (PrimNormalize
-                ('VecS 'Float 3)
-                3
-                TT
-                (PrimCross
-                  ('VecS 'Float 3)
-                  TT
-                  c
-                  (PrimNormalize ('VecS 'Float 3) 3 TT (PrimSub ('VecS 'Float 3) TT a b))))
-              Sx)
-            (swizzscalar
-              'Float
-              3
-              (PrimNormalize
+              TT
+              (PrimCross
                 ('VecS 'Float 3)
-                3
                 TT
-                (PrimCross
-                  ('VecS 'Float 3)
-                  TT
-                  c
-                  (PrimNormalize ('VecS 'Float 3) 3 TT (PrimSub ('VecS 'Float 3) TT a b))))
-              Sy)
-            (swizzscalar
-              'Float
-              3
+                c
+                (PrimNormalize ('VecScalar 3 'Float) 3 TT (a - b)))))
+          (ext0
+            (PrimCross
+              ('VecS 'Float 3)
+              TT
+              (PrimNormalize ('VecScalar 3 'Float) 3 TT (a - b))
               (PrimNormalize
-                ('VecS 'Float 3)
+                ('VecScalar 3 'Float)
                 3
                 TT
                 (PrimCross
                   ('VecS 'Float 3)
                   TT
                   c
-                  (PrimNormalize ('VecS 'Float 3) 3 TT (PrimSub ('VecS 'Float 3) TT a b))))
-              Sz)
-            0.0)
-          (V4
-            (swizzscalar
-              'Float
-              3
-              (PrimCross
-                ('VecS 'Float 3)
-                TT
-                (PrimNormalize ('VecS 'Float 3) 3 TT (PrimSub ('VecS 'Float 3) TT a b))
-                (PrimNormalize
-                  ('VecS 'Float 3)
-                  3
-                  TT
-                  (PrimCross
-                    ('VecS 'Float 3)
-                    TT
-                    c
-                    (PrimNormalize ('VecS 'Float 3) 3 TT (PrimSub ('VecS 'Float 3) TT a b)))))
-              Sx)
-            (swizzscalar
-              'Float
-              3
-              (PrimCross
-                ('VecS 'Float 3)
-                TT
-                (PrimNormalize ('VecS 'Float 3) 3 TT (PrimSub ('VecS 'Float 3) TT a b))
-                (PrimNormalize
-                  ('VecS 'Float 3)
-                  3
-                  TT
-                  (PrimCross
-                    ('VecS 'Float 3)
-                    TT
-                    c
-                    (PrimNormalize ('VecS 'Float 3) 3 TT (PrimSub ('VecS 'Float 3) TT a b)))))
-              Sy)
-            (swizzscalar
-              'Float
-              3
-              (PrimCross
-                ('VecS 'Float 3)
-                TT
-                (PrimNormalize ('VecS 'Float 3) 3 TT (PrimSub ('VecS 'Float 3) TT a b))
-                (PrimNormalize
-                  ('VecS 'Float 3)
-                  3
-                  TT
-                  (PrimCross
-                    ('VecS 'Float 3)
-                    TT
-                    c
-                    (PrimNormalize ('VecS 'Float 3) 3 TT (PrimSub ('VecS 'Float 3) TT a b)))))
-              Sz)
-            0.0)
-          (V4
-            (swizzscalar
-              'Float
-              3
-              (PrimNormalize ('VecS 'Float 3) 3 TT (PrimSub ('VecS 'Float 3) TT a b))
-              Sx)
-            (swizzscalar
-              'Float
-              3
-              (PrimNormalize ('VecS 'Float 3) 3 TT (PrimSub ('VecS 'Float 3) TT a b))
-              Sy)
-            (swizzscalar
-              'Float
-              3
-              (PrimNormalize ('VecS 'Float 3) 3 TT (PrimSub ('VecS 'Float 3) TT a b))
-              Sz)
-            0.0)
+                  (PrimNormalize ('VecScalar 3 'Float) 3 TT (a - b))))))
+          (ext0 (PrimNormalize ('VecScalar 3 'Float) 3 TT (a - b)))
           (V4 0.0 0.0 0.0 1.0)))
-      (M44F
-        (V4 1.0 0.0 0.0 0.0)
-        (V4 0.0 1.0 0.0 0.0)
-        (V4 0.0 0.0 1.0 0.0)
-        (V4
-          (swizzscalar 'Float 3 (PrimNeg ('VecS 'Float 3) TT a) Sx)
-          (swizzscalar 'Float 3 (PrimNeg ('VecS 'Float 3) TT a) Sy)
-          (swizzscalar 'Float 3 (PrimNeg ('VecS 'Float 3) TT a) Sz)
-          1.0)))
+      (translateBefore4 (neg a)))
 
 maroon :: VecS Float 4
 maroon = _rhs (V4 0.5 0.0 0.0 1.0)
@@ -1275,7 +1181,7 @@ max = _rhs \a b c d e f g -> PrimMax a b c d e f g
 mergeBy :: forall a . (a -> a -> Ordering) -> [a] -> [a] -> [a]
 mergeBy
   = \a -> primFix
-    ((a -> a -> 'Ordering) -> [a] -> [a] -> [a])
+    _
     \b c d e -> case'List
       (\_ -> [a])
       (_rhs e)
@@ -1353,188 +1259,31 @@ perspective
   = \a b c d -> _rhs
     (M44F
       (V4
-        (PrimDiv
-          'Float
-          'Float
-          1
-          TT
-          TT
-          (PrimMul 'Float TT 2.0 a)
-          (PrimSub
-            'Float
-            TT
-            (PrimMul
-              'Float
-              TT
-              d
-              (PrimMul
-                'Float
-                TT
-                a
-                (PrimTan 'Float 1 TT (PrimDiv 'Float 'Float 1 TT TT c 2.0))))
-            (PrimSub
-              'Float
-              TT
-              0.0
-              (PrimMul
-                'Float
-                TT
-                d
-                (PrimMul
-                  'Float
-                  TT
-                  a
-                  (PrimTan 'Float 1 TT (PrimDiv 'Float 'Float 1 TT TT c 2.0)))))))
+        (2.0 * a
+          / (d * (a * PrimTan ('VecScalar 1 'Float) 1 TT (c / 2.0))
+            - (0.0 - (d * (a * PrimTan ('VecScalar 1 'Float) 1 TT (c / 2.0))))))
         0.0
         0.0
         0.0)
       (V4
         0.0
-        (PrimDiv
-          'Float
-          'Float
-          1
-          TT
-          TT
-          (PrimMul 'Float TT 2.0 a)
-          (PrimSub
-            'Float
-            TT
-            (PrimMul
-              'Float
-              TT
-              a
-              (PrimTan 'Float 1 TT (PrimDiv 'Float 'Float 1 TT TT c 2.0)))
-            (PrimSub
-              'Float
-              TT
-              0.0
-              (PrimMul
-                'Float
-                TT
-                a
-                (PrimTan 'Float 1 TT (PrimDiv 'Float 'Float 1 TT TT c 2.0))))))
+        (2.0 * a
+          / (a * PrimTan ('VecScalar 1 'Float) 1 TT (c / 2.0)
+            - (0.0 - (a * PrimTan ('VecScalar 1 'Float) 1 TT (c / 2.0)))))
         0.0
         0.0)
       (V4
-        (PrimDiv
-          'Float
-          'Float
-          1
-          TT
-          TT
-          (PrimAdd
-            'Float
-            TT
-            (PrimMul
-              'Float
-              TT
-              d
-              (PrimMul
-                'Float
-                TT
-                a
-                (PrimTan 'Float 1 TT (PrimDiv 'Float 'Float 1 TT TT c 2.0))))
-            (PrimSub
-              'Float
-              TT
-              0.0
-              (PrimMul
-                'Float
-                TT
-                d
-                (PrimMul
-                  'Float
-                  TT
-                  a
-                  (PrimTan 'Float 1 TT (PrimDiv 'Float 'Float 1 TT TT c 2.0))))))
-          (PrimSub
-            'Float
-            TT
-            (PrimMul
-              'Float
-              TT
-              d
-              (PrimMul
-                'Float
-                TT
-                a
-                (PrimTan 'Float 1 TT (PrimDiv 'Float 'Float 1 TT TT c 2.0))))
-            (PrimSub
-              'Float
-              TT
-              0.0
-              (PrimMul
-                'Float
-                TT
-                d
-                (PrimMul
-                  'Float
-                  TT
-                  a
-                  (PrimTan 'Float 1 TT (PrimDiv 'Float 'Float 1 TT TT c 2.0)))))))
-        (PrimDiv
-          'Float
-          'Float
-          1
-          TT
-          TT
-          (PrimAdd
-            'Float
-            TT
-            (PrimMul
-              'Float
-              TT
-              a
-              (PrimTan 'Float 1 TT (PrimDiv 'Float 'Float 1 TT TT c 2.0)))
-            (PrimSub
-              'Float
-              TT
-              0.0
-              (PrimMul
-                'Float
-                TT
-                a
-                (PrimTan 'Float 1 TT (PrimDiv 'Float 'Float 1 TT TT c 2.0)))))
-          (PrimSub
-            'Float
-            TT
-            (PrimMul
-              'Float
-              TT
-              a
-              (PrimTan 'Float 1 TT (PrimDiv 'Float 'Float 1 TT TT c 2.0)))
-            (PrimSub
-              'Float
-              TT
-              0.0
-              (PrimMul
-                'Float
-                TT
-                a
-                (PrimTan 'Float 1 TT (PrimDiv 'Float 'Float 1 TT TT c 2.0))))))
-        (PrimSub
-          'Float
-          TT
-          0.0
-          (PrimDiv 'Float 'Float 1 TT TT (PrimAdd 'Float TT b a) (PrimSub 'Float TT b a)))
-        -1.0)
-      (V4
-        0.0
-        0.0
-        (PrimSub
-          'Float
-          TT
-          0.0
-          (PrimDiv
-            'Float
-            'Float
-            1
-            TT
-            TT
-            (PrimMul 'Float TT (PrimMul 'Float TT 2.0 b) a)
-            (PrimSub 'Float TT b a)))
-        0.0))
+        (d * (a * PrimTan ('VecScalar 1 'Float) 1 TT (c / 2.0))
+            + (0.0 - (d * (a * PrimTan ('VecScalar 1 'Float) 1 TT (c / 2.0))))
+          / (d * (a * PrimTan ('VecScalar 1 'Float) 1 TT (c / 2.0))
+            - (0.0 - (d * (a * PrimTan ('VecScalar 1 'Float) 1 TT (c / 2.0))))))
+        (a * PrimTan ('VecScalar 1 'Float) 1 TT (c / 2.0)
+            + (0.0 - (a * PrimTan ('VecScalar 1 'Float) 1 TT (c / 2.0)))
+          / (a * PrimTan ('VecScalar 1 'Float) 1 TT (c / 2.0)
+            - (0.0 - (a * PrimTan ('VecScalar 1 'Float) 1 TT (c / 2.0)))))
+        (0.0 - (b + a / (b - a)))
+        (0.0 - 1.0))
+      (V4 0.0 0.0 (0.0 - (2.0 * b * a / (b - a))) 0.0))
 
 pi :: Float
 pi = _rhs 3.141592653589793
@@ -1547,47 +1296,43 @@ project
     . forall (c :: String) -> isKeyC c a b => RecordC b -> a
 project
   = primFix
-    (forall a (b :: [RecItem])
-      . forall (c :: String) -> isKeyC c a b => 'RecordC b -> a)
-    \d e f g _ h -> case'List
-      (\_ -> e)
-      (_rhs (undefined e))
-      (\i j -> case'RecItem
-        (\_ -> e)
-        (\k _ -> case'RecordC
-          (\_ -> e)
-          (\l -> case'Bool
-            (\_ -> e)
+    _
+    \a b c d _ e -> case'List
+      (\_ -> b)
+      (_rhs (undefined b))
+      (\f g -> case'RecItem
+        (\_ -> b)
+        (\h _ -> case'RecordC
+          (\_ -> b)
+          (\i -> case'Bool
+            (\_ -> b)
             (_rhs
-              (d
-                e
-                j
+              (a
+                b
                 g
-                (undefined ('CW (isKeyC g e j)))
+                d
+                (undefined ('CW (isKeyC d b g)))
                 (RecordCons
                   (hlistConsCase
-                    e
-                    (map 'RecItem Type recItemType j)
-                    ('HList (map 'RecItem Type recItemType j))
-                    (\_ m -> m)
+                    b
+                    (map recItemType g)
+                    ('HList (map recItemType g))
+                    (\_ j -> j)
                     (unsafeCoerce
-                      ('HList (map 'RecItem Type recItemType f))
-                      ('HList (e : map 'RecItem Type recItemType j))
-                      l)))))
+                      ('HList (map recItemType c))
+                      ('HList (b : map recItemType g))
+                      i)))))
             (_rhs
               (hlistConsCase
-                e
-                (map 'RecItem Type recItemType j)
-                e
-                (\n _ -> n)
-                (unsafeCoerce
-                  ('HList (map 'RecItem Type recItemType f))
-                  ('HList (e : map 'RecItem Type recItemType j))
-                  l)))
-            (isEQ (primCompareString g k)))
-          h)
-        i)
-      f
+                b
+                (map recItemType g)
+                b
+                (\k _ -> k)
+                (unsafeCoerce ('HList (map recItemType c)) ('HList (b : map recItemType g)) i)))
+            (isEQ (primCompareString d h)))
+          e)
+        f)
+      c
 
 purple :: VecS Float 4
 purple = _rhs (V4 0.5 0.0 0.5 1.0)
@@ -1615,11 +1360,15 @@ rotMatrixX
   = \a -> _rhs
     (M44F
       (V4 1.0 0.0 0.0 0.0)
-      (V4 0.0 (PrimCos 'Float 1 TT a) (PrimSin 'Float 1 TT a) 0.0)
       (V4
         0.0
-        (PrimSub 'Float TT 0.0 (PrimSin 'Float 1 TT a))
-        (PrimCos 'Float 1 TT a)
+        (PrimCos ('VecScalar 1 'Float) 1 TT a)
+        (PrimSin ('VecScalar 1 'Float) 1 TT a)
+        0.0)
+      (V4
+        0.0
+        (0.0 - PrimSin ('VecScalar 1 'Float) 1 TT a)
+        (PrimCos ('VecScalar 1 'Float) 1 TT a)
         0.0)
       (V4 0.0 0.0 0.0 1.0))
 
@@ -1628,22 +1377,30 @@ rotMatrixY
   = \a -> _rhs
     (M44F
       (V4
-        (PrimCos 'Float 1 TT a)
+        (PrimCos ('VecScalar 1 'Float) 1 TT a)
         0.0
-        (PrimSub 'Float TT 0.0 (PrimSin 'Float 1 TT a))
+        (0.0 - PrimSin ('VecScalar 1 'Float) 1 TT a)
         0.0)
       (V4 0.0 1.0 0.0 0.0)
-      (V4 (PrimSin 'Float 1 TT a) 0.0 (PrimCos 'Float 1 TT a) 0.0)
+      (V4
+        (PrimSin ('VecScalar 1 'Float) 1 TT a)
+        0.0
+        (PrimCos ('VecScalar 1 'Float) 1 TT a)
+        0.0)
       (V4 0.0 0.0 0.0 1.0))
 
 rotMatrixZ :: VecScalar 1 Float -> Mat 4 4 Float
 rotMatrixZ
   = \a -> _rhs
     (M44F
-      (V4 (PrimCos 'Float 1 TT a) (PrimSin 'Float 1 TT a) 0.0 0.0)
       (V4
-        (PrimSub 'Float TT 0.0 (PrimSin 'Float 1 TT a))
-        (PrimCos 'Float 1 TT a)
+        (PrimCos ('VecScalar 1 'Float) 1 TT a)
+        (PrimSin ('VecScalar 1 'Float) 1 TT a)
+        0.0
+        0.0)
+      (V4
+        (0.0 - PrimSin ('VecScalar 1 'Float) 1 TT a)
+        (PrimCos ('VecScalar 1 'Float) 1 TT a)
         0.0
         0.0)
       (V4 0.0 0.0 1.0 0.0)
@@ -1652,43 +1409,7 @@ rotMatrixZ
 rotationEuler :: Float -> Float -> Float -> Mat 4 4 Float
 rotationEuler
   = \a b c -> _rhs
-    (PrimMulMatMat
-      4
-      4
-      'Float
-      4
-      (PrimMulMatMat
-        4
-        4
-        'Float
-        4
-        (M44F
-          (V4
-            (PrimCos 'Float 1 TT a)
-            0.0
-            (PrimSub 'Float TT 0.0 (PrimSin 'Float 1 TT a))
-            0.0)
-          (V4 0.0 1.0 0.0 0.0)
-          (V4 (PrimSin 'Float 1 TT a) 0.0 (PrimCos 'Float 1 TT a) 0.0)
-          (V4 0.0 0.0 0.0 1.0))
-        (M44F
-          (V4 1.0 0.0 0.0 0.0)
-          (V4 0.0 (PrimCos 'Float 1 TT b) (PrimSin 'Float 1 TT b) 0.0)
-          (V4
-            0.0
-            (PrimSub 'Float TT 0.0 (PrimSin 'Float 1 TT b))
-            (PrimCos 'Float 1 TT b)
-            0.0)
-          (V4 0.0 0.0 0.0 1.0)))
-      (M44F
-        (V4 (PrimCos 'Float 1 TT c) (PrimSin 'Float 1 TT c) 0.0 0.0)
-        (V4
-          (PrimSub 'Float TT 0.0 (PrimSin 'Float 1 TT c))
-          (PrimCos 'Float 1 TT c)
-          0.0
-          0.0)
-        (V4 0.0 0.0 1.0 0.0)
-        (V4 0.0 0.0 0.0 1.0)))
+    (PrimMulMatMat 4 4 'Float 4 (rotMatrixY a .*. rotMatrixX b) (rotMatrixZ c))
 
 round :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
 round = _rhs \a b c d -> PrimRound a b c d
@@ -1751,27 +1472,21 @@ sndTup = \a b -> _rhs \c -> hlistConsCase a b ('HList b) (\_ d -> d) c
 sortBy :: forall a . (a -> a -> Ordering) -> [a] -> [a]
 sortBy
   = \a -> primFix
-    ((a -> a -> 'Ordering) -> [a] -> [a])
+    _
     \b c d -> case'List
       (\_ -> [a])
       (_rhs [])
       (\e f -> case'List
         (\_ -> [a])
         (_rhs [e])
-        (\_ _ -> _rhs
-          (uncurry
-            [a]
-            [a]
-            [a]
-            (mergeBy a c)
-            (([a] *** [a]) [a] [a] (b c) (b c) (split a d))))
+        (\_ _ -> _rhs (uncurry (mergeBy c) ((b c *** b c) (split d))))
         f)
       d
 
 split :: forall a . [a] -> ([a], [a])
 split
   = \a -> primFix
-    ([a] -> ' ([a], [a]))
+    _
     \b c -> case'List
       (\_ -> ' ([a], [a]))
       (_rhs ([], []))
@@ -1843,39 +1558,39 @@ uncurry
 unzip :: forall a b . [(a, b)] -> ([a], [b])
 unzip
   = primFix
-    (forall a b . [' (a, b)] -> ' ([a], [b]))
-    \c d e f -> case'List
-      (\_ -> ' ([d], [e]))
+    _
+    \a b c d -> case'List
+      (\_ -> ' ([b], [c]))
       (_rhs ([], []))
-      (\g h -> hlistConsCase
-        d
-        [e]
-        ' ([d], [e])
-        (\i j -> hlistConsCase
-          e
+      (\e f -> hlistConsCase
+        b
+        [c]
+        ' ([b], [c])
+        (\g h -> hlistConsCase
+          c
           []
-          ' ([d], [e])
-          (\k l -> hlistNilCase
-            ' ([d], [e])
+          ' ([b], [c])
+          (\i j -> hlistNilCase
+            ' ([b], [c])
             (_rhs
-              (i
+              (g
                 : hlistConsCase
-                  [d]
-                  [[e]]
-                  [d]
-                  (\m n -> hlistConsCase [e] [] [d] (\_ o -> hlistNilCase [d] m o) n)
-                  (c d e h)
-              , k
+                  [b]
+                  [[c]]
+                  [b]
+                  (\k l -> hlistConsCase [c] [] [b] (\_ m -> hlistNilCase [b] k m) l)
+                  (a b c f)
+              , i
                 : hlistConsCase
-                  [d]
-                  [[e]]
-                  [e]
-                  (\_ p -> hlistConsCase [e] [] [e] (\q r -> hlistNilCase [e] q r) p)
-                  (c d e h)))
-            l)
-          j)
-        g)
-      f
+                  [b]
+                  [[c]]
+                  [c]
+                  (\_ n -> hlistConsCase [c] [] [c] (\o p -> hlistNilCase [c] o p) n)
+                  (a b c f)))
+            j)
+          h)
+        e)
+      d
 
 v3FToV4F :: Vec 3 Float -> VecS Float 4
 v3FToV4F
@@ -1901,16 +1616,16 @@ yellow = _rhs (V4 1.0 1.0 0.0 1.0)
 zip :: forall a b . [a] -> [b] -> [(a, b)]
 zip
   = primFix
-    (forall a b . [a] -> [b] -> [' (a, b)])
-    \c d e f g -> case'List
-      (\_ -> [' (d, e)])
+    _
+    \a b c d e -> case'List
+      (\_ -> [' (b, c)])
       (_rhs [])
-      (\h i -> case'List
-        (\_ -> [' (d, e)])
+      (\f g -> case'List
+        (\_ -> [' (b, c)])
         (_rhs [])
-        (\j k -> _rhs ((h, j) : c d e i k))
-        g)
-      f
+        (\h i -> _rhs ((f, h) : a b c g i))
+        e)
+      d
 
 || :: Bool -> Bool -> Bool
 || = \a b -> _rhs (PrimOr a b)
@@ -1978,8 +1693,6 @@ testdata/Prelude.lc 31:8-31:11
     Type
 testdata/Prelude.lc 31:8-31:29
     Type | Type
-testdata/Prelude.lc 31:8-34:39
-    forall a b . [a] -> [b] -> [(a, b)]
 testdata/Prelude.lc 31:9-31:10
     _d
 testdata/Prelude.lc 31:15-31:18
@@ -2034,8 +1747,6 @@ testdata/Prelude.lc 36:10-36:17
     Type
 testdata/Prelude.lc 36:10-36:30
     Type | Type
-testdata/Prelude.lc 36:10-39:27
-    forall a b . [(a, b)] -> ([a], [b])
 testdata/Prelude.lc 36:11-36:16
     Type
 testdata/Prelude.lc 36:12-36:13
@@ -2376,8 +2087,6 @@ testdata/Prelude.lc 71:67-71:69
     _k
 testdata/Prelude.lc 73:12-73:32
     Type
-testdata/Prelude.lc 73:12-74:35
-    forall a . (a -> a) -> a -> [a]
 testdata/Prelude.lc 73:13-73:14
     _b
 testdata/Prelude.lc 73:18-73:19
@@ -2470,8 +2179,8 @@ testdata/Prelude.lc 126:21-126:30
 testdata/Prelude.lc 126:22-126:29
     Type | Type | Type
 testdata/Prelude.lc 127:7-127:17
-    forall (a :: [RecItem])
-      . HList (map RecItem Type recItemType a) -> RecordC a | RecordC _c | Type | Type
+    forall (a :: [RecItem]) . HList (map recItemType a) -> RecordC a | RecordC
+      _c | Type | Type
 testdata/Prelude.lc 127:19-127:24
     [Type] -> Type
 testdata/Prelude.lc 127:19-127:45
@@ -2548,9 +2257,6 @@ testdata/Prelude.lc 133:10-133:37
     HList (_b : _a) -> HList _a
 testdata/Prelude.lc 133:35-133:36
     HList _d
-testdata/Prelude.lc 136:12-138:186
-    forall a (b :: [RecItem])
-      . forall (c :: String) -> isKeyC c a b => RecordC b -> a
 testdata/Prelude.lc 136:28-136:37
     Type
 testdata/Prelude.lc 136:28-136:97
@@ -2613,9 +2319,9 @@ testdata/Prelude.lc 137:75-137:87
 testdata/Prelude.lc 137:75-137:90
     forall a . _a -> a
 testdata/Prelude.lc 137:75-137:125
-    _a -> HList (_q : map RecItem Type recItemType _j)
+    _a -> HList (_q : map recItemType _j)
 testdata/Prelude.lc 137:75-137:128
-    HList (_n : map RecItem Type recItemType _g)
+    HList (_n : map recItemType _g)
 testdata/Prelude.lc 137:93-137:98
     [Type] -> Type
 testdata/Prelude.lc 137:93-137:124
@@ -2639,7 +2345,7 @@ testdata/Prelude.lc 137:109-137:120
 testdata/Prelude.lc 137:121-137:123
     [RecItem]
 testdata/Prelude.lc 137:126-137:128
-    HList (map RecItem Type recItemType _d)
+    HList (map recItemType _d)
 testdata/Prelude.lc 138:57-138:64
     forall a (b :: [RecItem])
       . forall (c :: String) -> isKeyC c a b => RecordC b -> a
@@ -2683,21 +2389,21 @@ testdata/Prelude.lc 138:101-138:102
 testdata/Prelude.lc 138:103-138:105
     [RecItem]
 testdata/Prelude.lc 138:110-138:120
-    forall (a :: [RecItem]) . HList (map RecItem Type recItemType a) -> RecordC a
+    forall (a :: [RecItem]) . HList (map recItemType a) -> RecordC a
 testdata/Prelude.lc 138:110-138:185
     RecordC _b
 testdata/Prelude.lc 138:122-138:128
     forall a (b :: [Type]) . HList (a : b) -> HList b
 testdata/Prelude.lc 138:122-138:184
-    HList (map RecItem Type recItemType _h)
+    HList (map recItemType _h)
 testdata/Prelude.lc 138:130-138:142
     forall a b . a -> b
 testdata/Prelude.lc 138:130-138:145
     forall a . _a -> a
 testdata/Prelude.lc 138:130-138:180
-    _a -> HList (_r : map RecItem Type recItemType _k)
+    _a -> HList (_r : map recItemType _k)
 testdata/Prelude.lc 138:130-138:183
-    HList (_o : map RecItem Type recItemType _h)
+    HList (_o : map recItemType _h)
 testdata/Prelude.lc 138:148-138:153
     [Type] -> Type
 testdata/Prelude.lc 138:148-138:179
@@ -2721,7 +2427,7 @@ testdata/Prelude.lc 138:164-138:175
 testdata/Prelude.lc 138:176-138:178
     [RecItem]
 testdata/Prelude.lc 138:181-138:183
-    HList (map RecItem Type recItemType _e)
+    HList (map recItemType _e)
 testdata/Prelude.lc 142:1-142:4
     Float -> Float -> Float -> VecS Float 4
 testdata/Prelude.lc 142:13-142:15
@@ -4674,8 +4380,6 @@ testdata/Prelude.lc 380:26-380:29
     Float
 testdata/Prelude.lc 382:11-382:16
     Type
-testdata/Prelude.lc 382:11-385:38
-    Float -> Float -> [Float]
 testdata/Prelude.lc 382:20-382:25
     Type
 testdata/Prelude.lc 382:20-382:36
@@ -4733,8 +4437,6 @@ testdata/Prelude.lc 387:9-387:12
     Type
 testdata/Prelude.lc 387:9-387:24
     Type
-testdata/Prelude.lc 387:9-389:30
-    forall a . [a] -> Int -> a
 testdata/Prelude.lc 387:10-387:11
     _b
 testdata/Prelude.lc 387:16-387:19
diff --git a/testdata/Spiral.out b/testdata/Spiral.out
index 070dbd1c..497bffbd 100644
--- a/testdata/Spiral.out
+++ b/testdata/Spiral.out
@@ -35,6 +35,9 @@ Pipeline
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
+              vec4 v3FToV4F(vec3 z0) {
+                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
+              }
               void main() {
                   gl_Position = scale (0.5
                                       ,(MVP) * (vec4 ((exp ((((Mouse).x) - (0.5)) * ((vi1).x))) * (sin
@@ -42,7 +45,7 @@ Pipeline
                                                      ,(exp ((((Mouse).x) - (0.5)) * ((vi1).x))) * (cos ((0.9) * ((vi1).x)))
                                                      ,((Mouse).y) * ((0.9) * ((vi1).x))
                                                      ,1.0)));
-                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
+                  vo1 = v3FToV4F (vi1);
               }
               """
           , geometryShader = Nothing
diff --git a/testdata/ambig.out b/testdata/ambig.out
index c78ba1de..497fbffe 100644
--- a/testdata/ambig.out
+++ b/testdata/ambig.out
@@ -6,28 +6,25 @@ h
     \(a :: _) (b :: _) (_ :: _) -> _rhs
       let
         c
-          = _lhs
-            x
-            (_rhs
-              ((\(d :: _) -> hlistConsCase
-                  _
-                  (\(e :: _) (f :: _) -> hlistConsCase
-                    _
-                    (\(g :: _) (h :: _) -> hlistNilCase _ (a e g) h)
-                    f)
-                  d)
-                b))
+          = (\(d :: _) -> hlistConsCase
+              _
+              (\(e :: _) (f :: _) -> hlistConsCase
+                _
+                (\(g :: _) (h :: _) -> hlistNilCase _ (a e g) h)
+                f)
+              d)
+            b
         in c
 ------------ core code
 h :: forall a b c d . (b -> d -> c) -> (b, d) -> a -> c
 h
-  = \_ a b c d e _ -> _rhs
+  = \a b c d e f _ -> _rhs
     (hlistConsCase
-      a
-      [c]
       b
-      (\f g -> hlistConsCase c [] b (\h i -> hlistNilCase b (d f h) i) g)
-      e)
+      [d]
+      c
+      (\g h -> hlistConsCase d [] c (\i j -> hlistNilCase c (e g i) j) h)
+      f)
 ------------ tooltips
 testdata/ambig.lc 4:1-4:2
     forall a b c d . (b -> d -> c) -> (b, d) -> a -> c
diff --git a/testdata/complex.out b/testdata/complex.out
index 4bcb401b..f683c450 100644
--- a/testdata/complex.out
+++ b/testdata/complex.out
@@ -36,7 +36,7 @@ toPolar
     \(a :: _) -> case'Complex
       (\(_ :: _) (_ :: _) -> _)
       (\(b :: _) (c :: _) -> _rhs
-        let d = _lhs r (_rhs (sqrt (b * b + c * c))) in primIfThenElse
+        let d = sqrt (b * b + c * c) in primIfThenElse
           (b > 0.0)
           (polar d (atan (c / b)))
           (primIfThenElse
@@ -145,7 +145,7 @@ add
         (\_ _ -> 'Complex a)
         (\_ e f -> case'Complex
           (\_ _ -> 'Complex a)
-          (\_ g h -> _rhs (Complex a (PrimAdd 'Float TT e g) (PrimAdd 'Float TT f h)))
+          (\_ g h -> _rhs (Complex a (e + g) (f + h)))
           b
           d)
         a
@@ -161,12 +161,7 @@ cabs
     (\_ -> 'Float)
     (case'Complex
       (\_ _ -> 'Float)
-      (\_ c d -> _rhs
-        (PrimSqrt
-          'Float
-          1
-          TT
-          (PrimAdd 'Float TT (PrimMul 'Float TT c c) (PrimMul 'Float TT d d))))
+      (\_ c d -> _rhs (PrimSqrt ('VecScalar 1 'Float) 1 TT (c * c + (d * d))))
       a
       b)
     (case'Complex (\_ _ -> 'Float) (\_ e _ -> _rhs e) a b)
@@ -188,90 +183,20 @@ it_should_fail :: forall (a :: Repr) . Complex a -> Float
 it_should_fail = \a b -> case'Complex (\_ _ -> 'Float) (\_ c _ -> _rhs c) a b
 
 iter :: forall (a :: Repr) . Complex a -> Complex a
-iter = _rhs s4
+iter = _rhs \a -> s4
 
 mandel :: forall (a :: Repr) . Complex a -> VecScalar 1 Bool
 mandel
   = \a b -> _rhs
     (PrimLessThan
-      'Float
+      ('VecScalar 1 'Float)
       1
       'Float
-      'Bool
+      ('VecScalar 1 'Bool)
       TT
       TT
       TT
-      (cabs
-        a
-        (add
-          a
-          a
-          (mul
-            a
-            a
-            (add
-              a
-              a
-              (mul
-                a
-                a
-                (add
-                  a
-                  a
-                  (mul a a (add a a (mul a a b b) b) (add a a (mul a a b b) b))
-                  (add a a (mul a a b b) b))
-                (add
-                  a
-                  a
-                  (mul a a (add a a (mul a a b b) b) (add a a (mul a a b b) b))
-                  (add a a (mul a a b b) b)))
-              (add
-                a
-                a
-                (mul a a (add a a (mul a a b b) b) (add a a (mul a a b b) b))
-                (add a a (mul a a b b) b)))
-            (add
-              a
-              a
-              (mul
-                a
-                a
-                (add
-                  a
-                  a
-                  (mul a a (add a a (mul a a b b) b) (add a a (mul a a b b) b))
-                  (add a a (mul a a b b) b))
-                (add
-                  a
-                  a
-                  (mul a a (add a a (mul a a b b) b) (add a a (mul a a b b) b))
-                  (add a a (mul a a b b) b)))
-              (add
-                a
-                a
-                (mul a a (add a a (mul a a b b) b) (add a a (mul a a b b) b))
-                (add a a (mul a a b b) b))))
-          (add
-            a
-            a
-            (mul
-              a
-              a
-              (add
-                a
-                a
-                (mul a a (add a a (mul a a b b) b) (add a a (mul a a b b) b))
-                (add a a (mul a a b b) b))
-              (add
-                a
-                a
-                (mul a a (add a a (mul a a b b) b) (add a a (mul a a b b) b))
-                (add a a (mul a a b b) b)))
-            (add
-              a
-              a
-              (mul a a (add a a (mul a a b b) b) (add a a (mul a a b b) b))
-              (add a a (mul a a b b) b)))))
+      (cabs a (s4 b))
       2.0)
 
 match'Complex
@@ -292,11 +217,7 @@ mul
         (\_ _ -> 'Complex a)
         (\_ e f -> case'Complex
           (\_ _ -> 'Complex a)
-          (\_ g h -> _rhs
-            (Complex
-              a
-              (PrimSub 'Float TT (PrimMul 'Float TT e g) (PrimMul 'Float TT f h))
-              (PrimAdd 'Float TT (PrimMul 'Float TT f g) (PrimMul 'Float TT e h))))
+          (\_ g h -> _rhs (Complex a (e * g - (f * h)) (f * g + (e * h))))
           b
           d)
         a
@@ -321,75 +242,7 @@ s = \a b -> _rhs (add a a (mul a a b b) b)
 s4 :: forall (a :: Repr) . Complex a -> Complex a
 s4
   = \a b -> _rhs
-    (add
-      a
-      a
-      (mul
-        a
-        a
-        (add
-          a
-          a
-          (mul
-            a
-            a
-            (add
-              a
-              a
-              (mul a a (add a a (mul a a b b) b) (add a a (mul a a b b) b))
-              (add a a (mul a a b b) b))
-            (add
-              a
-              a
-              (mul a a (add a a (mul a a b b) b) (add a a (mul a a b b) b))
-              (add a a (mul a a b b) b)))
-          (add
-            a
-            a
-            (mul a a (add a a (mul a a b b) b) (add a a (mul a a b b) b))
-            (add a a (mul a a b b) b)))
-        (add
-          a
-          a
-          (mul
-            a
-            a
-            (add
-              a
-              a
-              (mul a a (add a a (mul a a b b) b) (add a a (mul a a b b) b))
-              (add a a (mul a a b b) b))
-            (add
-              a
-              a
-              (mul a a (add a a (mul a a b b) b) (add a a (mul a a b b) b))
-              (add a a (mul a a b b) b)))
-          (add
-            a
-            a
-            (mul a a (add a a (mul a a b b) b) (add a a (mul a a b b) b))
-            (add a a (mul a a b b) b))))
-      (add
-        a
-        a
-        (mul
-          a
-          a
-          (add
-            a
-            a
-            (mul a a (add a a (mul a a b b) b) (add a a (mul a a b b) b))
-            (add a a (mul a a b b) b))
-          (add
-            a
-            a
-            (mul a a (add a a (mul a a b b) b) (add a a (mul a a b b) b))
-            (add a a (mul a a b b) b)))
-        (add
-          a
-          a
-          (mul a a (add a a (mul a a b b) b) (add a a (mul a a b b) b))
-          (add a a (mul a a b b) b))))
+    (add a a (mul a a (s a (s a (s a b))) (s a (s a (s a b)))) (s a (s a (s a b))))
 
 toNormal :: Complex 'Polar -> Complex 'Normal
 toNormal
@@ -398,8 +251,8 @@ toNormal
     (\_ b c -> _rhs
       (Complex
         Normal
-        (PrimMul 'Float TT b (PrimCos 'Float 1 TT c))
-        (PrimMul 'Float TT b (PrimSin 'Float 1 TT c))))
+        (b * PrimCos ('VecScalar 1 'Float) 1 TT c)
+        (b * PrimSin ('VecScalar 1 'Float) 1 TT c)))
     Polar
     a
 
@@ -410,75 +263,32 @@ toPolar
     (\_ b c -> _rhs
       (primIfThenElse
         ('Complex Polar)
-        (PrimGreaterThan 'Float 1 'Float 'Bool TT TT TT b 0.0)
-        (Complex
-          Polar
-          (PrimSqrt
-            'Float
-            1
-            TT
-            (PrimAdd 'Float TT (PrimMul 'Float TT b b) (PrimMul 'Float TT c c)))
-          (PrimATan 'Float 1 TT (PrimDiv 'Float 'Float 1 TT TT c b)))
+        (b > 0.0)
+        (polar
+          (PrimSqrt ('VecScalar 1 'Float) 1 TT (b * b + (c * c)))
+          (PrimATan ('VecScalar 1 'Float) 1 TT (c / b)))
         (primIfThenElse
           ('Complex Polar)
-          (PrimAnd
-            (PrimLessThan 'Float 1 'Float 'Bool TT TT TT b 0.0)
-            (PrimGreaterThanEqual 'Float 1 'Float 'Bool TT TT TT c 0.0))
-          (Complex
-            Polar
-            (PrimSqrt
-              'Float
-              1
-              TT
-              (PrimAdd 'Float TT (PrimMul 'Float TT b b) (PrimMul 'Float TT c c)))
-            (PrimAdd
-              'Float
-              TT
-              (PrimATan 'Float 1 TT (PrimDiv 'Float 'Float 1 TT TT c b))
-              3.141592653589793))
+          (b < 0.0 && (c >= 0.0))
+          (polar
+            (PrimSqrt ('VecScalar 1 'Float) 1 TT (b * b + (c * c)))
+            (PrimATan ('VecScalar 1 'Float) 1 TT (c / b) + pi))
           (primIfThenElse
             ('Complex Polar)
-            (PrimAnd
-              (PrimLessThan 'Float 1 'Float 'Bool TT TT TT b 0.0)
-              (PrimLessThan 'Float 1 'Float 'Bool TT TT TT c 0.0))
-            (Complex
-              Polar
-              (PrimSqrt
-                'Float
-                1
-                TT
-                (PrimAdd 'Float TT (PrimMul 'Float TT b b) (PrimMul 'Float TT c c)))
-              (PrimSub
-                'Float
-                TT
-                (PrimATan 'Float 1 TT (PrimDiv 'Float 'Float 1 TT TT c b))
-                3.141592653589793))
+            (b < 0.0 && (c < 0.0))
+            (polar
+              (PrimSqrt ('VecScalar 1 'Float) 1 TT (b * b + (c * c)))
+              (PrimATan ('VecScalar 1 'Float) 1 TT (c / b) - pi))
             (primIfThenElse
               ('Complex Polar)
-              (PrimAnd
-                (isEQ (primCompareFloat b 0.0))
-                (PrimGreaterThanEqual 'Float 1 'Float 'Bool TT TT TT c 0.0))
-              (Complex
-                Polar
-                (PrimSqrt
-                  'Float
-                  1
-                  TT
-                  (PrimAdd 'Float TT (PrimMul 'Float TT b b) (PrimMul 'Float TT c c)))
-                1.5707963267948966)
+              (b == 0.0 && (c >= 0.0))
+              (polar (PrimSqrt ('VecScalar 1 'Float) 1 TT (b * b + (c * c))) (pi / 2.0))
               (primIfThenElse
                 ('Complex Polar)
-                (PrimAnd
-                  (isEQ (primCompareFloat b 0.0))
-                  (PrimLessThan 'Float 1 'Float 'Bool TT TT TT c 0.0))
-                (Complex
-                  Polar
-                  (PrimSqrt
-                    'Float
-                    1
-                    TT
-                    (PrimAdd 'Float TT (PrimMul 'Float TT b b) (PrimMul 'Float TT c c)))
-                  -1.5707963267948966)
+                (b == 0.0 && (c < 0.0))
+                (polar
+                  (PrimSqrt ('VecScalar 1 'Float) 1 TT (b * b + (c * c)))
+                  (0.0 - (pi / 2.0)))
                 (undefined ('Complex Polar))))))))
     Normal
     a
diff --git a/testdata/concatmap01.out b/testdata/concatmap01.out
index 907c0397..32ff3d68 100644
--- a/testdata/concatmap01.out
+++ b/testdata/concatmap01.out
@@ -21,7 +21,7 @@ main
         a))
 ------------ core code
 a :: [Float]
-a = _rhs [1.0]
+a = _rhs (1.0 : [] ++ foldr (++) [] (map (\a -> [a]) []))
 
 main :: Bool
 main = _rhs True
diff --git a/testdata/data.out b/testdata/data.out
index d0e3b82f..579344d4 100644
--- a/testdata/data.out
+++ b/testdata/data.out
@@ -112,30 +112,30 @@ Data53 = <<2nd constructor of 'Data5>>
 
 a5 :: forall a b c . Data5 a b c -> a
 a5
-  = \a _ _ b -> case'Data5
+  = \a b c d -> case'Data5
     (\_ -> a)
-    (\c -> _rhs c)
-    (\d _ _ -> _rhs d)
+    (\e -> _rhs e)
+    (\f _ _ -> _rhs f)
     (\_ _ _ _ _ -> _rhs (undefined a))
-    b
+    d
 
 b5 :: forall a b c . Data5 a b c -> b
 b5
-  = \_ a _ b -> case'Data5
-    (\_ -> a)
-    (\_ -> _rhs (undefined a))
-    (\_ c _ -> _rhs c)
-    (\_ _ _ _ _ -> _rhs (undefined a))
-    b
+  = \a b c d -> case'Data5
+    (\_ -> b)
+    (\_ -> _rhs (undefined b))
+    (\_ e _ -> _rhs e)
+    (\_ _ _ _ _ -> _rhs (undefined b))
+    d
 
 c5 :: forall a b c . Data5 a b c -> c
 c5
-  = \_ _ a b -> case'Data5
-    (\_ -> a)
-    (\_ -> _rhs (undefined a))
-    (\_ _ c -> _rhs c)
-    (\_ _ _ _ _ -> _rhs (undefined a))
-    b
+  = \a b c d -> case'Data5
+    (\_ -> c)
+    (\_ -> _rhs (undefined c))
+    (\_ _ e -> _rhs e)
+    (\_ _ _ _ _ -> _rhs (undefined c))
+    d
 
 case'Data0
   :: forall (a :: Data0 -> Type) -> a 'Data0 -> forall (b :: Data0) -> a b
diff --git a/testdata/editor-examples/Cube.out b/testdata/editor-examples/Cube.out
index b3b01bfd..efc22c57 100644
--- a/testdata/editor-examples/Cube.out
+++ b/testdata/editor-examples/Cube.out
@@ -30,9 +30,6 @@ Pipeline
               uniform float Time;
               in vec4 vi1;
               smooth out vec4 vo1;
-              vec4 r1_Float;
-              vec4 r2_Float;
-              vec4 r3_Float;
               vec4 ext0_Float_3(vec3 z0) {
                   return vec4 ((z0).x,(z0).y,(z0).z,0.0);
               }
@@ -40,7 +37,10 @@ Pipeline
                   return - (z0);
               }
               mat4 translateBefore4(vec3 z0) {
-                  return mat4 (r1_Float,r2_Float,r3_Float,vec4 ((z0).x,(z0).y,(z0).z,1.0));
+                  return mat4 (vec4 (1.0,0.0,0.0,0.0)
+                              ,vec4 (0.0,1.0,0.0,0.0)
+                              ,vec4 (0.0,0.0,1.0,0.0)
+                              ,vec4 ((z0).x,(z0).y,(z0).z,1.0));
               }
               mat4 lookat(vec3 z0,vec3 z1,vec3 z2) {
                   return (transpose (mat4 (ext0_Float_3 (normalize (cross (z2
@@ -81,9 +81,6 @@ Pipeline
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
               void main() {
-                  r1_Float = vec4 (1.0,0.0,0.0,0.0);
-                  r2_Float = vec4 (0.0,1.0,0.0,0.0);
-                  r3_Float = vec4 (0.0,0.0,1.0,0.0);
                   gl_Position = scale (0.5
                                       ,(((perspective (0.1,100.0,0.5235987755982988,1.0)) * (lookat (vec3 (3.0
                                                                                                           ,1.3
diff --git a/testdata/editor-examples/Heartbeat.out b/testdata/editor-examples/Heartbeat.out
index 56f659dc..d69f80a6 100644
--- a/testdata/editor-examples/Heartbeat.out
+++ b/testdata/editor-examples/Heartbeat.out
@@ -105,23 +105,24 @@ Pipeline
               out vec4 f0;
               vec4 blue;
               vec4 navy;
-              float ti;
               vec4 white;
               vec4 yellow;
               void main() {
                   blue = vec4 (0.0,0.0,1.0,1.0);
                   navy = vec4 (0.0,0.0,0.5,1.0);
-                  ti = abs ((sin ((Time) * (4.0))) - (0.37));
                   white = vec4 (1.0,1.0,1.0,1.0);
                   yellow = vec4 (1.0,1.0,0.0,1.0);
                   f0 =
                       ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((5.0e-4) * (sin
                       (((3.0) * (atan (((vo1).x) - (0.85)
-                                      ,((vo1).y) - (0.85)))) + ((15.0) * (Time)))))) < ((5.0e-3) * (ti)) ? navy : ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((2.0e-3) * (sin
+                                      ,((vo1).y) - (0.85)))) + ((15.0) * (Time)))))) < ((5.0e-3) * (abs ((sin
+                      ((Time) * (4.0))) - (0.37)))) ? navy : ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((2.0e-3) * (sin
                       (((5.0) * (atan (((vo1).x) - (0.85)
-                                      ,((vo1).y) - (0.85)))) - ((5.0) * (Time)))))) < ((2.0e-2) * (ti)) ? blue : ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((2.0e-3) * (sin
+                                      ,((vo1).y) - (0.85)))) - ((5.0) * (Time)))))) < ((2.0e-2) * (abs ((sin
+                      ((Time) * (4.0))) - (0.37)))) ? blue : ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((2.0e-3) * (sin
                       (((7.0) * (atan (((vo1).x) - (0.85)
-                                      ,((vo1).y) - (0.85)))) + ((3.0) * (Time)))))) < ((5.0e-2) * (ti)) ? white : yellow;
+                                      ,((vo1).y) - (0.85)))) + ((3.0) * (Time)))))) < ((5.0e-2) * (abs ((sin
+                      ((Time) * (4.0))) - (0.37)))) ? white : yellow;
               }
               """
           }
@@ -144,9 +145,6 @@ Pipeline
               in vec4 vi1;
               in vec2 vi2;
               smooth out vec2 vo1;
-              vec4 r1_Float;
-              vec4 r2_Float;
-              vec4 r3_Float;
               vec4 ext0_Float_3(vec3 z0) {
                   return vec4 ((z0).x,(z0).y,(z0).z,0.0);
               }
@@ -154,7 +152,10 @@ Pipeline
                   return - (z0);
               }
               mat4 translateBefore4(vec3 z0) {
-                  return mat4 (r1_Float,r2_Float,r3_Float,vec4 ((z0).x,(z0).y,(z0).z,1.0));
+                  return mat4 (vec4 (1.0,0.0,0.0,0.0)
+                              ,vec4 (0.0,1.0,0.0,0.0)
+                              ,vec4 (0.0,0.0,1.0,0.0)
+                              ,vec4 ((z0).x,(z0).y,(z0).z,1.0));
               }
               mat4 lookat(vec3 z0,vec3 z1,vec3 z2) {
                   return (transpose (mat4 (ext0_Float_3 (normalize (cross (z2
@@ -191,20 +192,16 @@ Pipeline
                               ,vec4 (sin (z0),0.0,cos (z0),0.0)
                               ,vec4 (0.0,0.0,0.0,1.0));
               }
-              mat4 projmat;
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
               void main() {
-                  r1_Float = vec4 (1.0,0.0,0.0,0.0);
-                  r2_Float = vec4 (0.0,1.0,0.0,0.0);
-                  r3_Float = vec4 (0.0,0.0,1.0,0.0);
-                  projmat = ((perspective (0.1,100.0,0.5235987755982988,1.0)) * (lookat (vec3 (3.0
-                                                                                              ,1.3
-                                                                                              ,0.3)
-                                                                                        ,vec3 (0.0,0.0,0.0)
-                                                                                        ,vec3 (0.0,1.0,0.0)))) * (rotMatrixY ((0.1308996938995747) * (Time)));
-                  gl_Position = scale (0.5,(projmat) * (vi1));
+                  gl_Position = scale (0.5
+                                      ,(((perspective (0.1,100.0,0.5235987755982988,1.0)) * (lookat (vec3 (3.0
+                                                                                                          ,1.3
+                                                                                                          ,0.3)
+                                                                                                    ,vec3 (0.0,0.0,0.0)
+                                                                                                    ,vec3 (0.0,1.0,0.0)))) * (rotMatrixY ((0.1308996938995747) * (Time)))) * (vi1));
                   vo1 = vi2;
               }
               """
diff --git a/testdata/editor-examples/LambdaCube2.out b/testdata/editor-examples/LambdaCube2.out
index 3bc6b019..b3062a00 100644
--- a/testdata/editor-examples/LambdaCube2.out
+++ b/testdata/editor-examples/LambdaCube2.out
@@ -30,9 +30,6 @@ Pipeline
               uniform float Time;
               in vec4 vi1;
               smooth out vec4 vo1;
-              vec4 r1_Float;
-              vec4 r2_Float;
-              vec4 r3_Float;
               vec4 ext0_Float_3(vec3 z0) {
                   return vec4 ((z0).x,(z0).y,(z0).z,0.0);
               }
@@ -40,7 +37,10 @@ Pipeline
                   return - (z0);
               }
               mat4 translateBefore4(vec3 z0) {
-                  return mat4 (r1_Float,r2_Float,r3_Float,vec4 ((z0).x,(z0).y,(z0).z,1.0));
+                  return mat4 (vec4 (1.0,0.0,0.0,0.0)
+                              ,vec4 (0.0,1.0,0.0,0.0)
+                              ,vec4 (0.0,0.0,1.0,0.0)
+                              ,vec4 ((z0).x,(z0).y,(z0).z,1.0));
               }
               mat4 lookat(vec3 z0,vec3 z1,vec3 z2) {
                   return (transpose (mat4 (ext0_Float_3 (normalize (cross (z2
@@ -81,9 +81,6 @@ Pipeline
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
               void main() {
-                  r1_Float = vec4 (1.0,0.0,0.0,0.0);
-                  r2_Float = vec4 (0.0,1.0,0.0,0.0);
-                  r3_Float = vec4 (0.0,0.0,1.0,0.0);
                   gl_Position = scale (0.5
                                       ,(((perspective (0.1,100.0,0.5235987755982988,1.0)) * (lookat (vec3 (3.0
                                                                                                           ,1.3
diff --git a/testdata/editor-examples/MagicCube.out b/testdata/editor-examples/MagicCube.out
index 94e32a84..ca7234f5 100644
--- a/testdata/editor-examples/MagicCube.out
+++ b/testdata/editor-examples/MagicCube.out
@@ -30,9 +30,6 @@ Pipeline
               uniform float Time;
               in vec4 vi1;
               smooth out vec4 vo1;
-              vec4 r1_Float;
-              vec4 r2_Float;
-              vec4 r3_Float;
               vec4 ext0_Float_3(vec3 z0) {
                   return vec4 ((z0).x,(z0).y,(z0).z,0.0);
               }
@@ -40,7 +37,10 @@ Pipeline
                   return - (z0);
               }
               mat4 translateBefore4(vec3 z0) {
-                  return mat4 (r1_Float,r2_Float,r3_Float,vec4 ((z0).x,(z0).y,(z0).z,1.0));
+                  return mat4 (vec4 (1.0,0.0,0.0,0.0)
+                              ,vec4 (0.0,1.0,0.0,0.0)
+                              ,vec4 (0.0,0.0,1.0,0.0)
+                              ,vec4 ((z0).x,(z0).y,(z0).z,1.0));
               }
               mat4 lookat(vec3 z0,vec3 z1,vec3 z2) {
                   return (transpose (mat4 (ext0_Float_3 (normalize (cross (z2
@@ -81,9 +81,6 @@ Pipeline
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
               void main() {
-                  r1_Float = vec4 (1.0,0.0,0.0,0.0);
-                  r2_Float = vec4 (0.0,1.0,0.0,0.0);
-                  r3_Float = vec4 (0.0,0.0,1.0,0.0);
                   gl_Position = scale (0.5
                                       ,(((perspective (0.1,100.0,0.5235987755982988,1.0)) * (lookat (vec3 (3.0
                                                                                                           ,1.3
diff --git a/testdata/editor-examples/RecLC.out b/testdata/editor-examples/RecLC.out
index 7c4393e1..d348f5de 100644
--- a/testdata/editor-examples/RecLC.out
+++ b/testdata/editor-examples/RecLC.out
@@ -135,9 +135,6 @@ Pipeline
               uniform float Time;
               in vec4 vi1;
               smooth out vec4 vo1;
-              vec4 r1_Float;
-              vec4 r2_Float;
-              vec4 r3_Float;
               vec4 ext0_Float_3(vec3 z0) {
                   return vec4 ((z0).x,(z0).y,(z0).z,0.0);
               }
@@ -145,7 +142,10 @@ Pipeline
                   return - (z0);
               }
               mat4 translateBefore4(vec3 z0) {
-                  return mat4 (r1_Float,r2_Float,r3_Float,vec4 ((z0).x,(z0).y,(z0).z,1.0));
+                  return mat4 (vec4 (1.0,0.0,0.0,0.0)
+                              ,vec4 (0.0,1.0,0.0,0.0)
+                              ,vec4 (0.0,0.0,1.0,0.0)
+                              ,vec4 ((z0).x,(z0).y,(z0).z,1.0));
               }
               mat4 lookat(vec3 z0,vec3 z1,vec3 z2) {
                   return (transpose (mat4 (ext0_Float_3 (normalize (cross (z2
@@ -186,9 +186,6 @@ Pipeline
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
               void main() {
-                  r1_Float = vec4 (1.0,0.0,0.0,0.0);
-                  r2_Float = vec4 (0.0,1.0,0.0,0.0);
-                  r3_Float = vec4 (0.0,0.0,1.0,0.0);
                   gl_Position = scale (0.5
                                       ,(((perspective (0.1,100.0,0.5235987755982988,1.0)) * (lookat (vec3 (3.0
                                                                                                           ,1.3
@@ -241,9 +238,6 @@ Pipeline
               in vec4 vi1;
               in vec2 vi2;
               smooth out vec2 vo1;
-              vec4 r1_Float;
-              vec4 r2_Float;
-              vec4 r3_Float;
               vec4 ext0_Float_3(vec3 z0) {
                   return vec4 ((z0).x,(z0).y,(z0).z,0.0);
               }
@@ -251,7 +245,10 @@ Pipeline
                   return - (z0);
               }
               mat4 translateBefore4(vec3 z0) {
-                  return mat4 (r1_Float,r2_Float,r3_Float,vec4 ((z0).x,(z0).y,(z0).z,1.0));
+                  return mat4 (vec4 (1.0,0.0,0.0,0.0)
+                              ,vec4 (0.0,1.0,0.0,0.0)
+                              ,vec4 (0.0,0.0,1.0,0.0)
+                              ,vec4 ((z0).x,(z0).y,(z0).z,1.0));
               }
               mat4 lookat(vec3 z0,vec3 z1,vec3 z2) {
                   return (transpose (mat4 (ext0_Float_3 (normalize (cross (z2
@@ -299,9 +296,6 @@ Pipeline
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
               void main() {
-                  r1_Float = vec4 (1.0,0.0,0.0,0.0);
-                  r2_Float = vec4 (0.0,1.0,0.0,0.0);
-                  r3_Float = vec4 (0.0,0.0,1.0,0.0);
                   rotMatrix = ((perspective (0.1,100.0,0.5235987755982988,1.0)) * (lookat (vec3
                                                                                           (3.0,1.3,0.3)
                                                                                           ,vec3 (0.0,0.0,0.0)
@@ -347,9 +341,6 @@ Pipeline
               in vec4 vi1;
               in vec2 vi2;
               smooth out vec2 vo1;
-              vec4 r1_Float;
-              vec4 r2_Float;
-              vec4 r3_Float;
               vec4 ext0_Float_3(vec3 z0) {
                   return vec4 ((z0).x,(z0).y,(z0).z,0.0);
               }
@@ -357,7 +348,10 @@ Pipeline
                   return - (z0);
               }
               mat4 translateBefore4(vec3 z0) {
-                  return mat4 (r1_Float,r2_Float,r3_Float,vec4 ((z0).x,(z0).y,(z0).z,1.0));
+                  return mat4 (vec4 (1.0,0.0,0.0,0.0)
+                              ,vec4 (0.0,1.0,0.0,0.0)
+                              ,vec4 (0.0,0.0,1.0,0.0)
+                              ,vec4 ((z0).x,(z0).y,(z0).z,1.0));
               }
               mat4 lookat(vec3 z0,vec3 z1,vec3 z2) {
                   return (transpose (mat4 (ext0_Float_3 (normalize (cross (z2
@@ -405,9 +399,6 @@ Pipeline
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
               void main() {
-                  r1_Float = vec4 (1.0,0.0,0.0,0.0);
-                  r2_Float = vec4 (0.0,1.0,0.0,0.0);
-                  r3_Float = vec4 (0.0,0.0,1.0,0.0);
                   rotMatrix = ((perspective (0.1,100.0,0.5235987755982988,1.0)) * (lookat (vec3
                                                                                           (3.0,1.3,0.3)
                                                                                           ,vec3 (0.0,0.0,0.0)
diff --git a/testdata/editor-examples/RecursiveTexture.out b/testdata/editor-examples/RecursiveTexture.out
index d008848d..3e497a3a 100644
--- a/testdata/editor-examples/RecursiveTexture.out
+++ b/testdata/editor-examples/RecursiveTexture.out
@@ -294,9 +294,6 @@ Pipeline
               in vec4 vi1;
               in vec2 vi2;
               smooth out vec2 vo1;
-              vec4 r1_Float;
-              vec4 r2_Float;
-              vec4 r3_Float;
               vec4 ext0_Float_3(vec3 z0) {
                   return vec4 ((z0).x,(z0).y,(z0).z,0.0);
               }
@@ -304,7 +301,10 @@ Pipeline
                   return - (z0);
               }
               mat4 translateBefore4(vec3 z0) {
-                  return mat4 (r1_Float,r2_Float,r3_Float,vec4 ((z0).x,(z0).y,(z0).z,1.0));
+                  return mat4 (vec4 (1.0,0.0,0.0,0.0)
+                              ,vec4 (0.0,1.0,0.0,0.0)
+                              ,vec4 (0.0,0.0,1.0,0.0)
+                              ,vec4 ((z0).x,(z0).y,(z0).z,1.0));
               }
               mat4 lookat(vec3 z0,vec3 z1,vec3 z2) {
                   return (transpose (mat4 (ext0_Float_3 (normalize (cross (z2
@@ -352,9 +352,6 @@ Pipeline
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
               void main() {
-                  r1_Float = vec4 (1.0,0.0,0.0,0.0);
-                  r2_Float = vec4 (0.0,1.0,0.0,0.0);
-                  r3_Float = vec4 (0.0,0.0,1.0,0.0);
                   rotMatrix = ((perspective (0.1,100.0,0.5235987755982988,1.0)) * (lookat (vec3
                                                                                           (3.0,1.3,0.3)
                                                                                           ,vec3 (0.0,0.0,0.0)
@@ -400,9 +397,6 @@ Pipeline
               in vec4 vi1;
               in vec2 vi2;
               smooth out vec2 vo1;
-              vec4 r1_Float;
-              vec4 r2_Float;
-              vec4 r3_Float;
               vec4 ext0_Float_3(vec3 z0) {
                   return vec4 ((z0).x,(z0).y,(z0).z,0.0);
               }
@@ -410,7 +404,10 @@ Pipeline
                   return - (z0);
               }
               mat4 translateBefore4(vec3 z0) {
-                  return mat4 (r1_Float,r2_Float,r3_Float,vec4 ((z0).x,(z0).y,(z0).z,1.0));
+                  return mat4 (vec4 (1.0,0.0,0.0,0.0)
+                              ,vec4 (0.0,1.0,0.0,0.0)
+                              ,vec4 (0.0,0.0,1.0,0.0)
+                              ,vec4 ((z0).x,(z0).y,(z0).z,1.0));
               }
               mat4 lookat(vec3 z0,vec3 z1,vec3 z2) {
                   return (transpose (mat4 (ext0_Float_3 (normalize (cross (z2
@@ -458,9 +455,6 @@ Pipeline
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
               void main() {
-                  r1_Float = vec4 (1.0,0.0,0.0,0.0);
-                  r2_Float = vec4 (0.0,1.0,0.0,0.0);
-                  r3_Float = vec4 (0.0,0.0,1.0,0.0);
                   rotMatrix = ((perspective (0.1,100.0,0.5235987755982988,1.0)) * (lookat (vec3
                                                                                           (3.0,1.3,0.3)
                                                                                           ,vec3 (0.0,0.0,0.0)
@@ -506,9 +500,6 @@ Pipeline
               in vec4 vi1;
               in vec2 vi2;
               smooth out vec2 vo1;
-              vec4 r1_Float;
-              vec4 r2_Float;
-              vec4 r3_Float;
               vec4 ext0_Float_3(vec3 z0) {
                   return vec4 ((z0).x,(z0).y,(z0).z,0.0);
               }
@@ -516,7 +507,10 @@ Pipeline
                   return - (z0);
               }
               mat4 translateBefore4(vec3 z0) {
-                  return mat4 (r1_Float,r2_Float,r3_Float,vec4 ((z0).x,(z0).y,(z0).z,1.0));
+                  return mat4 (vec4 (1.0,0.0,0.0,0.0)
+                              ,vec4 (0.0,1.0,0.0,0.0)
+                              ,vec4 (0.0,0.0,1.0,0.0)
+                              ,vec4 ((z0).x,(z0).y,(z0).z,1.0));
               }
               mat4 lookat(vec3 z0,vec3 z1,vec3 z2) {
                   return (transpose (mat4 (ext0_Float_3 (normalize (cross (z2
@@ -564,9 +558,6 @@ Pipeline
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
               void main() {
-                  r1_Float = vec4 (1.0,0.0,0.0,0.0);
-                  r2_Float = vec4 (0.0,1.0,0.0,0.0);
-                  r3_Float = vec4 (0.0,0.0,1.0,0.0);
                   rotMatrix = ((perspective (0.1,100.0,0.5235987755982988,1.0)) * (lookat (vec3
                                                                                           (3.0,1.3,0.3)
                                                                                           ,vec3 (0.0,0.0,0.0)
@@ -612,9 +603,6 @@ Pipeline
               in vec4 vi1;
               in vec2 vi2;
               smooth out vec2 vo1;
-              vec4 r1_Float;
-              vec4 r2_Float;
-              vec4 r3_Float;
               vec4 ext0_Float_3(vec3 z0) {
                   return vec4 ((z0).x,(z0).y,(z0).z,0.0);
               }
@@ -622,7 +610,10 @@ Pipeline
                   return - (z0);
               }
               mat4 translateBefore4(vec3 z0) {
-                  return mat4 (r1_Float,r2_Float,r3_Float,vec4 ((z0).x,(z0).y,(z0).z,1.0));
+                  return mat4 (vec4 (1.0,0.0,0.0,0.0)
+                              ,vec4 (0.0,1.0,0.0,0.0)
+                              ,vec4 (0.0,0.0,1.0,0.0)
+                              ,vec4 ((z0).x,(z0).y,(z0).z,1.0));
               }
               mat4 lookat(vec3 z0,vec3 z1,vec3 z2) {
                   return (transpose (mat4 (ext0_Float_3 (normalize (cross (z2
@@ -670,9 +661,6 @@ Pipeline
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
               void main() {
-                  r1_Float = vec4 (1.0,0.0,0.0,0.0);
-                  r2_Float = vec4 (0.0,1.0,0.0,0.0);
-                  r3_Float = vec4 (0.0,0.0,1.0,0.0);
                   rotMatrix = ((perspective (0.1,100.0,0.5235987755982988,1.0)) * (lookat (vec3
                                                                                           (3.0,1.3,0.3)
                                                                                           ,vec3 (0.0,0.0,0.0)
@@ -718,9 +706,6 @@ Pipeline
               in vec4 vi1;
               in vec2 vi2;
               smooth out vec2 vo1;
-              vec4 r1_Float;
-              vec4 r2_Float;
-              vec4 r3_Float;
               vec4 ext0_Float_3(vec3 z0) {
                   return vec4 ((z0).x,(z0).y,(z0).z,0.0);
               }
@@ -728,7 +713,10 @@ Pipeline
                   return - (z0);
               }
               mat4 translateBefore4(vec3 z0) {
-                  return mat4 (r1_Float,r2_Float,r3_Float,vec4 ((z0).x,(z0).y,(z0).z,1.0));
+                  return mat4 (vec4 (1.0,0.0,0.0,0.0)
+                              ,vec4 (0.0,1.0,0.0,0.0)
+                              ,vec4 (0.0,0.0,1.0,0.0)
+                              ,vec4 ((z0).x,(z0).y,(z0).z,1.0));
               }
               mat4 lookat(vec3 z0,vec3 z1,vec3 z2) {
                   return (transpose (mat4 (ext0_Float_3 (normalize (cross (z2
@@ -776,9 +764,6 @@ Pipeline
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
               void main() {
-                  r1_Float = vec4 (1.0,0.0,0.0,0.0);
-                  r2_Float = vec4 (0.0,1.0,0.0,0.0);
-                  r3_Float = vec4 (0.0,0.0,1.0,0.0);
                   rotMatrix = ((perspective (0.1,100.0,0.5235987755982988,1.0)) * (lookat (vec3
                                                                                           (3.0,1.3,0.3)
                                                                                           ,vec3 (0.0,0.0,0.0)
diff --git a/testdata/editor-examples/Tetrahedron.out b/testdata/editor-examples/Tetrahedron.out
index ddce3ba3..eef77b90 100644
--- a/testdata/editor-examples/Tetrahedron.out
+++ b/testdata/editor-examples/Tetrahedron.out
@@ -30,9 +30,6 @@ Pipeline
               uniform float Time;
               in vec4 vi1;
               smooth out vec4 vo1;
-              vec4 r1_Float;
-              vec4 r2_Float;
-              vec4 r3_Float;
               vec4 ext0_Float_3(vec3 z0) {
                   return vec4 ((z0).x,(z0).y,(z0).z,0.0);
               }
@@ -40,7 +37,10 @@ Pipeline
                   return - (z0);
               }
               mat4 translateBefore4(vec3 z0) {
-                  return mat4 (r1_Float,r2_Float,r3_Float,vec4 ((z0).x,(z0).y,(z0).z,1.0));
+                  return mat4 (vec4 (1.0,0.0,0.0,0.0)
+                              ,vec4 (0.0,1.0,0.0,0.0)
+                              ,vec4 (0.0,0.0,1.0,0.0)
+                              ,vec4 ((z0).x,(z0).y,(z0).z,1.0));
               }
               mat4 lookat(vec3 z0,vec3 z1,vec3 z2) {
                   return (transpose (mat4 (ext0_Float_3 (normalize (cross (z2
@@ -81,9 +81,6 @@ Pipeline
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
               void main() {
-                  r1_Float = vec4 (1.0,0.0,0.0,0.0);
-                  r2_Float = vec4 (0.0,1.0,0.0,0.0);
-                  r3_Float = vec4 (0.0,0.0,1.0,0.0);
                   gl_Position = scale (0.5
                                       ,(((perspective (0.1,100.0,0.5235987755982988,1.0)) * (lookat (vec3 (3.0
                                                                                                           ,1.3
diff --git a/testdata/editor-examples/Texturing.out b/testdata/editor-examples/Texturing.out
index 2c488805..b969eea0 100644
--- a/testdata/editor-examples/Texturing.out
+++ b/testdata/editor-examples/Texturing.out
@@ -34,9 +34,6 @@ Pipeline
               in vec4 vi1;
               in vec2 vi2;
               smooth out vec2 vo1;
-              vec4 r1_Float;
-              vec4 r2_Float;
-              vec4 r3_Float;
               vec4 ext0_Float_3(vec3 z0) {
                   return vec4 ((z0).x,(z0).y,(z0).z,0.0);
               }
@@ -44,7 +41,10 @@ Pipeline
                   return - (z0);
               }
               mat4 translateBefore4(vec3 z0) {
-                  return mat4 (r1_Float,r2_Float,r3_Float,vec4 ((z0).x,(z0).y,(z0).z,1.0));
+                  return mat4 (vec4 (1.0,0.0,0.0,0.0)
+                              ,vec4 (0.0,1.0,0.0,0.0)
+                              ,vec4 (0.0,0.0,1.0,0.0)
+                              ,vec4 ((z0).x,(z0).y,(z0).z,1.0));
               }
               mat4 lookat(vec3 z0,vec3 z1,vec3 z2) {
                   return (transpose (mat4 (ext0_Float_3 (normalize (cross (z2
@@ -85,9 +85,6 @@ Pipeline
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
               void main() {
-                  r1_Float = vec4 (1.0,0.0,0.0,0.0);
-                  r2_Float = vec4 (0.0,1.0,0.0,0.0);
-                  r3_Float = vec4 (0.0,0.0,1.0,0.0);
                   gl_Position = scale (0.5
                                       ,(((perspective (0.1,100.0,0.5235987755982988,1.0)) * (lookat (vec3 (3.0
                                                                                                           ,1.3
diff --git a/testdata/example08.out b/testdata/example08.out
index bbcf34d3..6afebe18 100644
--- a/testdata/example08.out
+++ b/testdata/example08.out
@@ -47,16 +47,16 @@ Pipeline
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
-              vec4 trMat_4_4_Float(mat4 z0,vec4 z1) {
+              vec4 trMat_Float_4_4(mat4 z0,vec4 z1) {
                   return (z0) * (z1);
               }
               vec4 trX(float z0,vec4 z1) {
                   return (vec4 (z0,0.0,0.0,0.0)) + (z1);
               }
               void main() {
-                  gl_Position = trMat_4_4_Float (rotMatrixZ ((Time) * (2.0))
+                  gl_Position = trMat_Float_4_4 (rotMatrixZ ((Time) * (2.0))
                                                 ,(MVP) * (trX ((1.0) + ((sin (Time)) * (0.1))
-                                                              ,scale (4.0e-2,trMat_4_4_Float (rotMatrixX (((Time) * (2.0)) * (2.0)),vi1)))));
+                                                              ,scale (4.0e-2,trMat_Float_4_4 (rotMatrixX (((Time) * (2.0)) * (2.0)),vi1)))));
                   vo1 = vi1;
               }
               """
@@ -107,16 +107,16 @@ Pipeline
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
-              vec4 trMat_4_4_Float(mat4 z0,vec4 z1) {
+              vec4 trMat_Float_4_4(mat4 z0,vec4 z1) {
                   return (z0) * (z1);
               }
               vec4 trX(float z0,vec4 z1) {
                   return (vec4 (z0,0.0,0.0,0.0)) + (z1);
               }
               void main() {
-                  gl_Position = trMat_4_4_Float (rotMatrixZ ((Time) * (1.0))
+                  gl_Position = trMat_Float_4_4 (rotMatrixZ ((Time) * (1.0))
                                                 ,(MVP) * (trX ((0.5) + ((sin (Time)) * (0.1))
-                                                              ,scale (4.0e-2,trMat_4_4_Float (rotMatrixX (((Time) * (2.0)) * (1.0)),vi1)))));
+                                                              ,scale (4.0e-2,trMat_Float_4_4 (rotMatrixX (((Time) * (2.0)) * (1.0)),vi1)))));
                   vo1 = vi1;
               }
               """
@@ -167,16 +167,16 @@ Pipeline
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
-              vec4 trMat_4_4_Float(mat4 z0,vec4 z1) {
+              vec4 trMat_Float_4_4(mat4 z0,vec4 z1) {
                   return (z0) * (z1);
               }
               vec4 trX(float z0,vec4 z1) {
                   return (vec4 (z0,0.0,0.0,0.0)) + (z1);
               }
               void main() {
-                  gl_Position = trMat_4_4_Float (rotMatrixZ ((Time) * (0.0))
+                  gl_Position = trMat_Float_4_4 (rotMatrixZ ((Time) * (0.0))
                                                 ,(MVP) * (trX ((0.0) + ((sin (Time)) * (0.1))
-                                                              ,scale (4.0e-2,trMat_4_4_Float (rotMatrixX (((Time) * (2.0)) * (0.0)),vi1)))));
+                                                              ,scale (4.0e-2,trMat_Float_4_4 (rotMatrixX (((Time) * (2.0)) * (0.0)),vi1)))));
                   vo1 = vi1;
               }
               """
@@ -227,16 +227,16 @@ Pipeline
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
-              vec4 trMat_4_4_Float(mat4 z0,vec4 z1) {
+              vec4 trMat_Float_4_4(mat4 z0,vec4 z1) {
                   return (z0) * (z1);
               }
               vec4 trX(float z0,vec4 z1) {
                   return (vec4 (z0,0.0,0.0,0.0)) + (z1);
               }
               void main() {
-                  gl_Position = trMat_4_4_Float (rotMatrixZ ((Time) * (-1.0))
+                  gl_Position = trMat_Float_4_4 (rotMatrixZ ((Time) * (-1.0))
                                                 ,(MVP) * (trX ((-0.5) + ((sin (Time)) * (0.1))
-                                                              ,scale (4.0e-2,trMat_4_4_Float (rotMatrixX (((Time) * (2.0)) * (-1.0)),vi1)))));
+                                                              ,scale (4.0e-2,trMat_Float_4_4 (rotMatrixX (((Time) * (2.0)) * (-1.0)),vi1)))));
                   vo1 = vi1;
               }
               """
@@ -287,16 +287,16 @@ Pipeline
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
-              vec4 trMat_4_4_Float(mat4 z0,vec4 z1) {
+              vec4 trMat_Float_4_4(mat4 z0,vec4 z1) {
                   return (z0) * (z1);
               }
               vec4 trX(float z0,vec4 z1) {
                   return (vec4 (z0,0.0,0.0,0.0)) + (z1);
               }
               void main() {
-                  gl_Position = trMat_4_4_Float (rotMatrixZ ((Time) * (0.75))
+                  gl_Position = trMat_Float_4_4 (rotMatrixZ ((Time) * (0.75))
                                                 ,(MVP) * (trX ((0.375) + ((sin (Time)) * (0.1))
-                                                              ,scale (4.0e-2,trMat_4_4_Float (rotMatrixX (((Time) * (2.0)) * (0.75)),vi1)))));
+                                                              ,scale (4.0e-2,trMat_Float_4_4 (rotMatrixX (((Time) * (2.0)) * (0.75)),vi1)))));
                   vo1 = vi1;
               }
               """
@@ -347,16 +347,16 @@ Pipeline
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
-              vec4 trMat_4_4_Float(mat4 z0,vec4 z1) {
+              vec4 trMat_Float_4_4(mat4 z0,vec4 z1) {
                   return (z0) * (z1);
               }
               vec4 trX(float z0,vec4 z1) {
                   return (vec4 (z0,0.0,0.0,0.0)) + (z1);
               }
               void main() {
-                  gl_Position = trMat_4_4_Float (rotMatrixZ ((Time) * (0.3))
+                  gl_Position = trMat_Float_4_4 (rotMatrixZ ((Time) * (0.3))
                                                 ,(MVP) * (trX ((0.15) + ((sin (Time)) * (0.1))
-                                                              ,scale (4.0e-2,trMat_4_4_Float (rotMatrixX (((Time) * (2.0)) * (0.3)),vi1)))));
+                                                              ,scale (4.0e-2,trMat_Float_4_4 (rotMatrixX (((Time) * (2.0)) * (0.3)),vi1)))));
                   vo1 = vi1;
               }
               """
@@ -407,16 +407,16 @@ Pipeline
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
-              vec4 trMat_4_4_Float(mat4 z0,vec4 z1) {
+              vec4 trMat_Float_4_4(mat4 z0,vec4 z1) {
                   return (z0) * (z1);
               }
               vec4 trX(float z0,vec4 z1) {
                   return (vec4 (z0,0.0,0.0,0.0)) + (z1);
               }
               void main() {
-                  gl_Position = trMat_4_4_Float (rotMatrixZ ((Time) * (0.5))
+                  gl_Position = trMat_Float_4_4 (rotMatrixZ ((Time) * (0.5))
                                                 ,(MVP) * (trX ((0.25) + ((sin (Time)) * (0.1))
-                                                              ,scale (4.0e-2,trMat_4_4_Float (rotMatrixX (((Time) * (2.0)) * (0.5)),vi1)))));
+                                                              ,scale (4.0e-2,trMat_Float_4_4 (rotMatrixX (((Time) * (2.0)) * (0.5)),vi1)))));
                   vo1 = vi1;
               }
               """
@@ -467,16 +467,16 @@ Pipeline
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
-              vec4 trMat_4_4_Float(mat4 z0,vec4 z1) {
+              vec4 trMat_Float_4_4(mat4 z0,vec4 z1) {
                   return (z0) * (z1);
               }
               vec4 trX(float z0,vec4 z1) {
                   return (vec4 (z0,0.0,0.0,0.0)) + (z1);
               }
               void main() {
-                  gl_Position = trMat_4_4_Float (rotMatrixZ ((Time) * (-0.5))
+                  gl_Position = trMat_Float_4_4 (rotMatrixZ ((Time) * (-0.5))
                                                 ,(MVP) * (trX ((-0.25) + ((sin (Time)) * (0.1))
-                                                              ,scale (4.0e-2,trMat_4_4_Float (rotMatrixX (((Time) * (2.0)) * (-0.5)),vi1)))));
+                                                              ,scale (4.0e-2,trMat_Float_4_4 (rotMatrixX (((Time) * (2.0)) * (-0.5)),vi1)))));
                   vo1 = vi1;
               }
               """
diff --git a/testdata/fetcharrays01.out b/testdata/fetcharrays01.out
index d4c100a2..6e16d4de 100644
--- a/testdata/fetcharrays01.out
+++ b/testdata/fetcharrays01.out
@@ -36,9 +36,12 @@ Pipeline
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
+              vec4 v3FToV4F(vec3 z0) {
+                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
+              }
               void main() {
-                  gl_Position = scale (0.5,(MVP) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0)));
-                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
+                  gl_Position = scale (0.5,(MVP) * (v3FToV4F (vi1)));
+                  vo1 = v3FToV4F (vi1);
               }
               """
           , geometryShader = Nothing
diff --git a/testdata/framebuffer02.reject.out b/testdata/framebuffer02.reject.out
index 596300b8..6e02124d 100644
--- a/testdata/framebuffer02.reject.out
+++ b/testdata/framebuffer02.reject.out
@@ -21,14 +21,11 @@ in testdata/framebuffer02.reject.lc:2:17:
 testdata/framebuffer02.reject.lc 2:17-2:28
     forall (a :: [Type])
       . sameLayerCounts a
-        => HList a
-          -> FrameBuffer (ImageLC (head Type a)) (map Type ImageKind GetImageKind a)
+        => HList a -> FrameBuffer (ImageLC (head a)) (map GetImageKind a)
 testdata/framebuffer02.reject.lc 2:17-5:30
     FrameBuffer
       1
       (map
-        Type
-        ImageKind
         GetImageKind
         ' [Image 1 ('Color (VecScalar 4 Float))
         , Image 2 ('Color (VecScalar 4 Float))
diff --git a/testdata/gfx03.out b/testdata/gfx03.out
index 0a5740b2..21f8838b 100644
--- a/testdata/gfx03.out
+++ b/testdata/gfx03.out
@@ -28,8 +28,11 @@ Pipeline
               }
               uniform mat4 MVP2;
               in vec3 vi1;
+              vec4 v3FToV4F(vec3 z0) {
+                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
+              }
               void main() {
-                  gl_Position = (MVP2) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0));
+                  gl_Position = (MVP2) * (v3FToV4F (vi1));
               }
               """
           , geometryShader = Nothing
@@ -60,9 +63,12 @@ Pipeline
               uniform mat4 MVP2;
               in vec3 vi1;
               smooth out vec4 vo1;
+              vec4 v3FToV4F(vec3 z0) {
+                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
+              }
               void main() {
-                  gl_Position = (MVP2) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0));
-                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
+                  gl_Position = (MVP2) * (v3FToV4F (vi1));
+                  vo1 = v3FToV4F (vi1);
               }
               """
           , geometryShader = Nothing
diff --git a/testdata/id.out b/testdata/id.out
index e9d1758f..c964ee71 100644
--- a/testdata/id.out
+++ b/testdata/id.out
@@ -1,7 +1,6 @@
 main is not found
 ------------ desugared source code
-main'
-  = _lhs main' (_rhs let a = _lhs id' (_rhs \(b :: _) -> b) in (a 4.0, a True))
+main' = _lhs main' (_rhs let a = \(b :: _) -> b in (a 4.0, a True))
 ------------ core code
 main' :: (Float, Bool)
 main' = _rhs (4.0, True)
diff --git a/testdata/instantiate.out b/testdata/instantiate.out
index 95bc2af4..3f58a244 100644
--- a/testdata/instantiate.out
+++ b/testdata/instantiate.out
@@ -1,7 +1,6 @@
 main is not found
 ------------ desugared source code
-main'
-  = _lhs main' (_rhs let a = _lhs f (_rhs PrimAdd) in a (V2 1.0 2.0) (V2 1.0 2.0))
+main' = _lhs main' (_rhs let a = PrimAdd in a (V2 1.0 2.0) (V2 1.0 2.0))
 ------------ core code
 main' :: VecS Float 2
 main' = _rhs (PrimAdd ('VecS 'Float 2) TT (V2 1.0 2.0) (V2 1.0 2.0))
diff --git a/testdata/instantiate2.out b/testdata/instantiate2.out
index bd3f4135..4c7edf03 100644
--- a/testdata/instantiate2.out
+++ b/testdata/instantiate2.out
@@ -1,13 +1,10 @@
 main :: (VecS Float 2, Float)
 main = (PrimAdd ('VecS 'Float 2) TT (V2 1.0 2.0) (V2 2.3 3.4), 3.0)
 ------------ desugared source code
-main
-  = _lhs
-    main
-    (_rhs let a = _lhs f (_rhs (+)) in (a (V2 1.0 2.0) (V2 2.3 3.4), a 1.0 2.0))
+main = _lhs main (_rhs let a = (+) in (a (V2 1.0 2.0) (V2 2.3 3.4), a 1.0 2.0))
 ------------ core code
 main :: (VecS Float 2, Float)
-main = _rhs (PrimAdd ('VecS 'Float 2) TT (V2 1.0 2.0) (V2 2.3 3.4), 3.0)
+main = _rhs (V2 1.0 2.0 + V2 2.3 3.4, 1.0 + 2.0)
 ------------ tooltips
 testdata/instantiate2.lc 1:1-1:5
     (VecS Float 2, Float)
diff --git a/testdata/it.out b/testdata/it.out
index 0c3dce37..d0ab8e96 100644
--- a/testdata/it.out
+++ b/testdata/it.out
@@ -1,7 +1,9 @@
 main :: Bool
 main = True
 ------------ desugared source code
-from = _lhs from (_rhs \(a :: _) -> a : from (primAddInt (fromInt 1) a))
+from
+  = primFix
+    \(a :: _) -> _lhs from (_rhs \(b :: _) -> b : a (primAddInt (fromInt 1) b))
 
 main
   = _lhs
@@ -33,7 +35,7 @@ main
         (from (fromInt 0))))
 ------------ core code
 from :: Int -> [Int]
-from = primFix ('Int -> ['Int]) \a -> _rhs \b -> b : a (primAddInt 1 b)
+from = primFix _ \a -> _rhs \b -> b : a (primAddInt 1 b)
 
 main :: Bool
 main = _rhs True
diff --git a/testdata/language-features/adt/adt02.out b/testdata/language-features/adt/adt02.out
index 84ef7d80..992c314e 100644
--- a/testdata/language-features/adt/adt02.out
+++ b/testdata/language-features/adt/adt02.out
@@ -126,19 +126,19 @@ one2 :: Data2 -> Bool
 one2 = \a -> case'Data2 (\_ -> 'Bool) (\b _ _ -> _rhs b) a
 
 one3 :: forall a b c . Data3 a b c -> a
-one3 = \a _ _ b -> case'Data3 (\_ -> a) (\c _ _ -> _rhs c) b
+one3 = \a b c d -> case'Data3 (\_ -> a) (\e _ _ -> _rhs e) d
 
 thr2 :: Data2 -> Bool
 thr2 = \a -> case'Data2 (\_ -> 'Bool) (\_ _ b -> _rhs b) a
 
 thr3 :: forall a b c . Data3 a b c -> c
-thr3 = \_ _ a b -> case'Data3 (\_ -> a) (\_ _ c -> _rhs c) b
+thr3 = \a b c d -> case'Data3 (\_ -> c) (\_ _ e -> _rhs e) d
 
 two2 :: Data2 -> String
 two2 = \a -> case'Data2 (\_ -> 'String) (\_ b _ -> _rhs b) a
 
 two3 :: forall a b c . Data3 a b c -> b
-two3 = \_ a _ b -> case'Data3 (\_ -> a) (\_ c _ -> _rhs c) b
+two3 = \a b c d -> case'Data3 (\_ -> b) (\_ e _ -> _rhs e) d
 
 value1 :: Data1
 value1 = _rhs (Data1 True)
diff --git a/testdata/language-features/adt/adt05.out b/testdata/language-features/adt/adt05.out
index c44d22b9..aed76869 100644
--- a/testdata/language-features/adt/adt05.out
+++ b/testdata/language-features/adt/adt05.out
@@ -1,5 +1,5 @@
 main :: @Type -> forall a . Num a => Bool
-main = main
+main = \_ _ _ -> True
 ------------ desugared source code
 data TList (_ :: Type) :: Type where
     TEmpty :: forall a . TList a
@@ -47,10 +47,10 @@ case'TList
 case'TList = \_ a b c d -> <<case function of a type with 1 parameters>>
 
 isCons :: forall a . TList a -> Bool
-isCons = \_ a -> case'TList (\_ -> 'Bool) (_rhs False) (\_ _ -> _rhs True) a
+isCons = \a b -> case'TList (\_ -> 'Bool) (_rhs False) (\_ _ -> _rhs True) b
 
 isEmpty :: forall a . TList a -> Bool
-isEmpty = \_ a -> case'TList (\_ -> 'Bool) (_rhs True) (\_ _ -> _rhs False) a
+isEmpty = \a b -> case'TList (\_ -> 'Bool) (_rhs True) (\_ _ -> _rhs False) b
 
 main :: @Type -> forall a . Num a => Bool
 main = \_ _ _ -> _rhs True
diff --git a/testdata/language-features/as-pattern/as-pattern01.out b/testdata/language-features/as-pattern/as-pattern01.out
index 5b9c82cd..3e2c4116 100644
--- a/testdata/language-features/as-pattern/as-pattern01.out
+++ b/testdata/language-features/as-pattern/as-pattern01.out
@@ -1,5 +1,6 @@
 main :: forall a . (Eq a, Num (MatVecScalarElem a), Eq a, Num a) => Bool
-main = main
+main
+  = \b c d e f -> (b == c) (g (fromInt b f 3) (fromInt b f 1)) (fromInt b f 5)
 ------------ desugared source code
 f
   = _lhs
@@ -37,7 +38,7 @@ g
 main :: forall a . (Eq a, Num (MatVecScalarElem a), Eq a, Num a) => Bool
 main
   = \a b c d e -> _rhs
-    ((a == b) (g a c d e (fromInt a e 3) (fromInt a e 1)) (fromInt a e 5))
+    ((a == b) (g (fromInt a e 3) (fromInt a e 1)) (fromInt a e 5))
 ------------ tooltips
 testdata/language-features/as-pattern/as-pattern01.lc 1:1-1:2
     forall a . [a] -> [a]
diff --git a/testdata/language-features/as-pattern/as-pattern02.out b/testdata/language-features/as-pattern/as-pattern02.out
index 8a9f96bc..8b4ba9d5 100644
--- a/testdata/language-features/as-pattern/as-pattern02.out
+++ b/testdata/language-features/as-pattern/as-pattern02.out
@@ -4,7 +4,24 @@ main
       => forall b
         . (a ~ [b], Eq b, Num b)
           => forall c . Eq c => forall d . (c ~ [d], Eq d, Num d) => Bool
-main = main
+main
+  = \_ _ e _ f g _ _ h _ i j -> PrimAnd
+    (undefined
+      ([e] -> [e] -> 'Bool)
+      (primIfThenElse
+        [e]
+        ((e == f) (fromInt e g 0) (fromInt e g 0))
+        [fromInt e g 1]
+        [fromInt e g 0, fromInt e g 1])
+      [fromInt e g 1])
+    (undefined
+      ([h] -> [h] -> 'Bool)
+      (primIfThenElse
+        [h]
+        ((h == i) (fromInt h j 1) (fromInt h j 0))
+        []
+        [fromInt h j 1])
+      [fromInt h j 1])
 ------------ desugared source code
 f
   = _lhs
@@ -43,20 +60,9 @@ main
     (PrimAnd
       (undefined
         ([a] -> [a] -> 'Bool)
-        (primIfThenElse
-          [a]
-          ((a == b) (fromInt a c 0) (fromInt a c 0))
-          [fromInt a c 1]
-          [fromInt a c 0, fromInt a c 1])
+        (f [fromInt a c 0, fromInt a c 1])
         [fromInt a c 1])
-      (undefined
-        ([d] -> [d] -> 'Bool)
-        (primIfThenElse
-          [d]
-          ((d == e) (fromInt d f 1) (fromInt d f 0))
-          []
-          [fromInt d f 1])
-        [fromInt d f 1]))
+      (undefined ([d] -> [d] -> 'Bool) (f [fromInt d f 1]) [fromInt d f 1]))
 ------------ tooltips
 testdata/language-features/as-pattern/as-pattern02.lc 3:1-3:2
     forall a . (Eq a, Num a) => [a] -> [a]
diff --git a/testdata/language-features/basic-list/dotdot01.out b/testdata/language-features/basic-list/dotdot01.out
index 9b85b6a5..c564f228 100644
--- a/testdata/language-features/basic-list/dotdot01.out
+++ b/testdata/language-features/basic-list/dotdot01.out
@@ -4,7 +4,7 @@ main = [1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0]
 main = _lhs main (_rhs (fromTo (fromInt 1) (fromInt 10)))
 ------------ core code
 main :: [Float]
-main = _rhs [1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0]
+main = _rhs (1.0 : fromTo (1.0 + 1.0) 10.0)
 ------------ tooltips
 testdata/language-features/basic-list/dotdot01.lc 2:1-2:5
     [Float]
diff --git a/testdata/language-features/basic-list/listcomp01.out b/testdata/language-features/basic-list/listcomp01.out
index ace40823..0c20b420 100644
--- a/testdata/language-features/basic-list/listcomp01.out
+++ b/testdata/language-features/basic-list/listcomp01.out
@@ -3,7 +3,7 @@ main is not found
 value = _lhs value (_rhs (concatMap (\(_ :: _) -> [()]) [(), (), (), ()]))
 ------------ core code
 value :: [()]
-value = _rhs [(), (), (), ()]
+value = _rhs (() : [] ++ foldr (++) [] (map (\_ -> [()]) [(), (), ()]))
 ------------ tooltips
 testdata/language-features/basic-list/listcomp01.lc 1:1-1:6
     [()]
diff --git a/testdata/language-features/basic-list/listcomp02.out b/testdata/language-features/basic-list/listcomp02.out
index 18619ff6..528fef4a 100644
--- a/testdata/language-features/basic-list/listcomp02.out
+++ b/testdata/language-features/basic-list/listcomp02.out
@@ -8,7 +8,7 @@ l :: [()]
 l = _rhs [(), (), (), ()]
 
 value :: [()]
-value = _rhs [(), (), (), ()]
+value = _rhs (() : [] ++ foldr (++) [] (map (\a -> [a]) [(), (), ()]))
 ------------ tooltips
 testdata/language-features/basic-list/listcomp02.lc 1:1-1:2
     [()]
diff --git a/testdata/language-features/basic-list/listcomp04.out b/testdata/language-features/basic-list/listcomp04.out
index 4d43ac94..dfd8bd3c 100644
--- a/testdata/language-features/basic-list/listcomp04.out
+++ b/testdata/language-features/basic-list/listcomp04.out
@@ -9,7 +9,11 @@ l :: [()]
 l = _rhs [(), (), (), ()]
 
 value :: [()]
-value = _rhs [(), (), (), (), (), (), (), (), (), (), (), (), (), (), (), ()]
+value
+  = _rhs
+    (()
+      : [] ++ foldr (++) [] (map (\_ -> [()]) [(), (), ()])
+        ++ foldr (++) [] (map (\_ -> concatMap ' () ' () (\_ -> [()]) l) [(), (), ()]))
 ------------ tooltips
 testdata/language-features/basic-list/listcomp04.lc 1:1-1:2
     [()]
diff --git a/testdata/language-features/basic-list/listcomp05.out b/testdata/language-features/basic-list/listcomp05.out
index c9e56736..46e18270 100644
--- a/testdata/language-features/basic-list/listcomp05.out
+++ b/testdata/language-features/basic-list/listcomp05.out
@@ -11,7 +11,7 @@ value
         [(), ()]))
 ------------ core code
 value :: [()]
-value = _rhs [(), ()]
+value = _rhs (u : [] ++ foldr (++) [] (map (\_ -> [u]) [()]))
 ------------ tooltips
 testdata/language-features/basic-list/listcomp05.lc 1:1-1:6
     [()]
diff --git a/testdata/language-features/basic-list/listcomp06.out b/testdata/language-features/basic-list/listcomp06.out
index cf4e2b31..b0e13efb 100644
--- a/testdata/language-features/basic-list/listcomp06.out
+++ b/testdata/language-features/basic-list/listcomp06.out
@@ -22,10 +22,14 @@ value2
         [(), ()]))
 ------------ core code
 value1 :: [()]
-value1 = _rhs [(), ()]
+value1
+  = _rhs
+    (u : [] ++ foldr (++) [] (map (\_ -> primIfThenElse [' ()] True [u] []) [()]))
 
 value2 :: [()]
-value2 = _rhs [(), ()]
+value2
+  = _rhs
+    (u : [] ++ foldr (++) [] (map (\_ -> primIfThenElse [' ()] True [u] []) [()]))
 ------------ tooltips
 testdata/language-features/basic-list/listcomp06.lc 1:1-1:7
     [()]
diff --git a/testdata/language-features/basic-list/listcomp07.out b/testdata/language-features/basic-list/listcomp07.out
index 2f4d633a..cbabbc48 100644
--- a/testdata/language-features/basic-list/listcomp07.out
+++ b/testdata/language-features/basic-list/listcomp07.out
@@ -40,13 +40,19 @@ value3
         [(), ()]))
 ------------ core code
 value1 :: [()]
-value1 = _rhs [(), ()]
+value1
+  = _rhs
+    (u : [] ++ foldr (++) [] (map (\_ -> primIfThenElse [' ()] True [u] []) [()]))
 
 value2 :: [()]
-value2 = _rhs [(), ()]
+value2
+  = _rhs
+    (u : [] ++ foldr (++) [] (map (\_ -> primIfThenElse [' ()] True [u] []) [()]))
 
 value3 :: [()]
-value3 = _rhs [(), ()]
+value3
+  = _rhs
+    (u : [] ++ foldr (++) [] (map (\_ -> primIfThenElse [' ()] True [u] []) [()]))
 ------------ tooltips
 testdata/language-features/basic-list/listcomp07.lc 1:1-1:7
     [()]
diff --git a/testdata/language-features/basic-values/def01.out b/testdata/language-features/basic-values/def01.out
index 6564e1b8..eba795a8 100644
--- a/testdata/language-features/basic-values/def01.out
+++ b/testdata/language-features/basic-values/def01.out
@@ -7,10 +7,10 @@ fun1 = _lhs fun1 \(_ :: _) -> _rhs (fromInt 1)
 fun2 = _lhs fun2 \(_ :: _) (_ :: _) (_ :: _) (_ :: _) (_ :: _) -> _rhs 'c'
 ------------ core code
 fun1 :: forall a b . Num b => a -> b
-fun1 = \_ a b _ -> _rhs (fromInt a b 1)
+fun1 = \a b c _ -> _rhs (fromInt b c 1)
 
 fun2 :: forall a b c d e . a -> b -> c -> d -> e -> Char
-fun2 = \_ _ _ _ _ _ _ _ _ _ -> _rhs 'c'
+fun2 = \a b c d e _ _ _ _ _ -> _rhs 'c'
 
 unit :: ()
 unit = _rhs ()
diff --git a/testdata/language-features/basic-values/def04.out b/testdata/language-features/basic-values/def04.out
index 127129e9..d4fbfa4e 100644
--- a/testdata/language-features/basic-values/def04.out
+++ b/testdata/language-features/basic-values/def04.out
@@ -28,11 +28,11 @@ fun
 
 fun2 :: forall a b . (Eq a, Num a, Eq a, Num a) => a -> b -> Char
 fun2
-  = \a _ b c d e f _ -> case'Bool
+  = \a b c d e f g _ -> case'Bool
     (\_ -> 'Char)
-    (case'Bool (\_ -> 'Char) (_rhs '_') (_rhs '2') ((a == b) (fromInt a c 2) f))
+    (case'Bool (\_ -> 'Char) (_rhs '_') (_rhs '2') ((a == c) (fromInt a d 2) g))
     (_rhs '1')
-    ((a == d) (fromInt a e 1) f)
+    ((a == e) (fromInt a f 1) g)
 ------------ tooltips
 testdata/language-features/basic-values/def04.lc 1:1-1:4
     forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
diff --git a/testdata/language-features/basic-values/deforder03.out b/testdata/language-features/basic-values/deforder03.out
index cf40c23e..66cb3c71 100644
--- a/testdata/language-features/basic-values/deforder03.out
+++ b/testdata/language-features/basic-values/deforder03.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ desugared source code
-value = _lhs value (_rhs let a = _lhs x (_rhs ()); b = _lhs y (_rhs a) in '1')
+value = _lhs value (_rhs let a = (); b = a in '1')
 ------------ core code
 value :: Char
 value = _rhs '1'
diff --git a/testdata/language-features/basic-values/deforder04.out b/testdata/language-features/basic-values/deforder04.out
index 767b8a9b..17a9a408 100644
--- a/testdata/language-features/basic-values/deforder04.out
+++ b/testdata/language-features/basic-values/deforder04.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ desugared source code
-value = _lhs value (_rhs let a = _lhs x (_rhs ()); b = _lhs y (_rhs a) in '1')
+value = _lhs value (_rhs let a = (); b = a in '1')
 ------------ core code
 value :: Char
 value = _rhs '1'
diff --git a/testdata/language-features/basic-values/deforder05.out b/testdata/language-features/basic-values/deforder05.out
index 7345785e..abc83591 100644
--- a/testdata/language-features/basic-values/deforder05.out
+++ b/testdata/language-features/basic-values/deforder05.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ desugared source code
-value = _lhs value (_rhs let a = _lhs x (_rhs ()); b = _lhs y (_rhs a) in '1')
+value = _lhs value (_rhs let a = (); b = a in '1')
 ------------ core code
 value :: Char
 value = _rhs '1'
diff --git a/testdata/language-features/basic-values/deforder06.out b/testdata/language-features/basic-values/deforder06.out
index 2a0ead81..c44eec77 100644
--- a/testdata/language-features/basic-values/deforder06.out
+++ b/testdata/language-features/basic-values/deforder06.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ desugared source code
-value = _lhs value (_rhs let a = _lhs x (_rhs ()); b = _lhs y (_rhs a) in '1')
+value = _lhs value (_rhs let a = (); b = a in '1')
 ------------ core code
 value :: Char
 value = _rhs '1'
diff --git a/testdata/language-features/basic-values/fixity01.out b/testdata/language-features/basic-values/fixity01.out
index f4f17b40..689c921a 100644
--- a/testdata/language-features/basic-values/fixity01.out
+++ b/testdata/language-features/basic-values/fixity01.out
@@ -17,16 +17,16 @@ infixr 6 >>>>
 infixr 6 funR
 ------------ core code
 <<<< :: forall a b . a -> b -> a
-<<<< = \_ _ a _ -> _rhs a
+<<<< = \a b c _ -> _rhs c
 
 >>>> :: forall a b . a -> b -> b
->>>> = \_ _ _ a -> _rhs a
+>>>> = \a b _ c -> _rhs c
 
 funL :: forall a b . a -> b -> a
-funL = \_ _ a _ -> _rhs a
+funL = \a b c _ -> _rhs c
 
 funR :: forall a b . a -> b -> a
-funR = \_ _ a _ -> _rhs a
+funR = \a b c _ -> _rhs c
 ------------ tooltips
 testdata/language-features/basic-values/fixity01.lc 1:1-1:5
     forall a b . a -> b -> a
diff --git a/testdata/language-features/basic-values/fixity02.out b/testdata/language-features/basic-values/fixity02.out
index b07707af..1dbf5728 100644
--- a/testdata/language-features/basic-values/fixity02.out
+++ b/testdata/language-features/basic-values/fixity02.out
@@ -55,16 +55,16 @@ funValue7
 funValue8 = _lhs funValue8 (_rhs (() `funL` 'c' `funL` "hi" `funL` 1.2 :: ()))
 ------------ core code
 <@ :: forall a b . a -> b -> a
-<@ = \_ _ a _ -> _rhs a
+<@ = \a b c _ -> _rhs c
 
 @> :: forall a b . a -> b -> b
-@> = \_ _ _ a -> _rhs a
+@> = \a b _ c -> _rhs c
 
 funL :: forall a b . a -> b -> a
-funL = \_ _ a _ -> _rhs a
+funL = \a b c _ -> _rhs c
 
 funR :: forall a b . a -> b -> b
-funR = \_ _ _ a -> _rhs a
+funR = \a b _ c -> _rhs c
 
 funValue1 :: Float
 funValue1 = _rhs 1.2
diff --git a/testdata/language-features/basic-values/infix01.out b/testdata/language-features/basic-values/infix01.out
index ced45621..55d5dad5 100644
--- a/testdata/language-features/basic-values/infix01.out
+++ b/testdata/language-features/basic-values/infix01.out
@@ -5,10 +5,10 @@ fun = _lhs fun \(_ :: _) (_ :: _) -> _rhs ()
 value = _lhs value \(a :: _) (b :: _) -> _rhs (a `fun` b)
 ------------ core code
 fun :: forall a b . a -> b -> ()
-fun = \_ _ _ _ -> _rhs ()
+fun = \a b _ _ -> _rhs ()
 
 value :: forall a b . a -> b -> ()
-value = \_ _ _ _ -> _rhs ()
+value = \a b _ _ -> _rhs ()
 ------------ tooltips
 testdata/language-features/basic-values/infix01.lc 1:1-1:4
     forall a b . a -> b -> ()
diff --git a/testdata/language-features/basic-values/infix02.out b/testdata/language-features/basic-values/infix02.out
index 888f4d9f..c32a0ce7 100644
--- a/testdata/language-features/basic-values/infix02.out
+++ b/testdata/language-features/basic-values/infix02.out
@@ -5,10 +5,10 @@ fun = _lhs fun \(_ :: _) (_ :: _) (_ :: _) -> _rhs ()
 value = _lhs value \(a :: _) (b :: _) -> _rhs (a `fun` b)
 ------------ core code
 fun :: forall a b c . a -> b -> c -> ()
-fun = \_ _ _ _ _ _ -> _rhs ()
+fun = \a b c _ _ _ -> _rhs ()
 
 value :: forall a b c . a -> b -> c -> ()
-value = \a b c d e -> _rhs (fun a b c d e)
+value = \a b c d e -> _rhs (fun d e)
 ------------ tooltips
 testdata/language-features/basic-values/infix02.lc 1:1-1:4
     forall a b c . a -> b -> c -> ()
diff --git a/testdata/language-features/basic-values/lambda01.out b/testdata/language-features/basic-values/lambda01.out
index 0a07171f..1476c47f 100644
--- a/testdata/language-features/basic-values/lambda01.out
+++ b/testdata/language-features/basic-values/lambda01.out
@@ -15,17 +15,17 @@ fun4
         -> ())
 ------------ core code
 fun1 :: forall a . a -> ()
-fun1 = \_ -> _rhs \_ -> ()
+fun1 = \a -> _rhs \_ -> ()
 
 fun2 :: forall a . a -> ()
-fun2 = \_ -> _rhs \_ -> ()
+fun2 = \a -> _rhs \_ -> ()
 
 fun3 :: forall a . a -> ()
-fun3 = \_ -> _rhs \_ -> ()
+fun3 = \a -> _rhs \_ -> ()
 
 fun4
   :: forall a b c d e f g h i . a -> b -> c -> d -> e -> f -> g -> h -> i -> ()
-fun4 = \_ _ _ _ _ _ _ _ _ -> _rhs \_ _ _ _ _ _ _ _ _ -> ()
+fun4 = \a b c d e f g h i -> _rhs \_ _ _ _ _ _ _ _ _ -> ()
 ------------ tooltips
 testdata/language-features/basic-values/lambda01.lc 1:1-1:5
     forall a . a -> ()
diff --git a/testdata/language-features/basic-values/lambda03.out b/testdata/language-features/basic-values/lambda03.out
index f9ddcaa4..50af2ae5 100644
--- a/testdata/language-features/basic-values/lambda03.out
+++ b/testdata/language-features/basic-values/lambda03.out
@@ -5,10 +5,10 @@ fun1 = _lhs fun1 (_rhs \(_ :: _) (a :: _) (_ :: _) -> a)
 fun2 = _lhs fun2 \(a :: _) -> _rhs \(_ :: _) (_ :: _) (_ :: _) -> a
 ------------ core code
 fun1 :: forall a b c . a -> b -> c -> b
-fun1 = \_ _ _ -> _rhs \_ a _ -> a
+fun1 = \a b c -> _rhs \_ d _ -> d
 
 fun2 :: forall a b c d . a -> b -> c -> d -> a
-fun2 = \_ _ _ _ a -> _rhs \_ _ _ -> a
+fun2 = \a b c d e -> _rhs \_ _ _ -> e
 ------------ tooltips
 testdata/language-features/basic-values/lambda03.lc 1:1-1:5
     forall a b c . a -> b -> c -> b
diff --git a/testdata/language-features/basic-values/let01.out b/testdata/language-features/basic-values/let01.out
index 7d40e348..bd59a558 100644
--- a/testdata/language-features/basic-values/let01.out
+++ b/testdata/language-features/basic-values/let01.out
@@ -1,21 +1,14 @@
 main is not found
 ------------ desugared source code
-value1 = _lhs value1 (_rhs let a = _lhs x (_rhs (fromInt 1)) in fromInt 1)
+value1 = _lhs value1 (_rhs let a = fromInt 1 in fromInt 1)
 
-value2 = _lhs value2 (_rhs let a = _lhs x (_rhs (fromInt 1)) in fromInt 1)
+value2 = _lhs value2 (_rhs let a = fromInt 1 in fromInt 1)
 
-value3
-  = _lhs
-    value3
-    (_rhs let a = _lhs x (_rhs (fromInt 1)); b = _lhs y (_rhs 'c') in fromInt 1)
+value3 = _lhs value3 (_rhs let a = fromInt 1; b = 'c' in fromInt 1)
 
-value4 = _lhs value4 (_rhs let a = _lhs x (_rhs (fromInt 1)) in fromInt 1)
+value4 = _lhs value4 (_rhs let a = fromInt 1 in fromInt 1)
 
-value5
-  = _lhs
-    value5
-    (_rhs
-      let a = _lhs x (_rhs (fromInt 1)); b = _lhs y (_rhs (fromInt 2)) in fromInt 1)
+value5 = _lhs value5 (_rhs let a = fromInt 1; b = fromInt 2 in fromInt 1)
 ------------ core code
 value1 :: forall a . Num a => a
 value1 = \a b -> _rhs (fromInt a b 1)
diff --git a/testdata/language-features/basic-values/let02.out b/testdata/language-features/basic-values/let02.out
index f9de03b4..574a8d36 100644
--- a/testdata/language-features/basic-values/let02.out
+++ b/testdata/language-features/basic-values/let02.out
@@ -5,15 +5,7 @@ value
     value
     (_rhs
       let
-        a = _lhs x (_rhs ());
-        b = _lhs y (_rhs let d = _lhs c (_rhs 'A') in ());
-        c
-          = _lhs
-            z
-            (_rhs
-              let
-                e = _lhs a (_rhs ()); f = _lhs b (_rhs (fromInt 1)); g = _lhs c (_rhs "hello")
-                in 'B')
+        a = (); b = let d = 'A' in (); c = let e = (); f = fromInt 1; g = "hello" in 'B'
         in ())
 ------------ core code
 value :: ()
diff --git a/testdata/language-features/basic-values/operator01.out b/testdata/language-features/basic-values/operator01.out
index 3b6dd323..817d1b5f 100644
--- a/testdata/language-features/basic-values/operator01.out
+++ b/testdata/language-features/basic-values/operator01.out
@@ -9,16 +9,16 @@ main is not found
 ($$$) = _lhs ($$$) \(_ :: _) (_ :: _) -> _rhs ()
 ------------ core code
 #$# :: forall a b . a -> b -> ()
-#$# = \_ _ _ _ -> _rhs ()
+#$# = \a b _ _ -> _rhs ()
 
 $$# :: forall a b . a -> b -> ()
-$$# = \_ _ _ _ -> _rhs ()
+$$# = \a b _ _ -> _rhs ()
 
 $$$ :: forall a b . a -> b -> ()
-$$$ = \_ _ _ _ -> _rhs ()
+$$$ = \a b _ _ -> _rhs ()
 
 $$$# :: forall a b . a -> b -> ()
-$$$# = \_ _ _ _ -> _rhs ()
+$$$# = \a b _ _ -> _rhs ()
 ------------ tooltips
 testdata/language-features/basic-values/operator01.lc 1:3-1:6
     forall a b . a -> b -> ()
diff --git a/testdata/language-features/basic-values/shadowing01.out b/testdata/language-features/basic-values/shadowing01.out
index b1288270..502ad96f 100644
--- a/testdata/language-features/basic-values/shadowing01.out
+++ b/testdata/language-features/basic-values/shadowing01.out
@@ -5,23 +5,12 @@ value
     value
     (_rhs
       let
-        a = _lhs x (_rhs 'A');
-        b = _lhs y (_rhs "hello");
+        a = 'A';
+        b = "hello";
         c
-          = _lhs
-            c
-            (_rhs
-              let
-                d = _lhs x (_rhs (fromInt 1));
-                e = _lhs y (_rhs 2.12);
-                f
-                  = _lhs
-                    c
-                    (_rhs
-                      let
-                        g = _lhs x (_rhs ()); h = _lhs y (_rhs 'C'); i = _lhs c (_rhs 3.12)
-                        in "world")
-                in ())
+          = let
+            d = fromInt 1; e = 2.12; f = let g = (); h = 'C'; i = 3.12 in "world"
+            in ()
         in '7')
 ------------ core code
 value :: Char
diff --git a/testdata/language-features/basic-values/shadowing02.out b/testdata/language-features/basic-values/shadowing02.out
index 7edd4cef..aa0b9af2 100644
--- a/testdata/language-features/basic-values/shadowing02.out
+++ b/testdata/language-features/basic-values/shadowing02.out
@@ -9,27 +9,13 @@ value2
     value2
     (_rhs
       let
-        a = _lhs x (_rhs 'A');
-        b = _lhs y (_rhs "hello");
-        c = _lhs w (_rhs (fromInt 123));
+        a = 'A';
+        b = "hello";
+        c = fromInt 123;
         d
-          = _lhs
-            c
-            (_rhs
-              let
-                e = _lhs x (_rhs (fromInt 1));
-                f = _lhs y (_rhs 2.12);
-                g
-                  = _lhs
-                    c
-                    (_rhs
-                      let
-                        h = _lhs x (_rhs ());
-                        i = _lhs y (_rhs 'C');
-                        j = _lhs c (_rhs 3.12);
-                        k = _lhs d (_rhs c)
-                        in world)
-                in ())
+          = let
+            e = fromInt 1; f = 2.12; g = let h = (); i = 'C'; j = 3.12; k = c in world
+            in ()
         in '7')
 ------------ core code
 c :: forall a . Num a => a
diff --git a/testdata/language-features/basic-values/shadowing03.out b/testdata/language-features/basic-values/shadowing03.out
index f796c908..cb7d1050 100644
--- a/testdata/language-features/basic-values/shadowing03.out
+++ b/testdata/language-features/basic-values/shadowing03.out
@@ -3,7 +3,7 @@ main is not found
 x = _lhs x \(_ :: _) (_ :: _) -> _rhs ()
 ------------ core code
 x :: forall a b . a -> b -> ()
-x = \_ _ _ _ -> _rhs ()
+x = \a b _ _ -> _rhs ()
 ------------ tooltips
 testdata/language-features/basic-values/shadowing03.lc 1:1-1:2
     forall a b . a -> b -> ()
diff --git a/testdata/language-features/basic-values/shadowing04.out b/testdata/language-features/basic-values/shadowing04.out
index 59d10c41..042c221d 100644
--- a/testdata/language-features/basic-values/shadowing04.out
+++ b/testdata/language-features/basic-values/shadowing04.out
@@ -3,7 +3,7 @@ main is not found
 __ = _lhs __ \(_ :: _) (_ :: _) -> _rhs ()
 ------------ core code
 __ :: forall a b . a -> b -> ()
-__ = \_ _ _ _ -> _rhs ()
+__ = \a b _ _ -> _rhs ()
 ------------ tooltips
 testdata/language-features/basic-values/shadowing04.lc 1:1-1:3
     forall a b . a -> b -> ()
diff --git a/testdata/language-features/basic-values/typesig05.out b/testdata/language-features/basic-values/typesig05.out
index 7ca5e11a..fc1da409 100644
--- a/testdata/language-features/basic-values/typesig05.out
+++ b/testdata/language-features/basic-values/typesig05.out
@@ -15,10 +15,10 @@ value4 :: String
 value4 = _lhs value4 (_rhs (funR 'a' "b"))
 ------------ core code
 funL :: forall a b . a -> b -> a
-funL = \_ _ a _ -> _rhs a
+funL = \a b c _ -> _rhs c
 
 funR :: forall a b . a -> b -> b
-funR = \_ _ _ a -> _rhs a
+funR = \a b _ c -> _rhs c
 
 value1 :: Char
 value1 = _rhs 'a'
diff --git a/testdata/language-features/basic-values/typesig06.out b/testdata/language-features/basic-values/typesig06.out
index 6cc32fea..04783c47 100644
--- a/testdata/language-features/basic-values/typesig06.out
+++ b/testdata/language-features/basic-values/typesig06.out
@@ -9,10 +9,10 @@ value1 = _lhs value1 (_rhs ("hi" <@ 1.2 :: String))
 value2 = _lhs value2 (_rhs ("hi" `funL` 1.2 :: String))
 ------------ core code
 <@ :: forall a b . a -> b -> a
-<@ = \_ _ a _ -> _rhs a
+<@ = \a b c _ -> _rhs c
 
 funL :: forall a b . a -> b -> a
-funL = \_ _ a _ -> _rhs a
+funL = \a b c _ -> _rhs c
 
 value1 :: String
 value1 = _rhs "hi"
diff --git a/testdata/language-features/basic-values/where01.out b/testdata/language-features/basic-values/where01.out
index 3b56a3c4..45cdab5f 100644
--- a/testdata/language-features/basic-values/where01.out
+++ b/testdata/language-features/basic-values/where01.out
@@ -1,14 +1,14 @@
 main is not found
 ------------ desugared source code
-value1 = _lhs value1 (_rhs let a = _lhs x (_rhs ()) in ())
+value1 = _lhs value1 (_rhs let a = () in ())
 
-value2 = _lhs value2 (_rhs let a = _lhs x (_rhs ()) in a)
+value2 = _lhs value2 (_rhs let a = () in a)
 
-value3 = _lhs value3 (_rhs let a = _lhs x (_rhs ()); b = _lhs y (_rhs ()) in a)
+value3 = _lhs value3 (_rhs let a = (); b = () in a)
 
-value4 = _lhs value4 (_rhs let a = _lhs x (_rhs ()); b = _lhs y (_rhs ()) in b)
+value4 = _lhs value4 (_rhs let a = (); b = () in b)
 
-value5 = _lhs value5 (_rhs let a = _lhs x (_rhs ()); b = _lhs y (_rhs ()) in a)
+value5 = _lhs value5 (_rhs let a = (); b = () in a)
 
 value6 = _lhs value6 (_rhs ())
 
@@ -16,13 +16,11 @@ value7 = _lhs value7 (_rhs ())
 
 value8 = _lhs value8 (_rhs ())
 
-value9 = _lhs value9 (_rhs let a = _lhs x (_rhs ()); b = _lhs y (_rhs ()) in a)
+value9 = _lhs value9 (_rhs let a = (); b = () in a)
 
-value10
-  = _lhs value10 (_rhs let a = _lhs x (_rhs ()); b = _lhs y (_rhs ()) in a)
+value10 = _lhs value10 (_rhs let a = (); b = () in a)
 
-value11
-  = _lhs value11 (_rhs let a = _lhs x (_rhs ()); b = _lhs y (_rhs ()) in a)
+value11 = _lhs value11 (_rhs let a = (); b = () in a)
 ------------ core code
 value1 :: ()
 value1 = _rhs ()
diff --git a/testdata/language-features/basic-values/where04.out b/testdata/language-features/basic-values/where04.out
index 3095e9d3..0c247314 100644
--- a/testdata/language-features/basic-values/where04.out
+++ b/testdata/language-features/basic-values/where04.out
@@ -1,13 +1,10 @@
 main is not found
 ------------ desugared source code
-value1
-  = _lhs value1 (_rhs let a = _lhs x (_rhs let b = _lhs y (_rhs ()) in b) in a)
+value1 = _lhs value1 (_rhs let a = let b = () in b in a)
 
-value2
-  = _lhs value2 (_rhs let a = _lhs x (_rhs let b = _lhs y (_rhs ()) in b) in a)
+value2 = _lhs value2 (_rhs let a = let b = () in b in a)
 
-value3
-  = _lhs value3 (_rhs let a = _lhs x (_rhs let b = _lhs y (_rhs ()) in b) in a)
+value3 = _lhs value3 (_rhs let a = let b = () in b in a)
 ------------ core code
 value1 :: ()
 value1 = _rhs ()
diff --git a/testdata/language-features/basic-values/where05.out b/testdata/language-features/basic-values/where05.out
index 0dc19f61..768de934 100644
--- a/testdata/language-features/basic-values/where05.out
+++ b/testdata/language-features/basic-values/where05.out
@@ -4,44 +4,28 @@ value1
   = _lhs
     value1
     (_rhs
-      ((\(a :: _) -> case'Bool
-          (\(_ :: _) -> _)
-          ()
-          (let b = _lhs x (_rhs ()) in b)
-          (fromInt 1 == a))
+      ((\(a :: _) -> case'Bool (\(_ :: _) -> _) () (let b = () in b) (fromInt 1 == a))
         (fromInt 1)))
 
 value2
   = _lhs
     value2
     (_rhs
-      ((\(a :: _) -> case'Bool
-          (\(_ :: _) -> _)
-          ()
-          (let b = _lhs x (_rhs ()) in b)
-          (fromInt 1 == a))
+      ((\(a :: _) -> case'Bool (\(_ :: _) -> _) () (let b = () in b) (fromInt 1 == a))
         (fromInt 1)))
 
 value3
   = _lhs
     value3
     (_rhs
-      ((\(a :: _) -> case'Bool
-          (\(_ :: _) -> _)
-          ()
-          (let b = _lhs x (_rhs ()) in b)
-          (fromInt 1 == a))
+      ((\(a :: _) -> case'Bool (\(_ :: _) -> _) () (let b = () in b) (fromInt 1 == a))
         (fromInt 1)))
 
 value4
   = _lhs
     value4
     (_rhs
-      let a = _lhs x (_rhs ()) in (\(b :: _) -> case'Bool
-          (\(_ :: _) -> _)
-          ()
-          a
-          (fromInt 1 == b))
+      let a = () in (\(b :: _) -> case'Bool (\(_ :: _) -> _) () a (fromInt 1 == b))
         (fromInt 1))
 ------------ core code
 value1 :: forall a . (Eq a, Num a) => ()
diff --git a/testdata/language-features/basic-values/wildcard01.out b/testdata/language-features/basic-values/wildcard01.out
index b462aac7..4f954c87 100644
--- a/testdata/language-features/basic-values/wildcard01.out
+++ b/testdata/language-features/basic-values/wildcard01.out
@@ -3,7 +3,7 @@ main is not found
 funUnit = _lhs funUnit \(_ :: _) -> _rhs ()
 ------------ core code
 funUnit :: forall a . a -> ()
-funUnit = \_ _ -> _rhs ()
+funUnit = \a _ -> _rhs ()
 ------------ tooltips
 testdata/language-features/basic-values/wildcard01.lc 1:1-1:8
     forall a . a -> ()
diff --git a/testdata/language-features/pattern/caseWhere.out b/testdata/language-features/pattern/caseWhere.out
index 3c090334..0a5e69c4 100644
--- a/testdata/language-features/pattern/caseWhere.out
+++ b/testdata/language-features/pattern/caseWhere.out
@@ -5,12 +5,7 @@ main
   = _lhs
     main
     (_rhs
-      ((\(a :: _) -> let b = _lhs c (_rhs a) in case'Bool
-          (\(_ :: _) -> _)
-          undefined
-          a
-          b)
-        True))
+      ((\(a :: _) -> let b = a in case'Bool (\(_ :: _) -> _) undefined a b) True))
 ------------ core code
 main :: Bool
 main = _rhs True
diff --git a/testdata/language-features/pattern/unreachable.out b/testdata/language-features/pattern/unreachable.out
index 7b7df75d..8eb5d0db 100644
--- a/testdata/language-features/pattern/unreachable.out
+++ b/testdata/language-features/pattern/unreachable.out
@@ -3,7 +3,7 @@ main is not found
 f = _lhs f \(_ :: _) -> _rhs "hello"
 ------------ core code
 f :: forall a . a -> String
-f = \_ _ -> _rhs "hello"
+f = \a _ -> _rhs "hello"
 ------------ tooltips
 testdata/language-features/pattern/unreachable.lc 4:1-4:2
     forall a . a -> String
diff --git a/testdata/language-features/pattern/viewPattern.out b/testdata/language-features/pattern/viewPattern.out
index f8fdb6d9..654f8467 100644
--- a/testdata/language-features/pattern/viewPattern.out
+++ b/testdata/language-features/pattern/viewPattern.out
@@ -9,7 +9,7 @@ main
     (_rhs ((\(a :: _) -> case'Bool (\(_ :: _) -> _) undefined True (id a)) True))
 ------------ core code
 id :: forall a . a -> a
-id = \_ a -> _rhs a
+id = \a b -> _rhs b
 
 main :: Bool
 main = _rhs True
diff --git a/testdata/language-features/recursion/mutualConst.lc b/testdata/language-features/recursion/mutualConst.lc
index c7f83f18..526a14a7 100644
--- a/testdata/language-features/recursion/mutualConst.lc
+++ b/testdata/language-features/recursion/mutualConst.lc
@@ -1,9 +1,14 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+import Internals
 
-xy = (\x y -> ((1 :: Int): y, 1: x)) (fst xy) (snd xy)
+fst (x, y) = x
+snd (x, y) = y
+
+xy = (\x y -> (False: y, True: x)) (fst xy) (snd xy)
 
 (x, y) = xy
 
 main = case x of
-    1: 1: 1: _ -> True
+    False: True: False: _ -> True
 
 
diff --git a/testdata/language-features/recursion/mutualConst.out b/testdata/language-features/recursion/mutualConst.out
index 4791ed55..34d37bc7 100644
--- a/testdata/language-features/recursion/mutualConst.out
+++ b/testdata/language-features/recursion/mutualConst.out
@@ -1 +1,194 @@
-True
\ No newline at end of file
+main :: Bool
+main = True
+------------ desugared source code
+fst
+  = _lhs
+    fst
+    \(a :: _) -> hlistConsCase
+      _
+      (\(b :: _) (c :: _) -> hlistConsCase
+        _
+        (\(_ :: _) (d :: _) -> hlistNilCase _ (_rhs b) d)
+        c)
+      a
+
+snd
+  = _lhs
+    snd
+    \(a :: _) -> hlistConsCase
+      _
+      (\(_ :: _) (b :: _) -> hlistConsCase
+        _
+        (\(c :: _) (d :: _) -> hlistNilCase _ (_rhs c) d)
+        b)
+      a
+
+xy
+  = primFix
+    \(a :: _) -> _lhs
+      xy
+      (_rhs ((\(b :: _) (c :: _) -> (False : c, True : b)) (fst a) (snd a)))
+
+_y_x = _lhs _y_x (_rhs xy)
+
+y
+  = _lhs
+    y
+    (_rhs
+      ((\(a :: _) -> hlistConsCase
+          _
+          (\(_ :: _) (b :: _) -> hlistConsCase
+            _
+            (\(c :: _) (d :: _) -> hlistNilCase _ c d)
+            b)
+          a)
+        _y_x))
+
+x
+  = _lhs
+    x
+    (_rhs
+      ((\(a :: _) -> hlistConsCase
+          _
+          (\(b :: _) (c :: _) -> hlistConsCase
+            _
+            (\(_ :: _) (d :: _) -> hlistNilCase _ b d)
+            c)
+          a)
+        _y_x))
+
+main
+  = _lhs
+    main
+    (_rhs
+      ((\(a :: _) -> case'List
+          (\(_ :: _) -> _)
+          undefined
+          (\(b :: _) (c :: _) -> case'Bool
+            (\(_ :: _) -> _)
+            (case'List
+              (\(_ :: _) -> _)
+              undefined
+              (\(d :: _) (e :: _) -> case'Bool
+                (\(_ :: _) -> _)
+                undefined
+                (case'List
+                  (\(_ :: _) -> _)
+                  undefined
+                  (\(f :: _) (_ :: _) -> case'Bool (\(_ :: _) -> _) True undefined f)
+                  e)
+                d)
+              c)
+            undefined
+            b)
+          a)
+        x))
+------------ core code
+_y_x :: ([Bool], [Bool])
+_y_x = _rhs (False : snd xy, True : fst xy)
+
+fst :: forall a b . (a, b) -> a
+fst
+  = \a b c -> hlistConsCase
+    a
+    [b]
+    a
+    (\d e -> hlistConsCase b [] a (\_ f -> hlistNilCase a (_rhs d) f) e)
+    c
+
+main :: Bool
+main = _rhs True
+
+snd :: forall a b . (a, b) -> b
+snd
+  = \a b c -> hlistConsCase
+    a
+    [b]
+    b
+    (\_ d -> hlistConsCase b [] b (\e f -> hlistNilCase b (_rhs e) f) d)
+    c
+
+x :: [Bool]
+x = _rhs (False : snd xy)
+
+xy :: ([Bool], [Bool])
+xy = primFix _ \a -> _rhs (False : snd a, True : fst a)
+
+y :: [Bool]
+y = _rhs (True : fst xy)
+------------ tooltips
+testdata/language-features/recursion/mutualConst.lc 4:1-4:4
+    forall a b . (a, b) -> a
+testdata/language-features/recursion/mutualConst.lc 4:14-4:15
+    _k | _h | _d
+testdata/language-features/recursion/mutualConst.lc 5:1-5:4
+    forall a b . (a, b) -> b
+testdata/language-features/recursion/mutualConst.lc 5:14-5:15
+    _f | _c | _c
+testdata/language-features/recursion/mutualConst.lc 7:1-7:3
+    ([Bool], [Bool])
+testdata/language-features/recursion/mutualConst.lc 7:6-7:44
+    [Bool] -> ([Bool], [Bool])
+testdata/language-features/recursion/mutualConst.lc 7:6-7:53
+    ([Bool], [Bool])
+testdata/language-features/recursion/mutualConst.lc 7:15-7:34
+    ([Bool], [Bool])
+testdata/language-features/recursion/mutualConst.lc 7:16-7:21
+    Bool
+testdata/language-features/recursion/mutualConst.lc 7:16-7:22
+    [Bool] -> [Bool]
+testdata/language-features/recursion/mutualConst.lc 7:16-7:24
+    [Bool]
+testdata/language-features/recursion/mutualConst.lc 7:21-7:22
+    forall a . a -> [a] -> [a]
+testdata/language-features/recursion/mutualConst.lc 7:23-7:24
+    _c
+testdata/language-features/recursion/mutualConst.lc 7:26-7:30
+    Bool
+testdata/language-features/recursion/mutualConst.lc 7:26-7:31
+    [Bool] -> [Bool]
+testdata/language-features/recursion/mutualConst.lc 7:26-7:33
+    [Bool] | (([Bool]))
+testdata/language-features/recursion/mutualConst.lc 7:30-7:31
+    forall a . a -> [a] -> [a]
+testdata/language-features/recursion/mutualConst.lc 7:32-7:33
+    _e
+testdata/language-features/recursion/mutualConst.lc 7:37-7:40
+    forall a b . (a, b) -> a
+testdata/language-features/recursion/mutualConst.lc 7:37-7:43
+    _b
+testdata/language-features/recursion/mutualConst.lc 7:41-7:43
+    _d
+testdata/language-features/recursion/mutualConst.lc 7:46-7:49
+    forall a b . (a, b) -> b
+testdata/language-features/recursion/mutualConst.lc 7:46-7:52
+    [Bool]
+testdata/language-features/recursion/mutualConst.lc 7:50-7:52
+    ([Bool], [Bool])
+testdata/language-features/recursion/mutualConst.lc 9:2-9:3
+    _k | _h | _d | [Bool]
+testdata/language-features/recursion/mutualConst.lc 9:2-9:6
+    ([Bool], [Bool]) | ([Bool], [Bool]) | ([Bool], [Bool])
+testdata/language-features/recursion/mutualConst.lc 9:5-9:6
+    _f | _c | _c | [Bool]
+testdata/language-features/recursion/mutualConst.lc 9:10-9:12
+    ([Bool], [Bool])
+testdata/language-features/recursion/mutualConst.lc 11:1-11:5
+    Bool
+testdata/language-features/recursion/mutualConst.lc 11:8-12:34
+    Bool
+testdata/language-features/recursion/mutualConst.lc 11:13-11:14
+    [Bool]
+testdata/language-features/recursion/mutualConst.lc 12:30-12:34
+    Bool | Bool | Bool | Bool | Bool | Bool
+------------ warnings
+Uncovered pattern(s) at testdata/language-features/recursion/mutualConst.lc:11:13:
+main = case x of
+            ^
+Missing case(s):
+     []
+     [False]
+     (False : False : _)
+     [False, True]
+     (False : True : True : _)
+     (True : _)
\ No newline at end of file
diff --git a/testdata/language-features/recursion/mutualFunc.lc b/testdata/language-features/recursion/mutualFunc.lc
new file mode 100644
index 00000000..2f3a524e
--- /dev/null
+++ b/testdata/language-features/recursion/mutualFunc.lc
@@ -0,0 +1,11 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+import Internals
+
+f True = g False
+f False = g True
+
+g True = True
+g x = f x
+
+main = f True
+
diff --git a/testdata/language-features/recursion/mutualFunc.out b/testdata/language-features/recursion/mutualFunc.out
new file mode 100644
index 00000000..6dd3f158
--- /dev/null
+++ b/testdata/language-features/recursion/mutualFunc.out
@@ -0,0 +1,107 @@
+main :: Bool
+main = True
+------------ desugared source code
+_g_f
+  = primFix
+    \(a :: _) -> let
+      b = a;
+      c
+        = (\(e :: _) -> hlistConsCase
+            _
+            (\(_ :: _) (f :: _) -> hlistConsCase
+              _
+              (\(g :: _) (h :: _) -> hlistNilCase _ g h)
+              f)
+            e)
+          b;
+      d
+        = (\(i :: _) -> hlistConsCase
+            _
+            (\(j :: _) (k :: _) -> hlistConsCase
+              _
+              (\(_ :: _) (l :: _) -> hlistNilCase _ j l)
+              k)
+            i)
+          b
+      in (_lhs g \(m :: _) -> case'Bool (\(_ :: _) -> _) (_rhs (c m)) (_rhs True) m
+    , _lhs
+      f
+      \(n :: _) -> case'Bool (\(_ :: _) -> _) (_rhs (d True)) (_rhs (d False)) n)
+
+_f_g = _g_f
+
+f
+  = (\(a :: _) -> hlistConsCase
+      _
+      (\(_ :: _) (b :: _) -> hlistConsCase
+        _
+        (\(c :: _) (d :: _) -> hlistNilCase _ c d)
+        b)
+      a)
+    _f_g
+
+g
+  = (\(a :: _) -> hlistConsCase
+      _
+      (\(b :: _) (c :: _) -> hlistConsCase
+        _
+        (\(_ :: _) (d :: _) -> hlistNilCase _ b d)
+        c)
+      a)
+    _f_g
+
+main = _lhs main (_rhs (f True))
+------------ core code
+_f_g :: (Bool -> Bool, Bool -> Bool)
+_f_g = primFix _ \a -> <<1st constructor of 'HList>>
+
+_g_f :: (Bool -> Bool, Bool -> Bool)
+_g_f = primFix _ \a -> <<1st constructor of 'HList>>
+
+f :: Bool -> Bool
+f = \a -> case'Bool (\_ -> 'Bool) (_rhs True) (_rhs True) a
+
+g :: Bool -> Bool
+g = \a -> case'Bool (\_ -> 'Bool) (_rhs (f a)) (_rhs True) a
+
+main :: Bool
+main = _rhs True
+------------ tooltips
+testdata/language-features/recursion/mutualFunc.lc 4:1-4:2
+    _f | _c | _c | _f | _c | _c | Bool -> Bool
+testdata/language-features/recursion/mutualFunc.lc 4:1-7:2
+    _b | _e | (_e, _d) | (Bool -> Bool, Bool -> Bool) | (Bool -> Bool
+    , Bool -> Bool) | (Bool -> Bool, Bool -> Bool) | (Bool -> Bool
+    , Bool -> Bool) | (Bool -> Bool, Bool -> Bool)
+testdata/language-features/recursion/mutualFunc.lc 4:10-4:11
+    Bool -> _a
+testdata/language-features/recursion/mutualFunc.lc 4:10-4:17
+    _a
+testdata/language-features/recursion/mutualFunc.lc 4:10-5:17
+    Bool -> _a | ((Bool -> _a))
+testdata/language-features/recursion/mutualFunc.lc 4:10-8:10
+    (Bool -> Bool, Bool -> _a)
+testdata/language-features/recursion/mutualFunc.lc 4:12-4:17
+    Bool
+testdata/language-features/recursion/mutualFunc.lc 5:11-5:12
+    _i
+testdata/language-features/recursion/mutualFunc.lc 5:13-5:17
+    Bool
+testdata/language-features/recursion/mutualFunc.lc 7:1-7:2
+    _k | _h | _d | _k | _h | _d | Bool -> Bool
+testdata/language-features/recursion/mutualFunc.lc 7:10-7:14
+    Bool
+testdata/language-features/recursion/mutualFunc.lc 7:10-8:10
+    Bool -> Bool
+testdata/language-features/recursion/mutualFunc.lc 8:7-8:8
+    _h
+testdata/language-features/recursion/mutualFunc.lc 8:9-8:10
+    _f
+testdata/language-features/recursion/mutualFunc.lc 10:1-10:5
+    Bool
+testdata/language-features/recursion/mutualFunc.lc 10:8-10:9
+    Bool -> Bool
+testdata/language-features/recursion/mutualFunc.lc 10:8-10:14
+    Bool
+testdata/language-features/recursion/mutualFunc.lc 10:10-10:14
+    Bool
\ No newline at end of file
diff --git a/testdata/language-features/recursion/mutualRec.lc b/testdata/language-features/recursion/mutualRec.lc
index c9ae6135..9a9422de 100644
--- a/testdata/language-features/recursion/mutualRec.lc
+++ b/testdata/language-features/recursion/mutualRec.lc
@@ -1,8 +1,10 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+import Internals
 
-x = 2: y
-y = 1: x
+x = False: y
+y = True: x
 
-main = case (x :: [Int]) of
-    2: 1: 2: _ -> True
+main = case x of
+    False: True: False: _ -> True
 
 
diff --git a/testdata/language-features/recursion/mutualRec.out b/testdata/language-features/recursion/mutualRec.out
index 4791ed55..885bd1ba 100644
--- a/testdata/language-features/recursion/mutualRec.out
+++ b/testdata/language-features/recursion/mutualRec.out
@@ -1 +1,139 @@
-True
\ No newline at end of file
+main :: Bool
+main = True
+------------ desugared source code
+_y_x
+  = primFix
+    \(a :: _) -> let
+      b = a;
+      c
+        = (\(e :: _) -> hlistConsCase
+            _
+            (\(_ :: _) (f :: _) -> hlistConsCase
+              _
+              (\(g :: _) (h :: _) -> hlistNilCase _ g h)
+              f)
+            e)
+          b;
+      d
+        = (\(i :: _) -> hlistConsCase
+            _
+            (\(j :: _) (k :: _) -> hlistConsCase
+              _
+              (\(_ :: _) (l :: _) -> hlistNilCase _ j l)
+              k)
+            i)
+          b
+      in (_lhs y (_rhs (True : c)), _lhs x (_rhs (False : d)))
+
+_x_y = _y_x
+
+x
+  = (\(a :: _) -> hlistConsCase
+      _
+      (\(_ :: _) (b :: _) -> hlistConsCase
+        _
+        (\(c :: _) (d :: _) -> hlistNilCase _ c d)
+        b)
+      a)
+    _x_y
+
+y
+  = (\(a :: _) -> hlistConsCase
+      _
+      (\(b :: _) (c :: _) -> hlistConsCase
+        _
+        (\(_ :: _) (d :: _) -> hlistNilCase _ b d)
+        c)
+      a)
+    _x_y
+
+main
+  = _lhs
+    main
+    (_rhs
+      ((\(a :: _) -> case'List
+          (\(_ :: _) -> _)
+          undefined
+          (\(b :: _) (c :: _) -> case'Bool
+            (\(_ :: _) -> _)
+            (case'List
+              (\(_ :: _) -> _)
+              undefined
+              (\(d :: _) (e :: _) -> case'Bool
+                (\(_ :: _) -> _)
+                undefined
+                (case'List
+                  (\(_ :: _) -> _)
+                  undefined
+                  (\(f :: _) (_ :: _) -> case'Bool (\(_ :: _) -> _) True undefined f)
+                  e)
+                d)
+              c)
+            undefined
+            b)
+          a)
+        x))
+------------ core code
+_x_y :: ([Bool], [Bool])
+_x_y = primFix _ \a -> <<1st constructor of 'HList>>
+
+_y_x :: ([Bool], [Bool])
+_y_x = primFix _ \a -> <<1st constructor of 'HList>>
+
+main :: Bool
+main = _rhs True
+
+x :: [Bool]
+x = _rhs (False : y)
+
+y :: [Bool]
+y = _rhs (True : x)
+------------ tooltips
+testdata/language-features/recursion/mutualRec.lc 4:1-4:2
+    _f | _c | _c | _f | _c | _c | [Bool]
+testdata/language-features/recursion/mutualRec.lc 4:1-5:2
+    _b | _e | (_e, _d) | ([Bool], [Bool]) | ([Bool], [Bool]) | ([Bool]
+    , [Bool]) | ([Bool], [Bool]) | ([Bool], [Bool])
+testdata/language-features/recursion/mutualRec.lc 4:5-4:10
+    Bool
+testdata/language-features/recursion/mutualRec.lc 4:5-4:11
+    [Bool] -> [Bool]
+testdata/language-features/recursion/mutualRec.lc 4:5-4:13
+    [Bool] | (([Bool]))
+testdata/language-features/recursion/mutualRec.lc 4:5-5:12
+    ([Bool], [Bool])
+testdata/language-features/recursion/mutualRec.lc 4:10-4:11
+    forall a . a -> [a] -> [a]
+testdata/language-features/recursion/mutualRec.lc 4:12-4:13
+    _e
+testdata/language-features/recursion/mutualRec.lc 5:1-5:2
+    _k | _h | _d | _k | _h | _d | [Bool]
+testdata/language-features/recursion/mutualRec.lc 5:5-5:9
+    Bool
+testdata/language-features/recursion/mutualRec.lc 5:5-5:10
+    [Bool] -> [Bool]
+testdata/language-features/recursion/mutualRec.lc 5:5-5:12
+    [Bool]
+testdata/language-features/recursion/mutualRec.lc 5:9-5:10
+    forall a . a -> [a] -> [a]
+testdata/language-features/recursion/mutualRec.lc 5:11-5:12
+    _d
+testdata/language-features/recursion/mutualRec.lc 7:1-7:5
+    Bool
+testdata/language-features/recursion/mutualRec.lc 7:8-8:34
+    Bool
+testdata/language-features/recursion/mutualRec.lc 7:13-7:14
+    [Bool]
+testdata/language-features/recursion/mutualRec.lc 8:30-8:34
+    Bool | Bool | Bool | Bool | Bool | Bool
+------------ warnings
+Uncovered pattern(s) at testdata/language-features/recursion/mutualRec.lc:7:13:
+main = case x of
+            ^
+Missing case(s):
+     []
+     [False]
+     (False : False : _)
+     [False, True]
+     (False : True : True : _)
+     (True : _)
\ No newline at end of file
diff --git a/testdata/language-features/recursion/simplerec01.out b/testdata/language-features/recursion/simplerec01.out
index 736caa77..823d544e 100644
--- a/testdata/language-features/recursion/simplerec01.out
+++ b/testdata/language-features/recursion/simplerec01.out
@@ -1,18 +1,19 @@
 main is not found
 ------------ desugared source code
 fun
-  = _lhs
-    fun
-    \(a :: _) -> case'Bool
-      (\(_ :: _) -> _)
-      (_rhs (fun (fromInt 0)))
-      (_rhs 'a')
-      (fromInt 0 == a)
+  = primFix
+    \(a :: _) -> _lhs
+      fun
+      \(b :: _) -> case'Bool
+        (\(_ :: _) -> _)
+        (_rhs (a (fromInt 0)))
+        (_rhs 'a')
+        (fromInt 0 == b)
 ------------ core code
 fun :: forall a . (Num a, Eq a, Num a) => a -> Char
 fun
   = \a b c d -> primFix
-    (a -> 'Char)
+    _
     \e f -> case'Bool
       (\_ -> 'Char)
       (_rhs (e (fromInt a b 0)))
diff --git a/testdata/language-features/section/section01.out b/testdata/language-features/section/section01.out
index a06769e3..0252cce5 100644
--- a/testdata/language-features/section/section01.out
+++ b/testdata/language-features/section/section01.out
@@ -7,13 +7,13 @@ value1 = _lhs value1 \(a :: _) -> _rhs \(b :: _) -> a !@! b
 value2 = _lhs value2 \(a :: _) -> _rhs \(b :: _) -> b !@! a
 ------------ core code
 !@! :: forall a b . a -> b -> ()
-!@! = \_ _ _ _ -> _rhs ()
+!@! = \a b _ _ -> _rhs ()
 
 value1 :: forall a b . a -> b -> ()
-value1 = \a b c -> _rhs \d -> ()
+value1 = \a b c -> _rhs \d -> c !@! d
 
 value2 :: forall a b . a -> b -> ()
-value2 = \a b c -> _rhs \d -> ()
+value2 = \a b c -> _rhs \d -> d !@! c
 ------------ tooltips
 testdata/language-features/section/section01.lc 1:3-1:6
     forall a b . a -> b -> ()
diff --git a/testdata/let.out b/testdata/let.out
index a3809ea8..3a5eb302 100644
--- a/testdata/let.out
+++ b/testdata/let.out
@@ -2,13 +2,13 @@ main is not found
 ------------ desugared source code
 id = _lhs id \(a :: _) -> _rhs a
 
-f = _lhs f \(a :: _) -> _rhs let b = _lhs y (_rhs (id a)) in b
+f = _lhs f \(a :: _) -> _rhs let b = id a in b
 ------------ core code
 f :: forall a . a -> a
-f = \_ a -> _rhs a
+f = \a b -> _rhs b
 
 id :: forall a . a -> a
-id = \_ a -> _rhs a
+id = \a b -> _rhs b
 ------------ tooltips
 testdata/let.lc 4:1-4:3
     forall a . a -> a
diff --git a/testdata/letIndent.out b/testdata/letIndent.out
index 569c73ae..1aebe94e 100644
--- a/testdata/letIndent.out
+++ b/testdata/letIndent.out
@@ -1,13 +1,9 @@
 main is not found
 ------------ desugared source code
-fun
-  = _lhs
-    fun
-    \(a :: _) -> _rhs
-      let b = _lhs a (_rhs (fromInt 1)); c = _lhs b (_rhs (fromInt 2)) in a
+fun = _lhs fun \(a :: _) -> _rhs let b = fromInt 1; c = fromInt 2 in a
 ------------ core code
 fun :: forall a . a -> a
-fun = \_ a -> _rhs a
+fun = \a b -> _rhs b
 ------------ tooltips
 testdata/letIndent.lc 2:1-2:4
     forall a . a -> a
diff --git a/testdata/line01.out b/testdata/line01.out
index 9c5a0369..b138bafd 100644
--- a/testdata/line01.out
+++ b/testdata/line01.out
@@ -33,9 +33,12 @@ Pipeline
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
+              vec4 v3FToV4F(vec3 z0) {
+                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
+              }
               void main() {
-                  gl_Position = scale (0.5,(MVP) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0)));
-                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
+                  gl_Position = scale (0.5,(MVP) * (v3FToV4F (vi1)));
+                  vo1 = v3FToV4F (vi1);
               }
               """
           , geometryShader = Nothing
diff --git a/testdata/listcompr01.out b/testdata/listcompr01.out
index 0b839ae1..9624f5be 100644
--- a/testdata/listcompr01.out
+++ b/testdata/listcompr01.out
@@ -37,7 +37,14 @@ main
         a))
 ------------ core code
 a :: [(Float, Float)]
-a = _rhs [(1.0, 1.0)]
+a
+  = _rhs
+    ((1.0, 1.0)
+      : [] ++ foldr (++) [] (map (\a -> [(1.0, a)]) [])
+        ++ foldr
+          (++)
+          []
+          (map (\b -> concatMap 'Float ' ('Float, 'Float) (\c -> [(b, c)]) [1.0]) []))
 
 main :: Bool
 main = _rhs True
diff --git a/testdata/listcompr02.out b/testdata/listcompr02.out
index 88460fca..8692e5f9 100644
--- a/testdata/listcompr02.out
+++ b/testdata/listcompr02.out
@@ -103,7 +103,20 @@ main
         a))
 ------------ core code
 a :: [(Float, Float)]
-a = _rhs [(1.0, 2.0), (1.0, 2.0), (1.0, 2.0), (1.0, 2.0)]
+a
+  = _rhs
+    ((1.0 *! 1.0, 1.0 +! 1.0)
+      : [] ++ foldr (++) [] (map (\a -> [(1.0 *! a, 1.0 +! a)]) [1.0])
+        ++ foldr
+          (++)
+          []
+          (map
+            (\b -> concatMap
+              ('MatVecScalarElem 'Float)
+              ' ('Float, 'Float)
+              (\c -> [(b *! c, b +! c)])
+              [1.0, 1.0])
+            [1.0]))
 
 main :: Bool
 main = _rhs True
diff --git a/testdata/listcompr03.out b/testdata/listcompr03.out
index 9a33c1ea..7c9bf0d3 100644
--- a/testdata/listcompr03.out
+++ b/testdata/listcompr03.out
@@ -103,7 +103,20 @@ main
         a))
 ------------ core code
 a :: [(Float, Float)]
-a = _rhs [(1.0, 2.0), (1.0, 2.0), (1.0, 2.0), (1.0, 2.0)]
+a
+  = _rhs
+    ((k *! 1.0 *! 1.0, 1.0 +! 1.0)
+      : [] ++ foldr (++) [] (map (\a -> [(k *! 1.0 *! a, 1.0 +! a)]) [1.0])
+        ++ foldr
+          (++)
+          []
+          (map
+            (\b -> concatMap
+              'Float
+              ' ('Float, 'Float)
+              (\c -> [(k *! b *! c, b +! c)])
+              [1.0, 1.0])
+            [k]))
 
 main :: Bool
 main = _rhs True
diff --git a/testdata/listcompr04.out b/testdata/listcompr04.out
index db27d5d9..198e0383 100644
--- a/testdata/listcompr04.out
+++ b/testdata/listcompr04.out
@@ -35,7 +35,7 @@ main
         a))
 ------------ core code
 a :: [Float]
-a = _rhs [2.0, 4.0]
+a = _rhs (1.0 *! k : [] ++ foldr (++) [] (map (\a -> [a *! k]) [k]))
 
 main :: Bool
 main = _rhs True
diff --git a/testdata/listcompr05.out b/testdata/listcompr05.out
index 0e6445e3..d058a5e0 100644
--- a/testdata/listcompr05.out
+++ b/testdata/listcompr05.out
@@ -43,7 +43,24 @@ main
         a))
 ------------ core code
 a :: [Float]
-a = _rhs [0.0, 0.0]
+a
+  = _rhs
+    (0.0 *! 1.0
+      : []
+          ++ foldr
+            (++)
+            []
+            (map (\a -> primIfThenElse ['Float] (isZero 0.0) [0.0 *! a] []) [2.0])
+        ++ foldr
+          (++)
+          []
+          (map
+            (\b -> concatMap
+              'Float
+              'Float
+              (\c -> primIfThenElse ['Float] (isZero b) [b *! c] [])
+              [1.0, 2.0])
+            [2.0]))
 
 isZero :: Float -> Bool
 isZero
diff --git a/testdata/localfun.out b/testdata/localfun.out
index bf1b11b3..eace1650 100644
--- a/testdata/localfun.out
+++ b/testdata/localfun.out
@@ -12,7 +12,7 @@ f
 main = _lhs main (_rhs (f True False && f False True))
 ------------ core code
 f :: Bool -> Bool -> Bool
-f = \a b -> _rhs (g b a)
+f = \a b -> _rhs (g a)
 
 main :: Bool
 main = _rhs True
diff --git a/testdata/localfun2.out b/testdata/localfun2.out
index ca1f097b..f2f0ef52 100644
--- a/testdata/localfun2.out
+++ b/testdata/localfun2.out
@@ -1,45 +1,40 @@
 main is not found
 ------------ desugared source code
 split
-  = _lhs
-    split
-    \(a :: _) -> case'List
-      (\(_ :: _) -> _)
-      (_rhs ([], []))
-      (\(b :: _) (c :: _) -> _rhs
-        let
-          d = _lhs _bs_as (_rhs (split c));
-          e
-            = _lhs
-              bs
-              (_rhs
-                ((\(g :: _) -> hlistConsCase
+  = primFix
+    \(a :: _) -> _lhs
+      split
+      \(b :: _) -> case'List
+        (\(_ :: _) -> _)
+        (_rhs ([], []))
+        (\(c :: _) (d :: _) -> _rhs
+          let
+            e = a d;
+            f
+              = (\(h :: _) -> hlistConsCase
+                  _
+                  (\(_ :: _) (i :: _) -> hlistConsCase
                     _
-                    (\(_ :: _) (h :: _) -> hlistConsCase
-                      _
-                      (\(i :: _) (j :: _) -> hlistNilCase _ i j)
-                      h)
-                    g)
-                  d));
-          f
-            = _lhs
-              as
-              (_rhs
-                ((\(k :: _) -> hlistConsCase
+                    (\(j :: _) (k :: _) -> hlistNilCase _ j k)
+                    i)
+                  h)
+                e;
+            g
+              = (\(l :: _) -> hlistConsCase
+                  _
+                  (\(m :: _) (n :: _) -> hlistConsCase
                     _
-                    (\(l :: _) (m :: _) -> hlistConsCase
-                      _
-                      (\(_ :: _) (n :: _) -> hlistNilCase _ l n)
-                      m)
-                    k)
-                  d))
-          in (b : e, f))
-      a
+                    (\(_ :: _) (o :: _) -> hlistNilCase _ m o)
+                    n)
+                  l)
+                e
+            in (c : f, g))
+        b
 ------------ core code
 split :: forall a . [a] -> ([a], [a])
 split
   = \a -> primFix
-    ([a] -> ' ([a], [a]))
+    _
     \b c -> case'List
       (\_ -> ' ([a], [a]))
       (_rhs ([], []))
diff --git a/testdata/loopIssue.out b/testdata/loopIssue.out
index 4791ed55..86b64220 100644
--- a/testdata/loopIssue.out
+++ b/testdata/loopIssue.out
@@ -1 +1,195 @@
-True
\ No newline at end of file
+main :: Bool
+main = True
+------------ desugared source code
+data Inf :: Type where
+    Inf :: Inf -> Inf
+
+inf = primFix \(a :: _) -> _lhs inf (_rhs (Inf a))
+
+main'
+  = _lhs
+    main'
+    (_rhs ((\(a :: _) -> case'Inf (\(_ :: _) -> _) (\(_ :: _) -> True) a) inf))
+
+inf2 = _lhs inf2 (_rhs inf)
+
+(-) = _lhs (-) (_rhs primSubInt)
+
+repeat = primFix \(a :: _) -> _lhs repeat \(b :: _) -> _rhs ((b :: Bool) : a b)
+
+repeatT = primFix \(a :: _) -> _lhs repeatT (_rhs (True : a))
+
+primes = _lhs primes (_rhs repeatT)
+
+(!!)
+  = primFix
+    \(a :: _) -> _lhs
+      (!!)
+      \(b :: _) (c :: _) -> case'List
+        (\(_ :: _) -> _)
+        (_rhs undefined)
+        (\(d :: _) (e :: _) -> case'Bool
+          (\(_ :: _) -> _)
+          (_rhs (a e (c - fromInt 1)))
+          (_rhs d)
+          (fromInt 0 == c))
+        b
+
+main = _lhs main (_rhs (primes !! fromInt 20))
+------------ core code
+!! :: forall a . [a] -> Int -> a
+!!
+  = \a -> primFix
+    _
+    \b c d -> case'List
+      (\_ -> a)
+      (_rhs (undefined a))
+      (\e f -> case'Bool
+        (\_ -> a)
+        (_rhs (b f (primSubInt d 1)))
+        (_rhs e)
+        (isEQ (primCompareInt 0 d)))
+      c
+
+'Inf :: Type
+'Inf = <<type constructor with 0 indices; constructors: Inf>>
+
+- :: Int -> Int -> Int
+- = _rhs \a b -> primSubInt a b
+
+Inf :: Inf -> Inf
+Inf = <<0th constructor of 'Inf>>
+
+case'Inf
+  :: forall (a :: Inf -> Type)
+    -> (forall (b :: Inf) -> a ('Inf b)) -> forall (c :: Inf) -> a c
+case'Inf = \a b c -> <<case function of a type with 0 parameters>>
+
+inf :: Inf
+inf = primFix _ \a -> _rhs (Inf a)
+
+inf2 :: Inf
+inf2 = _rhs (Inf inf)
+
+main :: Bool
+main = _rhs True
+
+main' :: Bool
+main' = _rhs True
+
+match'Inf :: forall (a :: Type -> Type) -> a Inf -> forall b -> a b -> a b
+match'Inf = \a b c d -> <<type case function>>
+
+primes :: [Bool]
+primes = _rhs (True : repeatT)
+
+repeat :: Bool -> [Bool]
+repeat = primFix _ \a b -> _rhs (typeAnn b : a b)
+
+repeatT :: [Bool]
+repeatT = primFix _ \a -> _rhs (True : a)
+------------ tooltips
+testdata/loopIssue.lc 5:6-5:9
+    Type | Type | Type | Type | Type | Type
+testdata/loopIssue.lc 5:6-5:15
+    Type
+testdata/loopIssue.lc 5:12-5:15
+    Inf -> Inf | Inf | Type | Type
+testdata/loopIssue.lc 5:16-5:19
+    Type
+testdata/loopIssue.lc 7:1-7:4
+    Inf
+testdata/loopIssue.lc 7:7-7:10
+    Inf -> Inf
+testdata/loopIssue.lc 7:7-7:14
+    Inf
+testdata/loopIssue.lc 7:11-7:14
+    Inf
+testdata/loopIssue.lc 9:1-9:6
+    Bool
+testdata/loopIssue.lc 9:9-10:18
+    Bool
+testdata/loopIssue.lc 9:14-9:17
+    Inf
+testdata/loopIssue.lc 10:14-10:18
+    Bool
+testdata/loopIssue.lc 13:1-13:5
+    Inf
+testdata/loopIssue.lc 13:8-13:11
+    Inf
+testdata/loopIssue.lc 15:2-15:3
+    Int -> Int -> Int
+testdata/loopIssue.lc 15:7-15:17
+    Int -> Int -> Int
+testdata/loopIssue.lc 17:1-17:7
+    Bool -> [Bool]
+testdata/loopIssue.lc 17:12-17:24
+    [Bool] -> [Bool]
+testdata/loopIssue.lc 17:12-17:33
+    [Bool]
+testdata/loopIssue.lc 17:13-17:14
+    _b
+testdata/loopIssue.lc 17:13-17:22
+    Bool
+testdata/loopIssue.lc 17:18-17:22
+    Type
+testdata/loopIssue.lc 17:23-17:24
+    forall a . a -> [a] -> [a]
+testdata/loopIssue.lc 17:25-17:31
+    _c
+testdata/loopIssue.lc 17:32-17:33
+    Bool
+testdata/loopIssue.lc 19:1-19:8
+    [Bool]
+testdata/loopIssue.lc 19:11-19:15
+    Bool
+testdata/loopIssue.lc 19:11-19:16
+    [Bool] -> [Bool]
+testdata/loopIssue.lc 19:11-19:24
+    [Bool]
+testdata/loopIssue.lc 19:15-19:16
+    forall a . a -> [a] -> [a]
+testdata/loopIssue.lc 19:17-19:24
+    [Bool]
+testdata/loopIssue.lc 22:1-22:7
+    [Bool]
+testdata/loopIssue.lc 22:10-22:17
+    [Bool]
+testdata/loopIssue.lc 26:8-26:10
+    forall a . [a] -> Int -> a
+testdata/loopIssue.lc 26:15-26:16
+    _e
+testdata/loopIssue.lc 26:15-27:28
+    Bool -> _d | _c
+testdata/loopIssue.lc 27:17-27:19
+    [_h]
+testdata/loopIssue.lc 27:20-27:22
+    _k
+testdata/loopIssue.lc 27:24-27:25
+    _k
+testdata/loopIssue.lc 27:24-27:26
+    Int -> Int
+testdata/loopIssue.lc 27:24-27:27
+    Int
+testdata/loopIssue.lc 27:25-27:26
+    Int -> Int -> Int
+testdata/loopIssue.lc 27:26-27:27
+    _b
+testdata/loopIssue.lc 29:1-29:5
+    Bool
+testdata/loopIssue.lc 30:5-30:11
+    [Bool]
+testdata/loopIssue.lc 30:5-30:14
+    Int -> Bool
+testdata/loopIssue.lc 30:5-30:17
+    Bool
+testdata/loopIssue.lc 30:12-30:14
+    forall a . [a] -> Int -> a
+testdata/loopIssue.lc 30:15-30:17
+    _b
+------------ warnings
+Uncovered pattern(s) at testdata/loopIssue.lc:26:8:
+(x: _) !! 0 = x
+(_ : xs) !! n = xs !! (n-1)
+Missing case(s):
+    [] !! _
\ No newline at end of file
diff --git a/testdata/primes.out b/testdata/primes.out
index b74e882a..b741b012 100644
--- a/testdata/primes.out
+++ b/testdata/primes.out
@@ -1 +1,552 @@
-31
\ No newline at end of file
+main :: Int
+main = 31
+------------ desugared source code
+infixr 0 $
+
+($) = _lhs ($) \(a :: _) (b :: _) -> _rhs (a b)
+
+id = _lhs id \(a :: _) -> _rhs a
+
+foldr
+  = primFix
+    \(a :: _) -> _lhs
+      foldr
+      \(b :: _) (c :: _) (d :: _) -> case'List
+        (\(_ :: _) -> _)
+        (_rhs c)
+        (\(e :: _) (f :: _) -> _rhs (b e $ a b c f))
+        d
+
+filter
+  = _lhs
+    filter
+    \(a :: _) -> _rhs
+      (foldr (\(b :: _) (c :: _) -> primIfThenElse (a b) (b : c) c) [])
+
+(&&)
+  = _lhs
+    (&&)
+    \(a :: _) (b :: _) -> case'Bool (\(_ :: _) -> _) (_rhs False) (_rhs b) a
+
+and = _lhs and (_rhs (foldr (&&) True))
+
+map = _lhs map \(a :: _) -> _rhs (foldr (\(b :: _) (c :: _) -> a b : c) [])
+
+mod = _lhs mod (_rhs primModInt)
+
+iSqrt
+  = _lhs iSqrt \(a :: _) -> _rhs (primRound (primSqrtFloat (primIntToFloat a)))
+
+(+) = _lhs (+) (_rhs primAddInt)
+
+(-) = _lhs (-) (_rhs primSubInt)
+
+(<=)
+  = _lhs
+    (<=)
+    \(a :: _) (b :: _) -> _rhs
+      ((\(c :: _) -> case'Ordering (\(_ :: _) -> _) True True False c)
+        (primCompareInt a b))
+
+not
+  = _lhs not \(a :: _) -> case'Bool (\(_ :: _) -> _) (_rhs True) (_rhs False) a
+
+(/=) = _lhs (/=) \(a :: _) (b :: _) -> _rhs (not $ a == b)
+
+takeWhile
+  = primFix
+    \(a :: _) -> _lhs
+      takeWhile
+      \(b :: _) (c :: _) -> case'List
+        (\(_ :: _) -> _)
+        (_rhs [])
+        (\(d :: _) (e :: _) -> case'Bool
+          (\(_ :: _) -> _)
+          (_rhs [])
+          (_rhs (d : a b e))
+          (b d))
+        c
+
+from = primFix \(a :: _) -> _lhs from \(b :: _) -> _rhs (b : a (b + fromInt 1))
+
+primes :: [Int]
+primes
+  = primFix
+    \(a :: [Int]) -> _lhs
+      primes
+      (_rhs
+        (fromInt 2
+          : fromInt 3
+            : filter
+              (\(b :: _) -> and
+                $ map
+                  (\(c :: _) -> b `mod` c /= fromInt 0)
+                  (takeWhile (\(d :: _) -> d <= iSqrt b) a))
+              (from (fromInt 5))))
+
+(!!)
+  = primFix
+    \(a :: _) -> _lhs
+      (!!)
+      \(b :: _) (c :: _) -> case'List
+        (\(_ :: _) -> _)
+        (_rhs undefined)
+        (\(d :: _) (e :: _) -> case'Bool
+          (\(_ :: _) -> _)
+          (_rhs (a e (c - fromInt 1)))
+          (_rhs d)
+          (fromInt 0 == c))
+        b
+
+main = _lhs main (_rhs (primes !! fromInt 10))
+------------ core code
+!! :: forall a . [a] -> Int -> a
+!!
+  = \a -> primFix
+    _
+    \b c d -> case'List
+      (\_ -> a)
+      (_rhs (undefined a))
+      (\e f -> case'Bool
+        (\_ -> a)
+        (_rhs (b f (primSubInt d 1)))
+        (_rhs e)
+        (isEQ (primCompareInt 0 d)))
+      c
+
+$ :: forall a b . (a -> b) -> a -> b
+$ = \a b c d -> _rhs (c d)
+
+&& :: Bool -> Bool -> Bool
+&& = \a b -> case'Bool (\_ -> 'Bool) (_rhs False) (_rhs b) a
+
++ :: Int -> Int -> Int
++ = _rhs \a b -> primAddInt a b
+
+- :: Int -> Int -> Int
+- = _rhs \a b -> primSubInt a b
+
+/= :: forall a . Eq a => a -> a -> Bool
+/= = \a b c d -> _rhs (not ((a == b) c d))
+
+<= :: Int -> Int -> Bool
+<=
+  = \a b -> _rhs
+    (case'Ordering (\_ -> 'Bool) True True False (primCompareInt a b))
+
+and :: [Bool] -> Bool
+and = _rhs (foldr (&&) True)
+
+filter :: forall a . (a -> Bool) -> [a] -> [a]
+filter = \a b -> _rhs (foldr (\c d -> primIfThenElse [a] (b c) (c : d) d) [])
+
+foldr :: forall a b . (b -> a -> a) -> a -> [b] -> a
+foldr
+  = \a b -> primFix
+    _
+    \c d e f -> case'List (\_ -> a) (_rhs e) (\g h -> _rhs (d g (c d e h))) f
+
+from :: Int -> [Int]
+from = primFix _ \a b -> _rhs (b : a (primAddInt b 1))
+
+iSqrt :: Int -> Int
+iSqrt = \a -> _rhs (primRound (primSqrtFloat (primIntToFloat a)))
+
+id :: forall a . a -> a
+id = \a b -> _rhs b
+
+main :: Int
+main = _rhs 31
+
+map :: forall a b . (a -> b) -> [a] -> [b]
+map = \a b c -> _rhs (foldr (\d e -> c d : e) [])
+
+mod :: Int -> Int -> Int
+mod = _rhs \a b -> primModInt a b
+
+not :: Bool -> Bool
+not = \a -> case'Bool (\_ -> 'Bool) (_rhs True) (_rhs False) a
+
+primes :: [Int]
+primes
+  = primFix
+    _
+    \a -> _rhs
+      (2
+        : 3
+          : foldr
+            (\b c -> primIfThenElse
+              ['Int]
+              (and
+                $ foldr (\d e -> primModInt b d /= 0 : e) [] (takeWhile (\f -> f <= iSqrt b) a))
+              (b : c)
+              c)
+            []
+            (from 5))
+
+takeWhile :: forall a . (a -> Bool) -> [a] -> [a]
+takeWhile
+  = \a -> primFix
+    _
+    \b c d -> case'List
+      (\_ -> [a])
+      (_rhs [])
+      (\e f -> case'Bool (\_ -> [a]) (_rhs []) (_rhs (e : b c f)) (c e))
+      d
+------------ tooltips
+testdata/primes.lc 7:3-7:4
+    forall a b . (a -> b) -> a -> b
+testdata/primes.lc 7:9-7:10
+    _d
+testdata/primes.lc 7:11-7:12
+    _e
+testdata/primes.lc 9:1-9:3
+    forall a . a -> a
+testdata/primes.lc 9:8-9:9
+    _b
+testdata/primes.lc 11:1-11:6
+    forall a b . (b -> a -> a) -> a -> [b] -> a
+testdata/primes.lc 11:16-11:17
+    _f
+testdata/primes.lc 11:16-12:39
+    [_b] -> _f
+testdata/primes.lc 12:21-12:22
+    _k
+testdata/primes.lc 12:21-12:26
+    _b -> _a
+testdata/primes.lc 12:21-12:39
+    _h
+testdata/primes.lc 12:23-12:24
+    _h
+testdata/primes.lc 12:25-12:26
+    forall a b . (a -> b) -> a -> b
+testdata/primes.lc 12:27-12:32
+    _k
+testdata/primes.lc 12:33-12:34
+    _g -> _d -> _k
+testdata/primes.lc 12:35-12:36
+    _l
+testdata/primes.lc 12:37-12:39
+    [_h]
+testdata/primes.lc 19:1-19:7
+    forall a . (a -> Bool) -> [a] -> [a]
+testdata/primes.lc 19:12-19:17
+    forall a b . (b -> a -> a) -> a -> [b] -> a
+testdata/primes.lc 19:12-19:54
+    [_a] -> [_a] -> [_a]
+testdata/primes.lc 19:12-19:57
+    [_a] -> [_a]
+testdata/primes.lc 19:28-19:53
+    [_c]
+testdata/primes.lc 19:31-19:32
+    _g
+testdata/primes.lc 19:31-19:45
+    [_c] -> [_c]
+testdata/primes.lc 19:33-19:34
+    _g
+testdata/primes.lc 19:40-19:41
+    _e
+testdata/primes.lc 19:40-19:42
+    [_d] -> [_d]
+testdata/primes.lc 19:40-19:45
+    [_c]
+testdata/primes.lc 19:41-19:42
+    forall a . a -> [a] -> [a]
+testdata/primes.lc 19:43-19:45
+    _d
+testdata/primes.lc 19:51-19:53
+    [_c]
+testdata/primes.lc 19:55-19:57
+    forall a . [a]
+testdata/primes.lc 21:6-21:8
+    Bool -> Bool -> Bool
+testdata/primes.lc 21:13-21:14
+    _b
+testdata/primes.lc 21:13-22:19
+    Bool -> Bool
+testdata/primes.lc 22:14-22:19
+    Bool
+testdata/primes.lc 24:1-24:4
+    [Bool] -> Bool
+testdata/primes.lc 24:7-24:12
+    forall a b . (b -> a -> a) -> a -> [b] -> a
+testdata/primes.lc 24:7-24:17
+    Bool -> [Bool] -> Bool
+testdata/primes.lc 24:7-24:22
+    [Bool] -> Bool
+testdata/primes.lc 24:13-24:17
+    Bool -> Bool -> Bool
+testdata/primes.lc 24:18-24:22
+    Bool
+testdata/primes.lc 26:1-26:4
+    forall a b . (a -> b) -> [a] -> [b]
+testdata/primes.lc 26:9-26:14
+    forall a b . (b -> a -> a) -> a -> [b] -> a
+testdata/primes.lc 26:9-26:33
+    [_a] -> [_b] -> [_a]
+testdata/primes.lc 26:9-26:36
+    [_b] -> [_a]
+testdata/primes.lc 26:25-26:26
+    _g
+testdata/primes.lc 26:25-26:29
+    [_a] -> [_a]
+testdata/primes.lc 26:25-26:32
+    [_a]
+testdata/primes.lc 26:27-26:28
+    _g
+testdata/primes.lc 26:28-26:29
+    forall a . a -> [a] -> [a]
+testdata/primes.lc 26:30-26:32
+    [_a]
+testdata/primes.lc 26:34-26:36
+    forall a . [a]
+testdata/primes.lc 28:1-28:4
+    Int -> Int -> Int
+testdata/primes.lc 28:7-28:17
+    Int -> Int -> Int
+testdata/primes.lc 29:1-29:6
+    Int -> Int
+testdata/primes.lc 29:11-29:20
+    Float -> Int
+testdata/primes.lc 29:11-29:55
+    Int
+testdata/primes.lc 29:22-29:35
+    Float -> Float
+testdata/primes.lc 29:22-29:54
+    Float
+testdata/primes.lc 29:37-29:51
+    Int -> Float
+testdata/primes.lc 29:37-29:53
+    Float
+testdata/primes.lc 29:52-29:53
+    _b
+testdata/primes.lc 30:2-30:3
+    Int -> Int -> Int
+testdata/primes.lc 30:7-30:17
+    Int -> Int -> Int
+testdata/primes.lc 31:2-31:3
+    Int -> Int -> Int
+testdata/primes.lc 31:7-31:17
+    Int -> Int -> Int
+testdata/primes.lc 33:3-33:5
+    Int -> Int -> Bool
+testdata/primes.lc 33:10-35:14
+    Bool
+testdata/primes.lc 33:15-33:29
+    Int -> Int -> Ordering
+testdata/primes.lc 33:15-33:31
+    Int -> Ordering
+testdata/primes.lc 33:15-33:33
+    Ordering
+testdata/primes.lc 33:30-33:31
+    _d
+testdata/primes.lc 33:32-33:33
+    _b
+testdata/primes.lc 34:11-34:16
+    Bool
+testdata/primes.lc 34:11-35:14
+    Ordering -> Bool
+testdata/primes.lc 35:10-35:14
+    Bool | Bool
+testdata/primes.lc 37:1-37:4
+    Bool -> Bool
+testdata/primes.lc 37:13-37:17
+    Bool
+testdata/primes.lc 37:13-38:17
+    Bool -> Bool
+testdata/primes.lc 38:12-38:17
+    Bool
+testdata/primes.lc 40:3-40:5
+    forall a . Eq a => a -> a -> Bool
+testdata/primes.lc 40:10-40:13
+    Bool -> Bool
+testdata/primes.lc 40:10-40:15
+    Bool -> Bool
+testdata/primes.lc 40:10-40:22
+    Bool
+testdata/primes.lc 40:14-40:15
+    forall a b . (a -> b) -> a -> b
+testdata/primes.lc 40:16-40:17
+    _f
+testdata/primes.lc 40:16-40:20
+    _e -> Bool
+testdata/primes.lc 40:16-40:22
+    Bool
+testdata/primes.lc 40:18-40:20
+    forall a . Eq a => a -> a -> Bool
+testdata/primes.lc 40:21-40:22
+    _c
+testdata/primes.lc 42:1-42:10
+    forall a . (a -> Bool) -> [a] -> [a]
+testdata/primes.lc 42:23-42:24
+    _g
+testdata/primes.lc 42:23-43:19
+    [_c]
+testdata/primes.lc 42:25-42:26
+    _f
+testdata/primes.lc 42:29-42:30
+    _f
+testdata/primes.lc 42:29-42:31
+    [_e] -> [_e]
+testdata/primes.lc 42:29-42:46
+    [_d]
+testdata/primes.lc 42:29-43:19
+    Bool -> [_d]
+testdata/primes.lc 42:30-42:31
+    forall a . a -> [a] -> [a]
+testdata/primes.lc 42:32-42:41
+    _j
+testdata/primes.lc 42:42-42:43
+    _k
+testdata/primes.lc 42:44-42:46
+    [_h]
+testdata/primes.lc 43:17-43:19
+    forall a . [a] | forall a . [a]
+testdata/primes.lc 45:1-45:5
+    Int -> [Int]
+testdata/primes.lc 45:10-45:11
+    _c
+testdata/primes.lc 45:10-45:12
+    [_b] -> [_b]
+testdata/primes.lc 45:10-45:25
+    [Int]
+testdata/primes.lc 45:11-45:12
+    forall a . a -> [a] -> [a]
+testdata/primes.lc 45:13-45:17
+    _d
+testdata/primes.lc 45:19-45:20
+    _e
+testdata/primes.lc 45:19-45:22
+    Int -> Int
+testdata/primes.lc 45:19-45:24
+    Int
+testdata/primes.lc 45:21-45:22
+    Int -> Int -> Int
+testdata/primes.lc 45:23-45:24
+    _b
+testdata/primes.lc 47:11-47:16
+    Type
+testdata/primes.lc 47:12-47:15
+    Type
+testdata/primes.lc 48:1-48:7
+    [Int]
+testdata/primes.lc 48:10-48:11
+    _b
+testdata/primes.lc 48:10-48:12
+    [_b] -> [_b]
+testdata/primes.lc 48:10-48:111
+    [Int]
+testdata/primes.lc 48:11-48:12
+    forall a . a -> [a] -> [a]
+testdata/primes.lc 48:12-48:13
+    _b
+testdata/primes.lc 48:12-48:14
+    [_b] -> [_b]
+testdata/primes.lc 48:12-48:111
+    [Int]
+testdata/primes.lc 48:13-48:14
+    forall a . a -> [a] -> [a]
+testdata/primes.lc 48:15-48:21
+    forall a . (a -> Bool) -> [a] -> [a]
+testdata/primes.lc 48:15-48:102
+    [Int] -> [Int]
+testdata/primes.lc 48:15-48:111
+    [Int]
+testdata/primes.lc 48:29-48:32
+    [Bool] -> Bool
+testdata/primes.lc 48:29-48:34
+    [Bool] -> Bool
+testdata/primes.lc 48:29-48:101
+    Bool
+testdata/primes.lc 48:33-48:34
+    forall a b . (a -> b) -> a -> b
+testdata/primes.lc 48:35-48:38
+    forall a b . (a -> b) -> [a] -> [b]
+testdata/primes.lc 48:35-48:61
+    [Int] -> [Bool]
+testdata/primes.lc 48:35-48:101
+    [Bool]
+testdata/primes.lc 48:46-48:47
+    _g
+testdata/primes.lc 48:46-48:53
+    Int -> Int
+testdata/primes.lc 48:46-48:55
+    Int
+testdata/primes.lc 48:46-48:58
+    Int -> Bool
+testdata/primes.lc 48:46-48:60
+    Bool
+testdata/primes.lc 48:48-48:53
+    Int -> Int -> Int
+testdata/primes.lc 48:54-48:55
+    _d
+testdata/primes.lc 48:56-48:58
+    forall a . Eq a => a -> a -> Bool
+testdata/primes.lc 48:59-48:60
+    _b
+testdata/primes.lc 48:63-48:72
+    forall a . (a -> Bool) -> [a] -> [a]
+testdata/primes.lc 48:63-48:93
+    [Int] -> [Int]
+testdata/primes.lc 48:63-48:100
+    [Int]
+testdata/primes.lc 48:80-48:81
+    _b
+testdata/primes.lc 48:80-48:84
+    Int -> Bool
+testdata/primes.lc 48:80-48:92
+    Bool
+testdata/primes.lc 48:82-48:84
+    Int -> Int -> Bool
+testdata/primes.lc 48:85-48:90
+    Int -> Int
+testdata/primes.lc 48:85-48:92
+    Int
+testdata/primes.lc 48:91-48:92
+    Int
+testdata/primes.lc 48:94-48:100
+    [Int]
+testdata/primes.lc 48:104-48:108
+    Int -> [Int]
+testdata/primes.lc 48:104-48:110
+    [Int]
+testdata/primes.lc 48:109-48:110
+    _b
+testdata/primes.lc 50:8-50:10
+    forall a . [a] -> Int -> a
+testdata/primes.lc 50:15-50:16
+    _e
+testdata/primes.lc 50:15-51:28
+    Bool -> _d | _c
+testdata/primes.lc 51:17-51:19
+    [_h]
+testdata/primes.lc 51:20-51:22
+    _k
+testdata/primes.lc 51:24-51:25
+    _k
+testdata/primes.lc 51:24-51:26
+    Int -> Int
+testdata/primes.lc 51:24-51:27
+    Int
+testdata/primes.lc 51:25-51:26
+    Int -> Int -> Int
+testdata/primes.lc 51:26-51:27
+    _b
+testdata/primes.lc 53:1-53:5
+    Int
+testdata/primes.lc 53:8-53:14
+    [Int]
+testdata/primes.lc 53:8-53:17
+    Int -> Int
+testdata/primes.lc 53:8-53:20
+    Int
+testdata/primes.lc 53:15-53:17
+    forall a . [a] -> Int -> a
+testdata/primes.lc 53:18-53:20
+    _b
+------------ warnings
+Uncovered pattern(s) at testdata/primes.lc:50:8:
+(x: _) !! 0 = x
+(_ : xs) !! n = xs !! (n-1)
+Missing case(s):
+    [] !! _
\ No newline at end of file
diff --git a/testdata/record01.reject.out b/testdata/record01.reject.out
index 2eb0b0eb..33eb370a 100644
--- a/testdata/record01.reject.out
+++ b/testdata/record01.reject.out
@@ -159,16 +159,11 @@ testdata/record01.reject.lc 7:29-7:32
 testdata/record01.reject.lc 8:23-8:34
     forall (a :: [Type])
       . sameLayerCounts a
-        => HList a
-          -> FrameBuffer (ImageLC (head Type a)) (map Type ImageKind GetImageKind a)
+        => HList a -> FrameBuffer (ImageLC (head a)) (map GetImageKind a)
 testdata/record01.reject.lc 8:23-8:75
     FrameBuffer
       1
-      (map
-        Type
-        ImageKind
-        GetImageKind
-        ' [Image 1 'Depth, Image 1 ('Color (VecScalar 4 Float))])
+      (map GetImageKind ' [Image 1 'Depth, Image 1 ('Color (VecScalar 4 Float))])
 testdata/record01.reject.lc 8:35-8:75
     (Image 1 'Depth, Image 1 ('Color (VecScalar 4 Float)))
 testdata/record01.reject.lc 8:36-8:47
@@ -347,11 +342,11 @@ testdata/record01.reject.lc 19:50-19:62
 testdata/record01.reject.lc 20:23-20:42
     forall (a :: [Type]) (b :: PrimitiveType)
       . RasterContext (HList (Vec 4 Float : a)) b
-        -> HList (map Type Type Interpolated a)
+        -> HList (map Interpolated a)
           -> [Primitive (HList (Vec 4 Float : a)) b]
             -> [Vector 1 (Maybe (SimpleFragment (HList a)))]
 testdata/record01.reject.lc 20:23-20:52
-    HList (map Type Type Interpolated _a)
+    HList (map Interpolated _a)
       -> [Primitive (HList (Vec 4 Float : _a)) 'Triangle]
         -> [Vector 1 (Maybe (SimpleFragment (HList _a)))]
 testdata/record01.reject.lc 20:23-20:63
@@ -418,32 +413,26 @@ testdata/record01.reject.lc 22:61-22:64
 testdata/record01.reject.lc 23:23-23:33
     forall (a :: Nat) (b :: [Type]) c
       . HList b
-        -> (c -> HList (imageType' (map Type ImageKind FragmentOperationKind b)))
+        -> (c -> HList (imageType' (map FragmentOperationKind b)))
           -> [Vector a (Maybe (SimpleFragment c))]
-            -> FrameBuffer a (map Type ImageKind FragmentOperationKind b)
-              -> FrameBuffer a (map Type ImageKind FragmentOperationKind b)
+            -> FrameBuffer a (map FragmentOperationKind b)
+              -> FrameBuffer a (map FragmentOperationKind b)
 testdata/record01.reject.lc 23:23-23:45
     (_a
         -> HList
           (imageType'
             (map
-              Type
-              ImageKind
               FragmentOperationKind
               ' [FragmentOperation 'Depth, FragmentOperation ('Color (VecScalar 4 Float))])))
       -> [Vector _b (Maybe (SimpleFragment _a))]
         -> FrameBuffer
             _b
             (map
-              Type
-              ImageKind
               FragmentOperationKind
               ' [FragmentOperation 'Depth, FragmentOperation ('Color (VecScalar 4 Float))])
           -> FrameBuffer
             _b
             (map
-              Type
-              ImageKind
               FragmentOperationKind
               ' [FragmentOperation 'Depth, FragmentOperation ('Color (VecScalar 4 Float))])
 testdata/record01.reject.lc 23:23-23:60
@@ -451,38 +440,28 @@ testdata/record01.reject.lc 23:23-23:60
       -> FrameBuffer
           _a
           (map
-            Type
-            ImageKind
             FragmentOperationKind
             ' [FragmentOperation 'Depth, FragmentOperation ('Color (VecScalar 4 Float))])
         -> FrameBuffer
           _a
           (map
-            Type
-            ImageKind
             FragmentOperationKind
             ' [FragmentOperation 'Depth, FragmentOperation ('Color (VecScalar 4 Float))])
 testdata/record01.reject.lc 23:23-23:75
     FrameBuffer
         1
         (map
-          Type
-          ImageKind
           FragmentOperationKind
           ' [FragmentOperation 'Depth, FragmentOperation ('Color (VecScalar 4 Float))])
       -> FrameBuffer
         1
         (map
-          Type
-          ImageKind
           FragmentOperationKind
           ' [FragmentOperation 'Depth, FragmentOperation ('Color (VecScalar 4 Float))])
 testdata/record01.reject.lc 23:23-23:83
     FrameBuffer
       1
       (map
-        Type
-        ImageKind
         FragmentOperationKind
         ' [FragmentOperation 'Depth, FragmentOperation ('Color (VecScalar 4 Float))])
 testdata/record01.reject.lc 23:34-23:45
@@ -494,11 +473,7 @@ testdata/record01.reject.lc 23:61-23:75
 testdata/record01.reject.lc 23:76-23:83
     FrameBuffer
       1
-      (map
-        Type
-        ImageKind
-        GetImageKind
-        ' [Image 1 'Depth, Image 1 ('Color (VecScalar 4 Float))])
+      (map GetImageKind ' [Image 1 'Depth, Image 1 ('Color (VecScalar 4 Float))])
 testdata/record01.reject.lc 24:12-24:58
     RecordC
       ' ['RecItem "fieldA" Float
@@ -507,8 +482,6 @@ testdata/record01.reject.lc 24:12-24:58
         (FrameBuffer
           1
           (map
-            Type
-            ImageKind
             FragmentOperationKind
             ' [FragmentOperation 'Depth, FragmentOperation ('Color (VecScalar 4 Float))]))
       , 'RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float)]
@@ -527,13 +500,9 @@ testdata/record01.reject.lc 24:21-24:57
               (FrameBuffer
                 1
                 (map
-                  Type
-                  ImageKind
                   FragmentOperationKind
                   ' [FragmentOperation 'Depth, FragmentOperation ('Color (VecScalar 4 Float))])))
           : map
-            RecItem
-            Type
             recItemType
             ' ['RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float)])
 testdata/record01.reject.lc 24:26-24:32
@@ -544,8 +513,6 @@ testdata/record01.reject.lc 24:34-24:39
     FrameBuffer
       1
       (map
-        Type
-        ImageKind
         FragmentOperationKind
         ' [FragmentOperation 'Depth, FragmentOperation ('Color (VecScalar 4 Float))])
 testdata/record01.reject.lc 24:34-24:57
@@ -553,13 +520,11 @@ testdata/record01.reject.lc 24:34-24:57
       (FrameBuffer
           1
           (map
-            Type
-            ImageKind
             FragmentOperationKind
             ' [FragmentOperation 'Depth, FragmentOperation ('Color (VecScalar 4 Float))])
         : recItemType
             ('RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float))
-          : map RecItem Type recItemType ' [])
+          : map recItemType ' [])
 testdata/record01.reject.lc 24:41-24:47
     String | RecItem | [RecItem]
 testdata/record01.reject.lc 24:49-24:57
@@ -574,8 +539,6 @@ testdata/record01.reject.lc 25:11-25:17
         (FrameBuffer
           1
           (map
-            Type
-            ImageKind
             FragmentOperationKind
             ' [FragmentOperation 'Depth, FragmentOperation ('Color (VecScalar 4 Float))]))
       , 'RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float)]
@@ -593,8 +556,6 @@ testdata/record01.reject.lc 26:15-26:21
         (FrameBuffer
           1
           (map
-            Type
-            ImageKind
             FragmentOperationKind
             ' [FragmentOperation 'Depth, FragmentOperation ('Color (VecScalar 4 Float))]))
       , 'RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float)]
diff --git a/testdata/record02.out b/testdata/record02.out
index ce80a224..7ae0ead7 100644
--- a/testdata/record02.out
+++ b/testdata/record02.out
@@ -79,7 +79,7 @@ v3
     , 'RecItem
       "v2"
       (RecordC ' ['RecItem "x" Float, 'RecItem "y" Float, 'RecItem "z" Float])]
-v3 = _rhs (RecordCons (RecordCons (1.0, 0.0), RecordCons (1.0, 0.0, 10.0)))
+v3 = _rhs (RecordCons (v1, v2))
 
 x
   :: forall a (b :: [RecItem])
@@ -91,14 +91,7 @@ x
               (RecordC ' ['RecItem "x" Float, 'RecItem "y" Float, 'RecItem "z" Float])]
           -> RecordC b)
         -> a
-x
-  = \a b c d -> _rhs
-    (project
-      a
-      b
-      "x"
-      c
-      (d (RecordCons (RecordCons (1.0, 0.0), RecordCons (1.0, 0.0, 10.0)))))
+x = \a b c d -> _rhs (project a b "x" c (d v3))
 
 z
   :: forall a (b :: [RecItem])
@@ -121,17 +114,7 @@ z
       b
       "v"
       c
-      (project
-        ('RecordC b)
-        d
-        "c"
-        e
-        (project
-          ('RecordC d)
-          f
-          "x"
-          g
-          (h (RecordCons (RecordCons (1.0, 0.0), RecordCons (1.0, 0.0, 10.0)))))))
+      (project ('RecordC b) d "c" e (project ('RecordC d) f "x" g (h v3))))
 ------------ tooltips
 testdata/record02.lc 1:1-1:3
     RecordC ' ['RecItem "x" Float, 'RecItem "y" Float]
@@ -144,8 +127,7 @@ testdata/record02.lc 1:7-1:14
 testdata/record02.lc 1:9-1:12
     Float
 testdata/record02.lc 1:9-1:18
-    HList
-      (Float : recItemType ('RecItem "y" Float) : map RecItem Type recItemType ' [])
+    HList (Float : recItemType ('RecItem "y" Float) : map recItemType ' [])
 testdata/record02.lc 1:13-1:14
     String | RecItem | [RecItem]
 testdata/record02.lc 1:15-1:18
@@ -163,8 +145,7 @@ testdata/record02.lc 2:9-2:12
 testdata/record02.lc 2:9-2:25
     HList
       (Float
-        : recItemType ('RecItem "y" Float)
-          : map RecItem Type recItemType ' ['RecItem "z" Float])
+        : recItemType ('RecItem "y" Float) : map recItemType ' ['RecItem "z" Float])
 testdata/record02.lc 2:13-2:14
     String | RecItem
 testdata/record02.lc 2:13-2:20
@@ -172,8 +153,7 @@ testdata/record02.lc 2:13-2:20
 testdata/record02.lc 2:15-2:18
     Float
 testdata/record02.lc 2:15-2:25
-    HList
-      (Float : recItemType ('RecItem "z" Float) : map RecItem Type recItemType ' [])
+    HList (Float : recItemType ('RecItem "z" Float) : map recItemType ' [])
 testdata/record02.lc 2:19-2:20
     String | RecItem | [RecItem]
 testdata/record02.lc 2:21-2:25
@@ -203,7 +183,7 @@ testdata/record02.lc 3:10-3:19
             ('RecItem
               "v2"
               (RecordC ' ['RecItem "x" Float, 'RecItem "y" Float, 'RecItem "z" Float]))
-          : map RecItem Type recItemType ' [])
+          : map recItemType ' [])
 testdata/record02.lc 3:14-3:16
     String | RecItem | [RecItem]
 testdata/record02.lc 3:17-3:19
diff --git a/testdata/reduce06.out b/testdata/reduce06.out
index 2ddd9a75..f9da2c5d 100644
--- a/testdata/reduce06.out
+++ b/testdata/reduce06.out
@@ -6,7 +6,7 @@ constf = _lhs constf (_rhs \(a :: _) (_ :: _) -> a)
 main = _lhs main (_rhs ((\(a :: _) -> constf a False) True))
 ------------ core code
 constf :: forall a b . a -> b -> a
-constf = \_ _ -> _rhs \a _ -> a
+constf = \a b -> _rhs \c _ -> c
 
 main :: Bool
 main = _rhs True
diff --git a/testdata/swizzling.out b/testdata/swizzling.out
index 295c8736..22c5d02a 100644
--- a/testdata/swizzling.out
+++ b/testdata/swizzling.out
@@ -34,7 +34,7 @@ v :: VecS Float 3
 v = _rhs (V3 1.0 2.0 3.0)
 
 v2 :: VecS Float 2
-v2 = _rhs (V2 1.0 1.0)
+v2 = _rhs (V2 (swizzscalar 'Float 3 v Sx) (swizzscalar 'Float 3 v Sx))
 
 v3 :: Float
 v3 = _rhs 1.0
diff --git a/testdata/traceTest.out b/testdata/traceTest.out
index 9c5545d5..215f950a 100644
--- a/testdata/traceTest.out
+++ b/testdata/traceTest.out
@@ -15,7 +15,7 @@ case'X :: forall a (b :: a) . forall (c :: X a b -> Type) (d :: X a b) -> c d
 case'X = \_ _ a b -> <<case function of a type with 2 parameters>>
 
 id :: forall a . a -> a
-id = \_ a -> _rhs a
+id = \a b -> _rhs b
 
 match'X
   :: forall (a :: Type -> Type)
diff --git a/testdata/typeclass.out b/testdata/typeclass.out
index 0280bed1..03702cd7 100644
--- a/testdata/typeclass.out
+++ b/testdata/typeclass.out
@@ -52,17 +52,18 @@ not
 (/=) = _lhs (/=) \(a :: _) (b :: _) -> _rhs (not (a == b))
 
 (==.)
-  = _lhs
-    (==.)
-    \(a :: _) (b :: _) -> case'List
-      (\(_ :: _) -> _)
-      (case'List (\(_ :: _) -> _) (_rhs True) (\(_ :: _) (_ :: _) -> _rhs False) b)
-      (\(_ :: _) (c :: _) -> case'List
+  = primFix
+    \(a :: _) -> _lhs
+      (==.)
+      \(b :: _) (c :: _) -> case'List
         (\(_ :: _) -> _)
-        (_rhs False)
-        (\(_ :: _) (d :: _) -> _rhs (c ==. d))
-        b)
-      a
+        (case'List (\(_ :: _) -> _) (_rhs True) (\(_ :: _) (_ :: _) -> _rhs False) c)
+        (\(_ :: _) (d :: _) -> case'List
+          (\(_ :: _) -> _)
+          (_rhs False)
+          (\(_ :: _) (e :: _) -> _rhs (a d e))
+          c)
+        b
 ------------ core code
 && :: Bool -> Bool -> Bool
 && = \a b -> case'Bool (\_ -> 'Bool) (_rhs False) (_rhs b) a
@@ -89,7 +90,7 @@ not
 ==. :: forall a b . [a] -> [b] -> Bool
 ==.
   = \a b -> primFix
-    ([a] -> [b] -> 'Bool)
+    _
     \c d e -> case'List
       (\_ -> 'Bool)
       (case'List (\_ -> 'Bool) (_rhs True) (\_ _ -> _rhs False) e)
diff --git a/testdata/typesig.reject.out b/testdata/typesig.reject.out
index 60f0c6c8..f6e2660e 100644
--- a/testdata/typesig.reject.out
+++ b/testdata/typesig.reject.out
@@ -1,28 +1,18 @@
-focus checkMetas:
-\(a :: Type) -> ((\b -> primFix a b) :: (a -> a) -> a)
-  let a = Type in \(c :: Type) -> <<HERE>>
----
-\(a :: CW (Type ~ _a)) (b :: CW (_a ~ X)) -> typeAnn _a (_rhs X) :: _a
+can't find: x in testdata/typesig.reject.lc:6:6:
+x :: x
+     ^
 ------------ trace
 'X :: Type
 X :: X
 case'X :: forall (a :: X -> Type) -> a 'X -> forall (b :: X) -> a b
 match'X :: forall (a :: Type -> Type) -> a X -> forall b -> a b -> a b
-!focus checkMetas:
-\(a :: Type) -> ((\b -> primFix a b) :: (a -> a) -> a)
-  let a = Type in \(c :: Type) -> <<HERE>>
----
-\(a :: CW (Type ~ _a)) (b :: CW (_a ~ X)) -> typeAnn _a (_rhs X) :: _a
+!can't find: x in testdata/typesig.reject.lc:6:6:
+x :: x
+     ^
 ------------ tooltips
 testdata/typesig.reject.lc 4:6-4:7
     Type | Type | Type | Type | Type
 testdata/typesig.reject.lc 4:6-4:11
     Type
 testdata/typesig.reject.lc 4:10-4:11
-    X
-testdata/typesig.reject.lc 6:6-6:7
-    _b
-testdata/typesig.reject.lc 6:6-7:6
-    _c
-testdata/typesig.reject.lc 7:5-7:6
     X
\ No newline at end of file
diff --git a/testdata/where.out b/testdata/where.out
index eb30398d..4160f7af 100644
--- a/testdata/where.out
+++ b/testdata/where.out
@@ -1,12 +1,6 @@
 main is not found
 ------------ desugared source code
-f
-  = _lhs
-    f
-    (_rhs
-      let
-        a = _lhs z (_rhs let c = _lhs y (_rhs 1.0) in c); b = _lhs x (_rhs 1.0)
-        in b)
+f = _lhs f (_rhs let a = let c = 1.0 in c; b = 1.0 in b)
 ------------ core code
 f :: Float
 f = _rhs 1.0
diff --git a/testdata/zip01.out b/testdata/zip01.out
index b34b81e2..3a14fa8a 100644
--- a/testdata/zip01.out
+++ b/testdata/zip01.out
@@ -2,38 +2,37 @@ main is not found
 ------------ desugared source code
 zip2 :: forall (a :: _) (b :: _) . [a] -> [b] -> [(a, b)]
 zip2
-  = _lhs
-    zip2
-    \(a :: _) (b :: _) -> case'List
-      (\(_ :: _) -> _)
-      (_rhs [])
-      (\(c :: _) (d :: _) -> case'List
+  = primFix
+    \(a :: forall (b :: _) (c :: _) . [b] -> [c] -> [(b, c)]) -> _lhs
+      zip2
+      \(d :: _) (e :: _) -> case'List
         (\(_ :: _) -> _)
         (_rhs [])
-        (\(e :: _) (f :: _) -> _rhs ((c, e) : zip2 d f))
-        b)
-      a
+        (\(f :: _) (g :: _) -> case'List
+          (\(_ :: _) -> _)
+          (_rhs [])
+          (\(h :: _) (i :: _) -> _rhs ((f, h) : a g i))
+          e)
+        d
 ------------ core code
 zip2 :: forall a b . [a] -> [b] -> [(a, b)]
 zip2
   = primFix
-    (forall a b . [a] -> [b] -> [' (a, b)])
-    \c d e f g -> case'List
-      (\_ -> [' (d, e)])
+    _
+    \a b c d e -> case'List
+      (\_ -> [' (b, c)])
       (_rhs [])
-      (\h i -> case'List
-        (\_ -> [' (d, e)])
+      (\f g -> case'List
+        (\_ -> [' (b, c)])
         (_rhs [])
-        (\j k -> _rhs ((h, j) : c d e i k))
-        g)
-      f
+        (\h i -> _rhs ((f, h) : a b c g i))
+        e)
+      d
 ------------ tooltips
 testdata/zip01.lc 1:9-1:12
     Type
 testdata/zip01.lc 1:9-1:30
     Type | Type
-testdata/zip01.lc 1:9-4:40
-    forall a b . [a] -> [b] -> [(a, b)]
 testdata/zip01.lc 1:10-1:11
     _d
 testdata/zip01.lc 1:16-1:19