fix pretty print

11 files changed, 96 insertions, 114 deletions

diff --git a/testdata/Builtins.out b/testdata/Builtins.out
index a89bcaee..314c01c4 100644
--- a/testdata/Builtins.out
+++ b/testdata/Builtins.out
@@ -1855,15 +1855,15 @@ match'Interpolated
     -> (forall b -> a (Interpolated b)) -> forall c -> a c -> a c
 rasterizePrimitive
   :: forall (a :: [Type]) (b :: [Type]) (c :: [Type]) (d :: PrimitiveType)
-    . (map Type Type Interpolated a ~ b, c ~ : (Vec 4 Float) a)
+    . (map Type Type Interpolated a ~ b, c ~ Vec 4 Float : a)
       => HList b
         -> RasterContext (HList c) d
           -> Primitive (HList c) d -> FragmentStream 1 (HList a)
 rasterizePrimitives
   :: forall (a :: [Type]) (b :: PrimitiveType)
-    . RasterContext (HList (: (Vec 4 Float) a)) b
+    . RasterContext (HList (Vec 4 Float : a)) b
       -> HList (map Type Type Interpolated a)
-        -> [Primitive (HList (: (Vec 4 Float) a)) b]
+        -> [Primitive (HList (Vec 4 Float : a)) b]
           -> [Vector 1 (Maybe (SimpleFragment (HList a)))]
 'ImageLC :: Type -> Nat
 allSame :: forall a . [a] -> Type
@@ -1909,9 +1909,9 @@ accumulate
         -> [Vector a (Maybe (SimpleFragment c))]
           -> FrameBuffer a (map Type ImageKind FragmentOperationKind b)
             -> FrameBuffer a (map Type ImageKind FragmentOperationKind b)
-PrjImage :: forall (a :: ImageKind) . FrameBuffer 1 (: a '[]) -> Image 1 a
+PrjImage :: forall (a :: ImageKind) . FrameBuffer 1 (a : []) -> Image 1 a
 PrjImageColor
-  :: FrameBuffer 1 (: 'Depth (: ('Color (Vec 4 Float)) '[]))
+  :: FrameBuffer 1 ('Depth : 'Color (Vec 4 Float) : [])
     -> Image 1 ('Color (Vec 4 Float))
 'Output :: Type
 ScreenOut :: forall (a :: Nat) (b :: [ImageKind]) . FrameBuffer a b -> Output
@@ -6595,7 +6595,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, c ~ : (Vec 4 Float) a)
+      . (map Type Type Interpolated a ~ b, c ~ Vec 4 Float : a)
         => HList b
           -> RasterContext (HList c) d
             -> Primitive (HList c) d -> FragmentStream 1 (HList a)
@@ -6703,9 +6703,9 @@ testdata/Builtins.lc 486:32-486:33
     [Type]
 testdata/Builtins.lc 488:1-488:20
     forall (a :: [Type]) (b :: PrimitiveType)
-      . RasterContext (HList (: (Vec 4 Float) a)) b
+      . RasterContext (HList (Vec 4 Float : a)) b
         -> HList (map Type Type Interpolated a)
-          -> [Primitive (HList (: (Vec 4 Float) a)) b]
+          -> [Primitive (HList (Vec 4 Float : a)) b]
             -> [Vector 1 (Maybe (SimpleFragment (HList a)))]
 testdata/Builtins.lc 488:32-488:38
     forall a . [[a]] -> [a]
@@ -6714,20 +6714,20 @@ testdata/Builtins.lc 488:32-488:74
 testdata/Builtins.lc 488:40-488:43
     forall a b . (a -> b) -> [a] -> [b]
 testdata/Builtins.lc 488:40-488:71
-    [Primitive (HList (: (Vec 4 Float) _b)) _a] -> [[Fragment 1 (HList _b)]]
+    [Primitive (HList (Vec 4 Float : _b)) _a] -> [[Fragment 1 (HList _b)]]
 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, c ~ : (Vec 4 Float) a)
+      . (map Type Type Interpolated a ~ b, c ~ Vec 4 Float : a)
         => HList b
           -> RasterContext (HList c) d
             -> Primitive (HList c) d -> FragmentStream 1 (HList a)
 testdata/Builtins.lc 488:45-488:66
-    RasterContext (HList (: (Vec 4 Float) _b)) _a
-      -> Primitive (HList (: (Vec 4 Float) _b)) _a -> FragmentStream 1 (HList _b)
+    RasterContext (HList (Vec 4 Float : _b)) _a
+      -> Primitive (HList (Vec 4 Float : _b)) _a -> FragmentStream 1 (HList _b)
 testdata/Builtins.lc 488:45-488:70
-    Primitive (HList (: (Vec 4 Float) _b)) _a -> FragmentStream 1 (HList _b)
+    Primitive (HList (Vec 4 Float : _b)) _a -> FragmentStream 1 (HList _b)
 testdata/Builtins.lc 488:64-488:66
     _i
 testdata/Builtins.lc 488:67-488:70
@@ -7095,7 +7095,7 @@ testdata/Builtins.lc 534:71-534:75
 testdata/Builtins.lc 534:77-534:79
     _e
 testdata/Builtins.lc 537:1-537:9
-    forall (a :: ImageKind) . FrameBuffer 1 (: a '[]) -> Image 1 a
+    forall (a :: ImageKind) . FrameBuffer 1 (a : []) -> Image 1 a
 testdata/Builtins.lc 537:24-537:35
     Nat -> [ImageKind] -> Type
 testdata/Builtins.lc 537:24-537:37
@@ -7121,7 +7121,7 @@ testdata/Builtins.lc 537:52-537:53
 testdata/Builtins.lc 537:54-537:55
     ImageKind
 testdata/Builtins.lc 538:1-538:14
-    FrameBuffer 1 (: 'Depth (: ('Color (Vec 4 Float)) '[]))
+    FrameBuffer 1 ('Depth : 'Color (Vec 4 Float) : [])
       -> Image 1 ('Color (Vec 4 Float))
 testdata/Builtins.lc 538:24-538:35
     Nat -> [ImageKind] -> Type
diff --git a/testdata/Internals.out b/testdata/Internals.out
index 6b92c14b..a2e3f926 100644
--- a/testdata/Internals.out
+++ b/testdata/Internals.out
@@ -338,18 +338,17 @@ negate :: forall a . Num a => a -> a
 case'List
   :: forall a
     . forall (b :: [a] -> Type)
-      -> b '[]
-        -> (forall (c :: a) (d :: [a]) -> b (: c d)) -> forall (e :: [a]) -> b e
+      -> b [] -> (forall (c :: a) (d :: [a]) -> b (c : d)) -> forall (e :: [a]) -> b e
 match'List
   :: forall (a :: Type -> Type) -> (forall b -> a [b]) -> forall c -> a c -> a c
 'HList :: [Type] -> Type
 HNil :: ()
-HCons :: forall a (b :: [Type]) . a -> HList b -> HList (: a b)
+HCons :: forall a (b :: [Type]) . a -> HList b -> HList (a : b)
 case'HList
   :: forall (a :: forall (b :: [Type]) -> HList b -> Type)
-    -> a '[] ()
+    -> a [] ()
       -> (forall c (d :: [Type])
-          . forall (e :: c) (f :: HList d) -> a (: c d) ('HCons c d e f))
+          . forall (e :: c) (f :: HList d) -> a (c : d) ('HCons c d e f))
         -> forall (g :: [Type]) . forall (h :: HList g) -> a g h
 match'HList
   :: forall (a :: Type -> Type)
@@ -357,7 +356,7 @@ match'HList
 hlistNilCase :: forall a -> a -> () -> a
 hlistConsCase
   :: forall a (b :: [Type])
-    . forall c -> (a -> HList b -> c) -> HList (: a b) -> c
+    . forall c -> (a -> HList b -> c) -> HList (a : b) -> c
 ------------ tooltips
 testdata/Internals.lc 6:1-6:8
     forall a . a -> a
@@ -904,7 +903,7 @@ testdata/Internals.lc 127:13-127:22
 testdata/Internals.lc 127:19-127:22
     forall a . [a] | forall a . [a]
 testdata/Internals.lc 128:5-128:10
-    forall a (b :: [Type]) . a -> HList b -> HList (: a b) | HList (: _d _c)
+    forall a (b :: [Type]) . a -> HList b -> HList (a : b) | HList (_d : _c)
 testdata/Internals.lc 128:5-128:45
     Type | Type | Type | Type | Type
 testdata/Internals.lc 128:14-128:15
@@ -950,7 +949,7 @@ testdata/Internals.lc 130:40-130:43
 testdata/Internals.lc 130:47-130:48
     Type | Type
 testdata/Internals.lc 131:1-131:14
-    forall a (b :: [Type]) . forall c -> (a -> HList b -> c) -> HList (: a b) -> c
+    forall a (b :: [Type]) . forall c -> (a -> HList b -> c) -> HList (a : b) -> c
 testdata/Internals.lc 132:21-132:25
     Type
 testdata/Internals.lc 132:33-132:37
diff --git a/testdata/Prelude.out b/testdata/Prelude.out
index a1e29933..7e0353ff 100644
--- a/testdata/Prelude.out
+++ b/testdata/Prelude.out
@@ -687,8 +687,8 @@ match'RecordC
   :: forall (a :: Type -> Type)
     -> (forall (b :: [RecItem]) -> a (RecordC b)) -> forall c -> a c -> a c
 isKeyC :: String -> Type -> [RecItem] -> Type
-fstTup :: forall a (b :: [Type]) . HList (: a b) -> a
-sndTup :: forall a (b :: [Type]) . HList (: a b) -> HList b
+fstTup :: forall a (b :: [Type]) . HList (a : b) -> a
+sndTup :: forall a (b :: [Type]) . HList (a : b) -> HList b
 project
   :: forall a (b :: [RecItem])
     . forall (c :: String) -> isKeyC c a b => RecordC b -> a
@@ -1468,23 +1468,23 @@ testdata/Prelude.lc 130:71-130:72
 testdata/Prelude.lc 130:73-130:75
     [_i]
 testdata/Prelude.lc 132:1-132:7
-    forall a (b :: [Type]) . HList (: a b) -> a
+    forall a (b :: [Type]) . HList (a : b) -> a
 testdata/Prelude.lc 132:10-132:23
-    forall a (b :: [Type]) . forall c -> (a -> HList b -> c) -> HList (: a b) -> c
+    forall a (b :: [Type]) . forall c -> (a -> HList b -> c) -> HList (a : b) -> c
 testdata/Prelude.lc 132:10-132:25
-    (_c -> HList _b -> _a) -> HList (: _c _b) -> _a
+    (_c -> HList _b -> _a) -> HList (_c : _b) -> _a
 testdata/Prelude.lc 132:10-132:37
-    HList (: _b _a) -> _b
+    HList (_b : _a) -> _b
 testdata/Prelude.lc 132:35-132:36
     _e
 testdata/Prelude.lc 133:1-133:7
-    forall a (b :: [Type]) . HList (: a b) -> HList b
+    forall a (b :: [Type]) . HList (a : b) -> HList b
 testdata/Prelude.lc 133:10-133:23
-    forall a (b :: [Type]) . forall c -> (a -> HList b -> c) -> HList (: a b) -> c
+    forall a (b :: [Type]) . forall c -> (a -> HList b -> c) -> HList (a : b) -> c
 testdata/Prelude.lc 133:10-133:25
-    (_c -> HList _b -> _a) -> HList (: _c _b) -> _a
+    (_c -> HList _b -> _a) -> HList (_c : _b) -> _a
 testdata/Prelude.lc 133:10-133:37
-    HList (: _b _a) -> HList _a
+    HList (_b : _a) -> HList _a
 testdata/Prelude.lc 133:35-133:36
     HList _d
 testdata/Prelude.lc 136:12-138:181
@@ -1542,7 +1542,7 @@ testdata/Prelude.lc 137:59-137:61
 testdata/Prelude.lc 137:62-137:64
     String
 testdata/Prelude.lc 137:67-137:73
-    forall a (b :: [Type]) . HList (: a b) -> a
+    forall a (b :: [Type]) . HList (a : b) -> a
 testdata/Prelude.lc 137:67-137:129
     _n
 testdata/Prelude.lc 137:67-138:181
@@ -1552,9 +1552,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 RecItem Type recItemType _j)
 testdata/Prelude.lc 137:75-137:128
-    HList (: _n (map RecItem Type recItemType _g))
+    HList (_n : map RecItem Type recItemType _g)
 testdata/Prelude.lc 137:93-137:98
     [Type] -> Type
 testdata/Prelude.lc 137:93-137:124
@@ -1622,7 +1622,7 @@ testdata/Prelude.lc 138:105-138:115
 testdata/Prelude.lc 138:105-138:180
     RecordC _b
 testdata/Prelude.lc 138:117-138:123
-    forall a (b :: [Type]) . HList (: a b) -> HList b
+    forall a (b :: [Type]) . HList (a : b) -> HList b
 testdata/Prelude.lc 138:117-138:179
     HList (map RecItem Type recItemType _h)
 testdata/Prelude.lc 138:125-138:137
@@ -1630,9 +1630,9 @@ testdata/Prelude.lc 138:125-138:137
 testdata/Prelude.lc 138:125-138:140
     forall a . _a -> a
 testdata/Prelude.lc 138:125-138:175
-    _a -> HList (: _r (map RecItem Type recItemType _k))
+    _a -> HList (_r : map RecItem Type recItemType _k)
 testdata/Prelude.lc 138:125-138:178
-    HList (: _o (map RecItem Type recItemType _h))
+    HList (_o : map RecItem Type recItemType _h)
 testdata/Prelude.lc 138:143-138:148
     [Type] -> Type
 testdata/Prelude.lc 138:143-138:174
diff --git a/testdata/framebuffer02.reject.out b/testdata/framebuffer02.reject.out
index 1899ff29..3280dc3c 100644
--- a/testdata/framebuffer02.reject.out
+++ b/testdata/framebuffer02.reject.out
@@ -32,11 +32,9 @@ testdata/framebuffer02.reject.lc 2:17-5:30
         Type
         ImageKind
         GetImageKind
-        (:
-          (Image 1 ('Color (VecScalar 4 Float)))
-          (:
-            (Image 2 ('Color (VecScalar 4 Float)))
-            (: (Image 1 ('Color (VecScalar 1 Float))) '[]))))
+        (Image 1 ('Color (VecScalar 4 Float))
+          : Image 2 ('Color (VecScalar 4 Float))
+            : Image 1 ('Color (VecScalar 1 Float)) : []))
 testdata/framebuffer02.reject.lc 2:29-5:30
     (Image 1 ('Color (VecScalar 4 Float)), Image
           2
diff --git a/testdata/language-features/adt/adt05.out b/testdata/language-features/adt/adt05.out
index 88d050b1..2f1af5ee 100644
--- a/testdata/language-features/adt/adt05.out
+++ b/testdata/language-features/adt/adt05.out
@@ -1 +1,3 @@
-main
\ No newline at end of file
+testdata/language-features/adt/adt05.lc:14:1:
+main = isEmpty value1 && isCons value2
+^^^^
\ No newline at end of file
diff --git a/testdata/language-features/as-pattern/as-pattern01.out b/testdata/language-features/as-pattern/as-pattern01.out
index 88d050b1..da679416 100644
--- a/testdata/language-features/as-pattern/as-pattern01.out
+++ b/testdata/language-features/as-pattern/as-pattern01.out
@@ -1 +1,3 @@
-main
\ No newline at end of file
+testdata/language-features/as-pattern/as-pattern01.lc:8:1:
+main = g 3 1 == 5
+^^^^
\ No newline at end of file
diff --git a/testdata/language-features/as-pattern/as-pattern02.out b/testdata/language-features/as-pattern/as-pattern02.out
index 88d050b1..cb9cee50 100644
--- a/testdata/language-features/as-pattern/as-pattern02.out
+++ b/testdata/language-features/as-pattern/as-pattern02.out
@@ -1 +1,3 @@
-main
\ No newline at end of file
+testdata/language-features/as-pattern/as-pattern02.lc:7:1:
+main = f [0,1] == [1] && f [1] == [1]
+^^^^
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/dotdot01.out b/testdata/language-features/basic-list/dotdot01.out
index 36d7c623..4fb37291 100644
--- a/testdata/language-features/basic-list/dotdot01.out
+++ b/testdata/language-features/basic-list/dotdot01.out
@@ -1,3 +1 @@
-:
-  1.0
-  (: 2.0 (: 3.0 (: 4.0 (: 5.0 (: 6.0 (: 7.0 (: 8.0 (: 9.0 (: 10.0 [])))))))))
\ No newline at end of file
+1.0 : 2.0 : 3.0 : 4.0 : 5.0 : 6.0 : 7.0 : 8.0 : 9.0 : 10.0 : []
\ No newline at end of file
diff --git a/testdata/record01.reject.out b/testdata/record01.reject.out
index 881ed1b1..39ad1ab3 100644
--- a/testdata/record01.reject.out
+++ b/testdata/record01.reject.out
@@ -170,7 +170,7 @@ testdata/record01.reject.lc 8:23-8:75
         Type
         ImageKind
         GetImageKind
-        (: (Image 1 'Depth) (: (Image 1 ('Color (VecScalar 4 Float))) '[])))
+        (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
@@ -348,16 +348,16 @@ testdata/record01.reject.lc 19:50-19:62
     forall (a :: PrimitiveType) . PrimitiveStream a ((Vec 4 Float))
 testdata/record01.reject.lc 20:23-20:42
     forall (a :: [Type]) (b :: PrimitiveType)
-      . RasterContext (HList (: (Vec 4 Float) a)) b
+      . RasterContext (HList (Vec 4 Float : a)) b
         -> HList (map Type Type Interpolated a)
-          -> [Primitive (HList (: (Vec 4 Float) a)) b]
+          -> [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)
-      -> [Primitive (HList (: (Vec 4 Float) _a)) 'Triangle]
+      -> [Primitive (HList (Vec 4 Float : _a)) 'Triangle]
         -> [Vector 1 (Maybe (SimpleFragment (HList _a)))]
 testdata/record01.reject.lc 20:23-20:63
-    [Primitive (HList (: (Vec 4 Float) _d)) 'Triangle]
+    [Primitive (HList (Vec 4 Float : _d)) 'Triangle]
       -> [Vector 1 (Maybe (SimpleFragment (HList _d)))]
 testdata/record01.reject.lc 20:23-20:79
     [Vector 1 (Maybe (SimpleFragment ((VecS Float 4))))]
@@ -435,18 +435,16 @@ testdata/record01.reject.lc 23:23-23:45
               Type
               ImageKind
               FragmentOperationKind
-              (:
-                (FragmentOperation 'Depth)
-                (: (FragmentOperation ('Color (VecScalar 4 Float))) '[])))
+              (FragmentOperation 'Depth
+                : FragmentOperation ('Color (VecScalar 4 Float)) : []))
           -> FrameBuffer
             _b
             (map
               Type
               ImageKind
               FragmentOperationKind
-              (:
-                (FragmentOperation 'Depth)
-                (: (FragmentOperation ('Color (VecScalar 4 Float))) '[])))
+              (FragmentOperation 'Depth
+                : FragmentOperation ('Color (VecScalar 4 Float)) : []))
 testdata/record01.reject.lc 23:23-23:60
     [Vector _a (Maybe (SimpleFragment ((VecS Float 4))))]
       -> FrameBuffer
@@ -455,18 +453,16 @@ testdata/record01.reject.lc 23:23-23:60
             Type
             ImageKind
             FragmentOperationKind
-            (:
-              (FragmentOperation 'Depth)
-              (: (FragmentOperation ('Color (VecScalar 4 Float))) '[])))
+            (FragmentOperation 'Depth
+              : FragmentOperation ('Color (VecScalar 4 Float)) : []))
         -> FrameBuffer
           _a
           (map
             Type
             ImageKind
             FragmentOperationKind
-            (:
-              (FragmentOperation 'Depth)
-              (: (FragmentOperation ('Color (VecScalar 4 Float))) '[])))
+            (FragmentOperation 'Depth
+              : FragmentOperation ('Color (VecScalar 4 Float)) : []))
 testdata/record01.reject.lc 23:23-23:75
     FrameBuffer
         1
@@ -474,18 +470,16 @@ testdata/record01.reject.lc 23:23-23:75
           Type
           ImageKind
           FragmentOperationKind
-          (:
-            (FragmentOperation 'Depth)
-            (: (FragmentOperation ('Color (VecScalar 4 Float))) '[])))
+          (FragmentOperation 'Depth
+            : FragmentOperation ('Color (VecScalar 4 Float)) : []))
       -> FrameBuffer
         1
         (map
           Type
           ImageKind
           FragmentOperationKind
-          (:
-            (FragmentOperation 'Depth)
-            (: (FragmentOperation ('Color (VecScalar 4 Float))) '[])))
+          (FragmentOperation 'Depth
+            : FragmentOperation ('Color (VecScalar 4 Float)) : []))
 testdata/record01.reject.lc 23:23-23:83
     FrameBuffer
       1
@@ -493,9 +487,8 @@ testdata/record01.reject.lc 23:23-23:83
         Type
         ImageKind
         FragmentOperationKind
-        (:
-          (FragmentOperation 'Depth)
-          (: (FragmentOperation ('Color (VecScalar 4 Float))) '[])))
+        (FragmentOperation 'Depth
+          : FragmentOperation ('Color (VecScalar 4 Float)) : []))
 testdata/record01.reject.lc 23:34-23:45
     (FragmentOperation 'Depth, FragmentOperation ('Color (VecScalar 4 Float)))
 testdata/record01.reject.lc 23:46-23:60
@@ -509,13 +502,11 @@ testdata/record01.reject.lc 23:76-23:83
         Type
         ImageKind
         GetImageKind
-        (: (Image 1 'Depth) (: (Image 1 ('Color (VecScalar 4 Float))) '[])))
+        (Image 1 'Depth : Image 1 ('Color (VecScalar 4 Float)) : []))
 testdata/record01.reject.lc 24:12-24:58
     RecordC
-      (:
-        ('RecItem "fieldA" Float)
-        (:
-          ('RecItem
+      ('RecItem "fieldA" Float
+        : 'RecItem
             "fieldB"
             (FrameBuffer
               1
@@ -523,10 +514,9 @@ testdata/record01.reject.lc 24:12-24:58
                 Type
                 ImageKind
                 FragmentOperationKind
-                (:
-                  (FragmentOperation 'Depth)
-                  (: (FragmentOperation ('Color (VecScalar 4 Float))) '[])))))
-          (: ('RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float)) '[])))
+                (FragmentOperation 'Depth
+                  : FragmentOperation ('Color (VecScalar 4 Float)) : [])))
+          : 'RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float) : [])
 testdata/record01.reject.lc 24:13-24:19
     String | RecItem
 testdata/record01.reject.lc 24:13-24:47
@@ -543,9 +533,8 @@ testdata/record01.reject.lc 24:21-24:57
                 Type
                 ImageKind
                 FragmentOperationKind
-                (:
-                  (FragmentOperation 'Depth)
-                  (: (FragmentOperation ('Color (VecScalar 4 Float))) '[]))))), recItemType
+                (FragmentOperation 'Depth
+                  : FragmentOperation ('Color (VecScalar 4 Float)) : [])))), recItemType
           ('RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float)))
 testdata/record01.reject.lc 24:26-24:32
     String | RecItem
@@ -558,9 +547,8 @@ testdata/record01.reject.lc 24:34-24:39
         Type
         ImageKind
         FragmentOperationKind
-        (:
-          (FragmentOperation 'Depth)
-          (: (FragmentOperation ('Color (VecScalar 4 Float))) '[])))
+        (FragmentOperation 'Depth
+          : FragmentOperation ('Color (VecScalar 4 Float)) : []))
 testdata/record01.reject.lc 24:34-24:57
     (FrameBuffer
         1
@@ -568,9 +556,8 @@ testdata/record01.reject.lc 24:34-24:57
           Type
           ImageKind
           FragmentOperationKind
-          (:
-            (FragmentOperation 'Depth)
-            (: (FragmentOperation ('Color (VecScalar 4 Float))) '[]))), recItemType
+          (FragmentOperation 'Depth
+            : FragmentOperation ('Color (VecScalar 4 Float)) : [])), recItemType
         ('RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float)))
 testdata/record01.reject.lc 24:41-24:47
     String | RecItem | [RecItem]
@@ -579,10 +566,8 @@ testdata/record01.reject.lc 24:49-24:57
       -> Blending Float | (((BlendEquation, BlendEquation) -> Blending Float))
 testdata/record01.reject.lc 25:11-25:17
     RecordC
-      (:
-        ('RecItem "fieldA" Float)
-        (:
-          ('RecItem
+      ('RecItem "fieldA" Float
+        : 'RecItem
             "fieldB"
             (FrameBuffer
               1
@@ -590,10 +575,9 @@ testdata/record01.reject.lc 25:11-25:17
                 Type
                 ImageKind
                 FragmentOperationKind
-                (:
-                  (FragmentOperation 'Depth)
-                  (: (FragmentOperation ('Color (VecScalar 4 Float))) '[])))))
-          (: ('RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float)) '[])))
+                (FragmentOperation 'Depth
+                  : FragmentOperation ('Color (VecScalar 4 Float)) : [])))
+          : 'RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float) : [])
 testdata/record01.reject.lc 25:11-25:24
     _b
 testdata/record01.reject.lc 25:18-25:24
@@ -602,10 +586,8 @@ testdata/record01.reject.lc 26:5-26:14
     forall (a :: Nat) (b :: [ImageKind]) . FrameBuffer a b -> Output
 testdata/record01.reject.lc 26:15-26:21
     RecordC
-      (:
-        ('RecItem "fieldA" Float)
-        (:
-          ('RecItem
+      ('RecItem "fieldA" Float
+        : 'RecItem
             "fieldB"
             (FrameBuffer
               1
@@ -613,10 +595,9 @@ testdata/record01.reject.lc 26:15-26:21
                 Type
                 ImageKind
                 FragmentOperationKind
-                (:
-                  (FragmentOperation 'Depth)
-                  (: (FragmentOperation ('Color (VecScalar 4 Float))) '[])))))
-          (: ('RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float)) '[])))
+                (FragmentOperation 'Depth
+                  : FragmentOperation ('Color (VecScalar 4 Float)) : [])))
+          : 'RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float) : [])
 testdata/record01.reject.lc 26:15-26:28
     _b
 testdata/record01.reject.lc 26:22-26:28
diff --git a/testdata/traceTest.out b/testdata/traceTest.out
index 75428209..41e16221 100644
--- a/testdata/traceTest.out
+++ b/testdata/traceTest.out
@@ -14,7 +14,7 @@ case'X :: forall a (b :: a) . forall (c :: X a b -> Type) (d :: X a b) -> c d
 match'X
   :: forall (a :: Type -> Type)
     -> (forall b . forall (c :: b) -> a (X b c)) -> forall d -> a d -> a d
-x :: X (Type -> Type -> Type) \(a :: Type) (b :: Type) -> (a, b)
+x :: X (Type -> Type -> Type) \a b -> (a, b)
 ------------ tooltips
 testdata/traceTest.lc 6:1-6:3
     forall a . a -> a
@@ -39,6 +39,6 @@ testdata/traceTest.lc 10:19-10:23
 testdata/traceTest.lc 10:22-10:23
     _c | [Type]
 testdata/traceTest.lc 11:1-11:2
-    X (Type -> Type -> Type) \(a :: Type) (b :: Type) -> (a, b)
+    X (Type -> Type -> Type) \a b -> (a, b)
 testdata/traceTest.lc 11:5-11:14
     forall a . a
\ No newline at end of file
diff --git a/testdata/typesig.reject.out b/testdata/typesig.reject.out
index 0561886c..27b06da5 100644
--- a/testdata/typesig.reject.out
+++ b/testdata/typesig.reject.out
@@ -1,4 +1,4 @@
-focus checkMetas: \(a :: Type) -> (\(b :: Type) -> primFix a b)
+focus checkMetas: \(a :: Type) -> (\b -> primFix a b)
   let a = Type in \(c :: Type) -> <<HERE>>
 \(a :: Type ~ _a) (b :: _a ~ X) -> typeAnn _a (_rhs X)
 ------------ trace
@@ -6,7 +6,7 @@ focus checkMetas: \(a :: Type) -> (\(b :: Type) -> primFix a b)
 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 :: Type) -> primFix a b)
+!focus checkMetas: \(a :: Type) -> (\b -> primFix a b)
   let a = Type in \(c :: Type) -> <<HERE>>
 \(a :: Type ~ _a) (b :: _a ~ X) -> typeAnn _a (_rhs X)
 ------------ tooltips