132 files changed, 2959 insertions, 1636 deletions

diff --git a/testdata/language-features/adt/adt02.reject.out b/testdata/language-features/adt/adt02.reject.out
index ee25f4ed..0b4b0ba4 100644
--- a/testdata/language-features/adt/adt02.reject.out
+++ b/testdata/language-features/adt/adt02.reject.out
@@ -5,15 +5,15 @@ with
 
 in proj
 ------------ trace
-'Data3 :: Type
-Data3 :: Bool -> Char -> Bool -> Data3
-Data31 :: Int -> String -> Int -> Data3
+'Data3 :: Type
+Data3 :: Bool -> Char -> Bool -> Data3
+Data31 :: Int -> String -> Int -> Data3
 'Data3Case
-  :: forall (a :: Data3 -> Type)
-    -> (forall (b :: Bool) (c :: Char) (d :: Bool) -> a ('Data3 b c d))
-      -> (forall (e :: Int) (f :: String) (g :: Int) -> a ('Data31 e f g))
-        -> forall (h :: Data3) -> a h
-match'Data3 :: forall (a :: Type -> Type) -> a Data3 -> forall b -> a b -> a b
+  :: forall (a :: Data3 -> Type)
+    -> (forall (b :: Bool) (c :: Char) (d :: Bool) -> a ('Data3 b c d))
+      -> (forall (e :: Int) (f :: String) (g :: Int) -> a ('Data31 e f g))
+        -> forall (h :: Data3) -> a h
+match'Data3 :: forall (a :: Type -> Type) -> a Data3 -> forall b -> a b -> a b
 !type error: can not unify
 'Bool
 with
@@ -21,15 +21,27 @@ with
 
 in proj
 ------------ tooltips
-testdata/language-features/adt/adt02.reject.lc 2:6-2:11  Type
-testdata/language-features/adt/adt02.reject.lc 2:6-5:25  Type
-testdata/language-features/adt/adt02.reject.lc 2:6-7:11  Type
-testdata/language-features/adt/adt02.reject.lc 2:6-10:20  Type
-testdata/language-features/adt/adt02.reject.lc 3:5-3:10  Bool -> Char -> Bool -> Data3 | Data3 | Type
-testdata/language-features/adt/adt02.reject.lc 3:21-3:25  Type
-testdata/language-features/adt/adt02.reject.lc 4:21-4:25  Type
-testdata/language-features/adt/adt02.reject.lc 5:21-5:25  Type
-testdata/language-features/adt/adt02.reject.lc 7:5-7:11  Data3 | Int -> String -> Int -> Data3 | Type
-testdata/language-features/adt/adt02.reject.lc 8:17-8:20  Type
-testdata/language-features/adt/adt02.reject.lc 9:17-9:23  Type
-testdata/language-features/adt/adt02.reject.lc 10:17-10:20  Type
+testdata/language-features/adt/adt02.reject.lc 2:6-2:11
+    Type | Type | Type | Type | Type | Type | Type | Type
+testdata/language-features/adt/adt02.reject.lc 2:6-5:25
+    Type | Type
+testdata/language-features/adt/adt02.reject.lc 2:6-7:11
+    Type | Type
+testdata/language-features/adt/adt02.reject.lc 2:6-10:20
+    Type | Type
+testdata/language-features/adt/adt02.reject.lc 3:5-3:10
+    Bool -> Char -> Bool -> Data3 | Data3 | Type | Type | Type | Type
+testdata/language-features/adt/adt02.reject.lc 3:21-3:25
+    Type
+testdata/language-features/adt/adt02.reject.lc 4:21-4:25
+    Type
+testdata/language-features/adt/adt02.reject.lc 5:21-5:25
+    Type
+testdata/language-features/adt/adt02.reject.lc 7:5-7:11
+    Int -> String -> Int -> Data3 | Data3 | Type | Type | Type | Type
+testdata/language-features/adt/adt02.reject.lc 8:17-8:20
+    Type
+testdata/language-features/adt/adt02.reject.lc 9:17-9:23
+    Type
+testdata/language-features/adt/adt02.reject.lc 10:17-10:20
+    Type
\ No newline at end of file
diff --git a/testdata/language-features/adt/adt03.reject.out b/testdata/language-features/adt/adt03.reject.out
index 70c0c4e7..d579a3d5 100644
--- a/testdata/language-features/adt/adt03.reject.out
+++ b/testdata/language-features/adt/adt03.reject.out
@@ -2,9 +2,10 @@ can't find: a in testdata/language-features/adt/adt03.reject.lc:2:20:
 data Data3 = Data3 a b c
                    ^
 ------------ trace
-'Data3 :: Type
+'Data3 :: Type
 !can't find: a in testdata/language-features/adt/adt03.reject.lc:2:20:
 data Data3 = Data3 a b c
                    ^
 ------------ tooltips
-testdata/language-features/adt/adt03.reject.lc 2:6-2:11  Type
+testdata/language-features/adt/adt03.reject.lc 2:6-2:11
+    Type
\ No newline at end of file
diff --git a/testdata/language-features/adt/adt04.reject.out b/testdata/language-features/adt/adt04.reject.out
index 85b91c2c..0dd18b2f 100644
--- a/testdata/language-features/adt/adt04.reject.out
+++ b/testdata/language-features/adt/adt04.reject.out
@@ -2,9 +2,10 @@ can't find: a in testdata/language-features/adt/adt04.reject.lc:2:27:
 data Data3 = Data3 { x :: a , y :: b , z :: c }
                           ^
 ------------ trace
-'Data3 :: Type
+'Data3 :: Type
 !can't find: a in testdata/language-features/adt/adt04.reject.lc:2:27:
 data Data3 = Data3 { x :: a , y :: b , z :: c }
                           ^
 ------------ tooltips
-testdata/language-features/adt/adt04.reject.lc 2:6-2:11  Type
+testdata/language-features/adt/adt04.reject.lc 2:6-2:11
+    Type
\ No newline at end of file
diff --git a/testdata/language-features/adt/gadt01.reject.out b/testdata/language-features/adt/gadt01.reject.out
index 48732b7d..ce6834db 100644
--- a/testdata/language-features/adt/gadt01.reject.out
+++ b/testdata/language-features/adt/gadt01.reject.out
@@ -1,8 +1,11 @@
 illegal data definition (parameters are not uniform)
 ------------ trace
-'M3 :: Type -> String -> Type
+'M3 :: Type -> String -> Type
 !illegal data definition (parameters are not uniform)
 ------------ tooltips
-testdata/language-features/adt/gadt01.reject.lc 5:6-5:8  Type -> String -> Type
-testdata/language-features/adt/gadt01.reject.lc 5:15-5:19  Type
-testdata/language-features/adt/gadt01.reject.lc 5:27-5:33  Type
+testdata/language-features/adt/gadt01.reject.lc 5:6-5:8
+    Type -> String -> Type
+testdata/language-features/adt/gadt01.reject.lc 5:15-5:19
+    Type
+testdata/language-features/adt/gadt01.reject.lc 5:27-5:33
+    Type | Type
\ No newline at end of file
diff --git a/testdata/language-features/adt/gadt03.reject.out b/testdata/language-features/adt/gadt03.reject.out
index 36261981..38a50a8a 100644
--- a/testdata/language-features/adt/gadt03.reject.out
+++ b/testdata/language-features/adt/gadt03.reject.out
@@ -1,36 +1,58 @@
 illegal data definition (parameters are not uniform)
 ------------ trace
-'M2 :: Type -> String -> Type
-Value2 :: forall a . a -> forall (b :: String) . M2 a b
+'M2 :: Type -> String -> Type
+Value2 :: forall a . a -> forall (b :: String) . M2 a b
 'M2Case
-  :: forall a
-    . forall (b :: forall (c :: String) -> M2 a c -> Type)
-      -> (forall (d :: a) -> forall (e :: String) . b e ('Value2 d e))
-        -> forall (f :: String) . forall (g :: M2 a f) -> b f g
+  :: forall a
+    . forall (b :: forall (c :: String) -> M2 a c -> Type)
+      -> (forall (d :: a) -> forall (e :: String) . b e ('Value2 d e))
+        -> forall (f :: String) . forall (g :: M2 a f) -> b f g
 match'M2
-  :: forall (a :: Type -> Type)
-    -> (forall b (c :: String) -> a (M2 b c)) -> forall d -> a d -> a d
-'M3 :: Type -> String -> Type
+  :: forall (a :: Type -> Type)
+    -> (forall b (c :: String) -> a (M2 b c)) -> forall d -> a d -> a d
+'M3 :: Type -> String -> Type
 !illegal data definition (parameters are not uniform)
 ------------ tooltips
-testdata/language-features/adt/gadt03.reject.lc 2:6-2:8  Type | Type -> String -> Type
-testdata/language-features/adt/gadt03.reject.lc 2:6-3:35  Type
-testdata/language-features/adt/gadt03.reject.lc 2:15-2:19  Type
-testdata/language-features/adt/gadt03.reject.lc 2:24-2:30  Type
-testdata/language-features/adt/gadt03.reject.lc 2:24-2:38  Type
-testdata/language-features/adt/gadt03.reject.lc 2:34-2:38  Type
-testdata/language-features/adt/gadt03.reject.lc 3:3-3:9  M2 _d _a | forall a . a -> forall (b :: String) . M2 a b
-testdata/language-features/adt/gadt03.reject.lc 3:3-3:35  Type
-testdata/language-features/adt/gadt03.reject.lc 3:13-3:14  Type
-testdata/language-features/adt/gadt03.reject.lc 3:13-3:35  Type
-testdata/language-features/adt/gadt03.reject.lc 3:18-3:35  Type
-testdata/language-features/adt/gadt03.reject.lc 3:29-3:31  Type -> String -> Type
-testdata/language-features/adt/gadt03.reject.lc 3:29-3:33  String -> Type
-testdata/language-features/adt/gadt03.reject.lc 3:29-3:35  Type
-testdata/language-features/adt/gadt03.reject.lc 3:32-3:33  Type
-testdata/language-features/adt/gadt03.reject.lc 3:34-3:35  String | _b
-testdata/language-features/adt/gadt03.reject.lc 5:6-5:8  Type -> String -> Type
-testdata/language-features/adt/gadt03.reject.lc 5:15-5:19  Type
-testdata/language-features/adt/gadt03.reject.lc 5:24-5:30  Type
-testdata/language-features/adt/gadt03.reject.lc 5:24-5:38  Type
-testdata/language-features/adt/gadt03.reject.lc 5:34-5:38  Type
+testdata/language-features/adt/gadt03.reject.lc 2:6-2:8
+    Type -> String -> Type | Type -> String -> Type | Type | Type
+      -> String -> Type | Type | Type
+testdata/language-features/adt/gadt03.reject.lc 2:6-3:35
+    Type | Type
+testdata/language-features/adt/gadt03.reject.lc 2:15-2:19
+    Type | Type | Type
+testdata/language-features/adt/gadt03.reject.lc 2:24-2:30
+    Type
+testdata/language-features/adt/gadt03.reject.lc 2:24-2:38
+    Type
+testdata/language-features/adt/gadt03.reject.lc 2:34-2:38
+    Type | Type
+testdata/language-features/adt/gadt03.reject.lc 3:3-3:9
+    forall a . a -> forall (b :: String) . M2 a b | M2 _d _a
+testdata/language-features/adt/gadt03.reject.lc 3:3-3:35
+    Type | Type | Type
+testdata/language-features/adt/gadt03.reject.lc 3:13-3:14
+    Type
+testdata/language-features/adt/gadt03.reject.lc 3:13-3:35
+    Type
+testdata/language-features/adt/gadt03.reject.lc 3:18-3:35
+    Type
+testdata/language-features/adt/gadt03.reject.lc 3:29-3:31
+    Type -> String -> Type
+testdata/language-features/adt/gadt03.reject.lc 3:29-3:33
+    String -> Type
+testdata/language-features/adt/gadt03.reject.lc 3:29-3:35
+    Type | Type
+testdata/language-features/adt/gadt03.reject.lc 3:32-3:33
+    Type
+testdata/language-features/adt/gadt03.reject.lc 3:34-3:35
+    _b | String
+testdata/language-features/adt/gadt03.reject.lc 5:6-5:8
+    Type -> String -> Type
+testdata/language-features/adt/gadt03.reject.lc 5:15-5:19
+    Type
+testdata/language-features/adt/gadt03.reject.lc 5:24-5:30
+    Type
+testdata/language-features/adt/gadt03.reject.lc 5:24-5:38
+    Type
+testdata/language-features/adt/gadt03.reject.lc 5:34-5:38
+    Type | Type
\ No newline at end of file
diff --git a/testdata/language-features/adt/gadt04.reject.out b/testdata/language-features/adt/gadt04.reject.out
index 22338d9b..0d911620 100644
--- a/testdata/language-features/adt/gadt04.reject.out
+++ b/testdata/language-features/adt/gadt04.reject.out
@@ -5,17 +5,17 @@ and at testdata/language-features/adt/gadt04.reject.lc:3:3:
   Value :: a -> forall m . M a m
   ^^^^^
 ------------ trace
-'M :: Type -> String -> Type
-Value :: forall a . a -> forall (b :: String) . M a b
+'M :: Type -> String -> Type
+Value :: forall a . a -> forall (b :: String) . M a b
 'MCase
-  :: forall (a :: forall b (c :: String) -> M b c -> Type)
-    -> (forall d . forall (e :: d) -> forall (f :: String) . a d f ('Value d e f))
-      -> forall g (h :: String) . forall (i :: M g h) -> a g h i
+  :: forall (a :: forall b (c :: String) -> M b c -> Type)
+    -> (forall d . forall (e :: d) -> forall (f :: String) . a d f ('Value d e f))
+      -> forall g (h :: String) . forall (i :: M g h) -> a g h i
 match'M
-  :: forall (a :: Type -> Type)
-    -> (forall b (c :: String) -> a (M b c)) -> forall d -> a d -> a d
-'M2 :: Type -> String -> Type
-Value :: forall a . a -> forall (b :: String) . M2 a b
+  :: forall (a :: Type -> Type)
+    -> (forall b (c :: String) -> a (M b c)) -> forall d -> a d -> a d
+'M2 :: Type -> String -> Type
+Value :: forall a . a -> forall (b :: String) . M2 a b
 !already defined Value at testdata/language-features/adt/gadt04.reject.lc:6:3:
   Value :: a -> forall m . M2 a m
   ^^^^^
@@ -23,34 +23,64 @@ and at testdata/language-features/adt/gadt04.reject.lc:3:3:
   Value :: a -> forall m . M a m
   ^^^^^
 ------------ tooltips
-testdata/language-features/adt/gadt04.reject.lc 2:6-2:7  Type | Type -> String -> Type
-testdata/language-features/adt/gadt04.reject.lc 2:6-3:33  Type
-testdata/language-features/adt/gadt04.reject.lc 2:11-2:15  Type
-testdata/language-features/adt/gadt04.reject.lc 2:19-2:25  Type
-testdata/language-features/adt/gadt04.reject.lc 2:19-2:33  Type
-testdata/language-features/adt/gadt04.reject.lc 2:29-2:33  Type
-testdata/language-features/adt/gadt04.reject.lc 3:3-3:8  M _c _a | forall a . a -> forall (b :: String) . M a b
-testdata/language-features/adt/gadt04.reject.lc 3:3-3:33  Type
-testdata/language-features/adt/gadt04.reject.lc 3:12-3:13  _b
-testdata/language-features/adt/gadt04.reject.lc 3:12-3:33  Type
-testdata/language-features/adt/gadt04.reject.lc 3:17-3:33  Type
-testdata/language-features/adt/gadt04.reject.lc 3:28-3:29  Type -> String -> Type
-testdata/language-features/adt/gadt04.reject.lc 3:28-3:31  String -> Type
-testdata/language-features/adt/gadt04.reject.lc 3:28-3:33  Type
-testdata/language-features/adt/gadt04.reject.lc 3:30-3:31  Type
-testdata/language-features/adt/gadt04.reject.lc 3:30-3:33  M _c _a -> Type
-testdata/language-features/adt/gadt04.reject.lc 3:32-3:33  String | _b
-testdata/language-features/adt/gadt04.reject.lc 5:6-5:8  Type -> String -> Type
-testdata/language-features/adt/gadt04.reject.lc 5:12-5:16  Type
-testdata/language-features/adt/gadt04.reject.lc 5:20-5:26  Type
-testdata/language-features/adt/gadt04.reject.lc 5:20-5:34  Type
-testdata/language-features/adt/gadt04.reject.lc 5:30-5:34  Type
-testdata/language-features/adt/gadt04.reject.lc 6:3-6:8  forall a . a -> forall (b :: String) . M2 a b
-testdata/language-features/adt/gadt04.reject.lc 6:12-6:13  _b
-testdata/language-features/adt/gadt04.reject.lc 6:12-6:34  Type
-testdata/language-features/adt/gadt04.reject.lc 6:17-6:34  Type
-testdata/language-features/adt/gadt04.reject.lc 6:28-6:30  Type -> String -> Type
-testdata/language-features/adt/gadt04.reject.lc 6:28-6:32  String -> Type
-testdata/language-features/adt/gadt04.reject.lc 6:28-6:34  Type
-testdata/language-features/adt/gadt04.reject.lc 6:31-6:32  Type
-testdata/language-features/adt/gadt04.reject.lc 6:33-6:34  _b
+testdata/language-features/adt/gadt04.reject.lc 2:6-2:7
+    Type -> String -> Type | Type -> String -> Type | Type | Type | Type
+      -> String -> Type | Type | Type | Type
+testdata/language-features/adt/gadt04.reject.lc 2:6-3:33
+    Type
+testdata/language-features/adt/gadt04.reject.lc 2:11-2:15
+    Type
+testdata/language-features/adt/gadt04.reject.lc 2:19-2:25
+    Type
+testdata/language-features/adt/gadt04.reject.lc 2:19-2:33
+    Type
+testdata/language-features/adt/gadt04.reject.lc 2:29-2:33
+    Type | Type
+testdata/language-features/adt/gadt04.reject.lc 3:3-3:8
+    forall a . a -> forall (b :: String) . M a b | M _c _a
+testdata/language-features/adt/gadt04.reject.lc 3:3-3:33
+    Type | Type | Type | Type
+testdata/language-features/adt/gadt04.reject.lc 3:12-3:13
+    _b
+testdata/language-features/adt/gadt04.reject.lc 3:12-3:33
+    Type
+testdata/language-features/adt/gadt04.reject.lc 3:17-3:33
+    Type
+testdata/language-features/adt/gadt04.reject.lc 3:28-3:29
+    Type -> String -> Type
+testdata/language-features/adt/gadt04.reject.lc 3:28-3:31
+    String -> Type
+testdata/language-features/adt/gadt04.reject.lc 3:28-3:33
+    Type | Type
+testdata/language-features/adt/gadt04.reject.lc 3:30-3:31
+    Type | Type
+testdata/language-features/adt/gadt04.reject.lc 3:30-3:33
+    M _c _a -> Type
+testdata/language-features/adt/gadt04.reject.lc 3:32-3:33
+    _b | String
+testdata/language-features/adt/gadt04.reject.lc 5:6-5:8
+    Type -> String -> Type
+testdata/language-features/adt/gadt04.reject.lc 5:12-5:16
+    Type
+testdata/language-features/adt/gadt04.reject.lc 5:20-5:26
+    Type
+testdata/language-features/adt/gadt04.reject.lc 5:20-5:34
+    Type
+testdata/language-features/adt/gadt04.reject.lc 5:30-5:34
+    Type | Type
+testdata/language-features/adt/gadt04.reject.lc 6:12-6:13
+    _b
+testdata/language-features/adt/gadt04.reject.lc 6:12-6:34
+    Type
+testdata/language-features/adt/gadt04.reject.lc 6:17-6:34
+    Type
+testdata/language-features/adt/gadt04.reject.lc 6:28-6:30
+    Type -> String -> Type
+testdata/language-features/adt/gadt04.reject.lc 6:28-6:32
+    String -> Type
+testdata/language-features/adt/gadt04.reject.lc 6:28-6:34
+    Type | Type
+testdata/language-features/adt/gadt04.reject.lc 6:31-6:32
+    Type
+testdata/language-features/adt/gadt04.reject.lc 6:33-6:34
+    _b
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/list01.out b/testdata/language-features/basic-list/list01.out
index 500b3ba9..621aa15a 100644
--- a/testdata/language-features/basic-list/list01.out
+++ b/testdata/language-features/basic-list/list01.out
@@ -6,27 +6,47 @@ value2
 value3 = _rhs (Cons 'h' (Cons 'e' (Cons 'l' (Cons 'l' (Cons 'o' Nil)))))
 main is not found
 ------------ trace
-value1 :: forall a . List a
-value2 :: forall a . Num a => List a
-value3 :: List Char
+value1 :: forall a . List a
+value2 :: forall a . Num a => List a
+value3 :: List Char
 ------------ tooltips
-testdata/language-features/basic-list/list01.lc 1:1-1:7  forall a . List a
-testdata/language-features/basic-list/list01.lc 1:10-1:12  forall a . List a
-testdata/language-features/basic-list/list01.lc 2:1-2:7  forall a . Num a => List a
-testdata/language-features/basic-list/list01.lc 2:10-2:19  List _c
-testdata/language-features/basic-list/list01.lc 2:11-2:12  _b
-testdata/language-features/basic-list/list01.lc 2:13-2:14  _b
-testdata/language-features/basic-list/list01.lc 2:13-2:18  List _d
-testdata/language-features/basic-list/list01.lc 2:15-2:16  _b
-testdata/language-features/basic-list/list01.lc 2:15-2:18  List _e
-testdata/language-features/basic-list/list01.lc 2:17-2:18  List _e | _b
-testdata/language-features/basic-list/list01.lc 3:1-3:7  List Char
-testdata/language-features/basic-list/list01.lc 3:10-3:31  List Char
-testdata/language-features/basic-list/list01.lc 3:11-3:14  Char
-testdata/language-features/basic-list/list01.lc 3:15-3:18  Char
-testdata/language-features/basic-list/list01.lc 3:15-3:30  List Char
-testdata/language-features/basic-list/list01.lc 3:19-3:22  Char
-testdata/language-features/basic-list/list01.lc 3:19-3:30  List Char
-testdata/language-features/basic-list/list01.lc 3:23-3:26  Char
-testdata/language-features/basic-list/list01.lc 3:23-3:30  List Char
-testdata/language-features/basic-list/list01.lc 3:27-3:30  Char | List Char
+testdata/language-features/basic-list/list01.lc 1:1-1:7
+    forall a . List a
+testdata/language-features/basic-list/list01.lc 1:10-1:12
+    forall a . List a
+testdata/language-features/basic-list/list01.lc 2:1-2:7
+    forall a . Num a => List a
+testdata/language-features/basic-list/list01.lc 2:10-2:19
+    List _c
+testdata/language-features/basic-list/list01.lc 2:11-2:12
+    _b
+testdata/language-features/basic-list/list01.lc 2:13-2:14
+    _b
+testdata/language-features/basic-list/list01.lc 2:13-2:18
+    List _d
+testdata/language-features/basic-list/list01.lc 2:15-2:16
+    _b
+testdata/language-features/basic-list/list01.lc 2:15-2:18
+    List _e
+testdata/language-features/basic-list/list01.lc 2:17-2:18
+    _b | List _e
+testdata/language-features/basic-list/list01.lc 3:1-3:7
+    List Char
+testdata/language-features/basic-list/list01.lc 3:10-3:31
+    List Char
+testdata/language-features/basic-list/list01.lc 3:11-3:14
+    Char
+testdata/language-features/basic-list/list01.lc 3:15-3:18
+    Char
+testdata/language-features/basic-list/list01.lc 3:15-3:30
+    List Char
+testdata/language-features/basic-list/list01.lc 3:19-3:22
+    Char
+testdata/language-features/basic-list/list01.lc 3:19-3:30
+    List Char
+testdata/language-features/basic-list/list01.lc 3:23-3:26
+    Char
+testdata/language-features/basic-list/list01.lc 3:23-3:30
+    List Char
+testdata/language-features/basic-list/list01.lc 3:27-3:30
+    Char | List Char
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/list02.out b/testdata/language-features/basic-list/list02.out
index f10ae96c..665e8b7d 100644
--- a/testdata/language-features/basic-list/list02.out
+++ b/testdata/language-features/basic-list/list02.out
@@ -6,27 +6,47 @@ value2
 value3 = _rhs (Cons 'h' (Cons 'e' (Cons 'l' (Cons 'l' (Cons 'o' Nil)))))
 main is not found
 ------------ trace
-value1 :: forall a . List a
-value2 :: forall a . Num a => List a
-value3 :: List Char
+value1 :: forall a . List a
+value2 :: forall a . Num a => List a
+value3 :: List Char
 ------------ tooltips
-testdata/language-features/basic-list/list02.lc 1:1-1:7  forall a . List a
-testdata/language-features/basic-list/list02.lc 1:10-2:4  forall a . List a
-testdata/language-features/basic-list/list02.lc 4:1-4:7  forall a . Num a => List a
-testdata/language-features/basic-list/list02.lc 4:10-5:7  List _c
-testdata/language-features/basic-list/list02.lc 4:11-4:12  _b
-testdata/language-features/basic-list/list02.lc 4:13-4:14  _b
-testdata/language-features/basic-list/list02.lc 4:13-5:6  List _d
-testdata/language-features/basic-list/list02.lc 5:3-5:4  _b
-testdata/language-features/basic-list/list02.lc 5:3-5:6  List _e
-testdata/language-features/basic-list/list02.lc 5:5-5:6  List _e | _b
-testdata/language-features/basic-list/list02.lc 7:1-7:7  List Char
-testdata/language-features/basic-list/list02.lc 8:3-13:4  List Char
-testdata/language-features/basic-list/list02.lc 8:5-8:8  Char
-testdata/language-features/basic-list/list02.lc 9:5-9:8  Char
-testdata/language-features/basic-list/list02.lc 9:5-12:8  List Char
-testdata/language-features/basic-list/list02.lc 10:5-10:8  Char
-testdata/language-features/basic-list/list02.lc 10:5-12:8  List Char
-testdata/language-features/basic-list/list02.lc 11:5-11:8  Char
-testdata/language-features/basic-list/list02.lc 11:5-12:8  List Char
-testdata/language-features/basic-list/list02.lc 12:5-12:8  Char | List Char
+testdata/language-features/basic-list/list02.lc 1:1-1:7
+    forall a . List a
+testdata/language-features/basic-list/list02.lc 1:10-2:4
+    forall a . List a
+testdata/language-features/basic-list/list02.lc 4:1-4:7
+    forall a . Num a => List a
+testdata/language-features/basic-list/list02.lc 4:10-5:7
+    List _c
+testdata/language-features/basic-list/list02.lc 4:11-4:12
+    _b
+testdata/language-features/basic-list/list02.lc 4:13-4:14
+    _b
+testdata/language-features/basic-list/list02.lc 4:13-5:6
+    List _d
+testdata/language-features/basic-list/list02.lc 5:3-5:4
+    _b
+testdata/language-features/basic-list/list02.lc 5:3-5:6
+    List _e
+testdata/language-features/basic-list/list02.lc 5:5-5:6
+    _b | List _e
+testdata/language-features/basic-list/list02.lc 7:1-7:7
+    List Char
+testdata/language-features/basic-list/list02.lc 8:3-13:4
+    List Char
+testdata/language-features/basic-list/list02.lc 8:5-8:8
+    Char
+testdata/language-features/basic-list/list02.lc 9:5-9:8
+    Char
+testdata/language-features/basic-list/list02.lc 9:5-12:8
+    List Char
+testdata/language-features/basic-list/list02.lc 10:5-10:8
+    Char
+testdata/language-features/basic-list/list02.lc 10:5-12:8
+    List Char
+testdata/language-features/basic-list/list02.lc 11:5-11:8
+    Char
+testdata/language-features/basic-list/list02.lc 11:5-12:8
+    List Char
+testdata/language-features/basic-list/list02.lc 12:5-12:8
+    Char | List Char
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/list07.reject.out b/testdata/language-features/basic-list/list07.reject.out
index 27c8a2e3..a40c8c73 100644
--- a/testdata/language-features/basic-list/list07.reject.out
+++ b/testdata/language-features/basic-list/list07.reject.out
@@ -12,6 +12,9 @@ with
 
 in builtin Nil
 ------------ tooltips
-testdata/language-features/basic-list/list07.reject.lc 1:10-1:11  _b
-testdata/language-features/basic-list/list07.reject.lc 1:12-1:15  Float
-testdata/language-features/basic-list/list07.reject.lc 1:16-1:19  Char
+testdata/language-features/basic-list/list07.reject.lc 1:10-1:11
+    _b
+testdata/language-features/basic-list/list07.reject.lc 1:12-1:15
+    Float
+testdata/language-features/basic-list/list07.reject.lc 1:16-1:19
+    Char
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/list08.out b/testdata/language-features/basic-list/list08.out
index 88bd2006..66a0526e 100644
--- a/testdata/language-features/basic-list/list08.out
+++ b/testdata/language-features/basic-list/list08.out
@@ -2,9 +2,13 @@
 value = _rhs (Cons (fromInt 1) (Cons 1.2 Nil))
 main is not found
 ------------ trace
-value :: List Float
+value :: List Float
 ------------ tooltips
-testdata/language-features/basic-list/list08.lc 1:1-1:6  List Float
-testdata/language-features/basic-list/list08.lc 1:9-1:16  List Float
-testdata/language-features/basic-list/list08.lc 1:10-1:11  _b
-testdata/language-features/basic-list/list08.lc 1:12-1:15  Float | List Float
+testdata/language-features/basic-list/list08.lc 1:1-1:6
+    List Float
+testdata/language-features/basic-list/list08.lc 1:9-1:16
+    List Float
+testdata/language-features/basic-list/list08.lc 1:10-1:11
+    _b
+testdata/language-features/basic-list/list08.lc 1:12-1:15
+    Float | List Float
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/list09.out b/testdata/language-features/basic-list/list09.out
index 24341f59..7b7e8d99 100644
--- a/testdata/language-features/basic-list/list09.out
+++ b/testdata/language-features/basic-list/list09.out
@@ -2,11 +2,17 @@
 value = _rhs (Cons (fromInt 1) (Cons 1.2 Nil) :: List Float)
 main is not found
 ------------ trace
-value :: List Float
+value :: List Float
 ------------ tooltips
-testdata/language-features/basic-list/list09.lc 1:1-1:6  List Float
-testdata/language-features/basic-list/list09.lc 1:9-1:16  List Float
-testdata/language-features/basic-list/list09.lc 1:10-1:11  _b
-testdata/language-features/basic-list/list09.lc 1:12-1:15  Float | List Float
-testdata/language-features/basic-list/list09.lc 1:20-1:27  Type
-testdata/language-features/basic-list/list09.lc 1:21-1:26  Type
+testdata/language-features/basic-list/list09.lc 1:1-1:6
+    List Float
+testdata/language-features/basic-list/list09.lc 1:9-1:16
+    List Float
+testdata/language-features/basic-list/list09.lc 1:10-1:11
+    _b
+testdata/language-features/basic-list/list09.lc 1:12-1:15
+    Float | List Float
+testdata/language-features/basic-list/list09.lc 1:20-1:27
+    Type
+testdata/language-features/basic-list/list09.lc 1:21-1:26
+    Type
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/list10.reject.out b/testdata/language-features/basic-list/list10.reject.out
index 186dc9c6..0ce8bd30 100644
--- a/testdata/language-features/basic-list/list10.reject.out
+++ b/testdata/language-features/basic-list/list10.reject.out
@@ -12,7 +12,11 @@ with
 
 in builtin Nil
 ------------ tooltips
-testdata/language-features/basic-list/list10.reject.lc 1:10-1:11  _b
-testdata/language-features/basic-list/list10.reject.lc 1:12-1:15  Float
-testdata/language-features/basic-list/list10.reject.lc 1:20-1:25  Type
-testdata/language-features/basic-list/list10.reject.lc 1:21-1:24  Type
+testdata/language-features/basic-list/list10.reject.lc 1:10-1:11
+    _b
+testdata/language-features/basic-list/list10.reject.lc 1:12-1:15
+    Float
+testdata/language-features/basic-list/list10.reject.lc 1:20-1:25
+    Type
+testdata/language-features/basic-list/list10.reject.lc 1:21-1:24
+    Type
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/list11.out b/testdata/language-features/basic-list/list11.out
index 01414c97..b02e1b06 100644
--- a/testdata/language-features/basic-list/list11.out
+++ b/testdata/language-features/basic-list/list11.out
@@ -2,11 +2,17 @@
 value = _rhs (fromInt 1 : Nil)
 main is not found
 ------------ trace
-value :: forall a . Num a => List a
+value :: forall a . Num a => List a
 ------------ tooltips
-testdata/language-features/basic-list/list11.lc 1:1-1:6  forall a . Num a => List a
-testdata/language-features/basic-list/list11.lc 1:9-1:10  _b
-testdata/language-features/basic-list/list11.lc 1:9-1:11  List _b -> List _b
-testdata/language-features/basic-list/list11.lc 1:9-1:13  List _b
-testdata/language-features/basic-list/list11.lc 1:10-1:11  forall a . a -> List a -> List a
-testdata/language-features/basic-list/list11.lc 1:11-1:13  forall a . List a
+testdata/language-features/basic-list/list11.lc 1:1-1:6
+    forall a . Num a => List a
+testdata/language-features/basic-list/list11.lc 1:9-1:10
+    _b
+testdata/language-features/basic-list/list11.lc 1:9-1:11
+    List _b -> List _b
+testdata/language-features/basic-list/list11.lc 1:9-1:13
+    List _b
+testdata/language-features/basic-list/list11.lc 1:10-1:11
+    forall a . a -> List a -> List a
+testdata/language-features/basic-list/list11.lc 1:11-1:13
+    forall a . List a
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/list12.out b/testdata/language-features/basic-list/list12.out
index 9d57e36d..b33e242d 100644
--- a/testdata/language-features/basic-list/list12.out
+++ b/testdata/language-features/basic-list/list12.out
@@ -2,27 +2,49 @@
 value = _rhs (fromInt 1 : fromInt 2 : fromInt 3 : fromInt 4 : fromInt 5 : Nil)
 main is not found
 ------------ trace
-value :: forall a . Num a => List a
+value :: forall a . Num a => List a
 ------------ tooltips
-testdata/language-features/basic-list/list12.lc 1:1-1:6  forall a . Num a => List a
-testdata/language-features/basic-list/list12.lc 1:9-1:10  _b
-testdata/language-features/basic-list/list12.lc 1:9-1:11  List _b -> List _b
-testdata/language-features/basic-list/list12.lc 1:9-1:21  List _c
-testdata/language-features/basic-list/list12.lc 1:10-1:11  forall a . a -> List a -> List a
-testdata/language-features/basic-list/list12.lc 1:11-1:12  _b
-testdata/language-features/basic-list/list12.lc 1:11-1:13  List _b -> List _b
-testdata/language-features/basic-list/list12.lc 1:11-1:21  List _d
-testdata/language-features/basic-list/list12.lc 1:12-1:13  forall a . a -> List a -> List a
-testdata/language-features/basic-list/list12.lc 1:13-1:14  _b
-testdata/language-features/basic-list/list12.lc 1:13-1:15  List _b -> List _b
-testdata/language-features/basic-list/list12.lc 1:13-1:21  List _e
-testdata/language-features/basic-list/list12.lc 1:14-1:15  forall a . a -> List a -> List a
-testdata/language-features/basic-list/list12.lc 1:15-1:16  _b
-testdata/language-features/basic-list/list12.lc 1:15-1:17  List _b -> List _b
-testdata/language-features/basic-list/list12.lc 1:15-1:21  List _f
-testdata/language-features/basic-list/list12.lc 1:16-1:17  forall a . a -> List a -> List a
-testdata/language-features/basic-list/list12.lc 1:17-1:18  _b
-testdata/language-features/basic-list/list12.lc 1:17-1:19  List _b -> List _b
-testdata/language-features/basic-list/list12.lc 1:17-1:21  List _f
-testdata/language-features/basic-list/list12.lc 1:18-1:19  forall a . a -> List a -> List a
-testdata/language-features/basic-list/list12.lc 1:19-1:21  forall a . List a
+testdata/language-features/basic-list/list12.lc 1:1-1:6
+    forall a . Num a => List a
+testdata/language-features/basic-list/list12.lc 1:9-1:10
+    _b
+testdata/language-features/basic-list/list12.lc 1:9-1:11
+    List _b -> List _b
+testdata/language-features/basic-list/list12.lc 1:9-1:21
+    List _c
+testdata/language-features/basic-list/list12.lc 1:10-1:11
+    forall a . a -> List a -> List a
+testdata/language-features/basic-list/list12.lc 1:11-1:12
+    _b
+testdata/language-features/basic-list/list12.lc 1:11-1:13
+    List _b -> List _b
+testdata/language-features/basic-list/list12.lc 1:11-1:21
+    List _d
+testdata/language-features/basic-list/list12.lc 1:12-1:13
+    forall a . a -> List a -> List a
+testdata/language-features/basic-list/list12.lc 1:13-1:14
+    _b
+testdata/language-features/basic-list/list12.lc 1:13-1:15
+    List _b -> List _b
+testdata/language-features/basic-list/list12.lc 1:13-1:21
+    List _e
+testdata/language-features/basic-list/list12.lc 1:14-1:15
+    forall a . a -> List a -> List a
+testdata/language-features/basic-list/list12.lc 1:15-1:16
+    _b
+testdata/language-features/basic-list/list12.lc 1:15-1:17
+    List _b -> List _b
+testdata/language-features/basic-list/list12.lc 1:15-1:21
+    List _f
+testdata/language-features/basic-list/list12.lc 1:16-1:17
+    forall a . a -> List a -> List a
+testdata/language-features/basic-list/list12.lc 1:17-1:18
+    _b
+testdata/language-features/basic-list/list12.lc 1:17-1:19
+    List _b -> List _b
+testdata/language-features/basic-list/list12.lc 1:17-1:21
+    List _f
+testdata/language-features/basic-list/list12.lc 1:18-1:19
+    forall a . a -> List a -> List a
+testdata/language-features/basic-list/list12.lc 1:19-1:21
+    forall a . List a
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/list13.out b/testdata/language-features/basic-list/list13.out
index 477564f1..f0a9adde 100644
--- a/testdata/language-features/basic-list/list13.out
+++ b/testdata/language-features/basic-list/list13.out
@@ -2,27 +2,49 @@
 value = _rhs ('h' : 'e' : 'l' : 'l' : 'o' : Nil)
 main is not found
 ------------ trace
-value :: List Char
+value :: List Char
 ------------ tooltips
-testdata/language-features/basic-list/list13.lc 1:1-1:6  List Char
-testdata/language-features/basic-list/list13.lc 1:9-1:12  Char
-testdata/language-features/basic-list/list13.lc 1:9-1:13  List Char -> List Char
-testdata/language-features/basic-list/list13.lc 1:9-1:31  List Char
-testdata/language-features/basic-list/list13.lc 1:12-1:13  forall a . a -> List a -> List a
-testdata/language-features/basic-list/list13.lc 1:13-1:16  Char
-testdata/language-features/basic-list/list13.lc 1:13-1:17  List Char -> List Char
-testdata/language-features/basic-list/list13.lc 1:13-1:31  List Char
-testdata/language-features/basic-list/list13.lc 1:16-1:17  forall a . a -> List a -> List a
-testdata/language-features/basic-list/list13.lc 1:17-1:20  Char
-testdata/language-features/basic-list/list13.lc 1:17-1:21  List Char -> List Char
-testdata/language-features/basic-list/list13.lc 1:17-1:31  List Char
-testdata/language-features/basic-list/list13.lc 1:20-1:21  forall a . a -> List a -> List a
-testdata/language-features/basic-list/list13.lc 1:21-1:24  Char
-testdata/language-features/basic-list/list13.lc 1:21-1:25  List Char -> List Char
-testdata/language-features/basic-list/list13.lc 1:21-1:31  List Char
-testdata/language-features/basic-list/list13.lc 1:24-1:25  forall a . a -> List a -> List a
-testdata/language-features/basic-list/list13.lc 1:25-1:28  Char
-testdata/language-features/basic-list/list13.lc 1:25-1:29  List Char -> List Char
-testdata/language-features/basic-list/list13.lc 1:25-1:31  List Char
-testdata/language-features/basic-list/list13.lc 1:28-1:29  forall a . a -> List a -> List a
-testdata/language-features/basic-list/list13.lc 1:29-1:31  forall a . List a
+testdata/language-features/basic-list/list13.lc 1:1-1:6
+    List Char
+testdata/language-features/basic-list/list13.lc 1:9-1:12
+    Char
+testdata/language-features/basic-list/list13.lc 1:9-1:13
+    List Char -> List Char
+testdata/language-features/basic-list/list13.lc 1:9-1:31
+    List Char
+testdata/language-features/basic-list/list13.lc 1:12-1:13
+    forall a . a -> List a -> List a
+testdata/language-features/basic-list/list13.lc 1:13-1:16
+    Char
+testdata/language-features/basic-list/list13.lc 1:13-1:17
+    List Char -> List Char
+testdata/language-features/basic-list/list13.lc 1:13-1:31
+    List Char
+testdata/language-features/basic-list/list13.lc 1:16-1:17
+    forall a . a -> List a -> List a
+testdata/language-features/basic-list/list13.lc 1:17-1:20
+    Char
+testdata/language-features/basic-list/list13.lc 1:17-1:21
+    List Char -> List Char
+testdata/language-features/basic-list/list13.lc 1:17-1:31
+    List Char
+testdata/language-features/basic-list/list13.lc 1:20-1:21
+    forall a . a -> List a -> List a
+testdata/language-features/basic-list/list13.lc 1:21-1:24
+    Char
+testdata/language-features/basic-list/list13.lc 1:21-1:25
+    List Char -> List Char
+testdata/language-features/basic-list/list13.lc 1:21-1:31
+    List Char
+testdata/language-features/basic-list/list13.lc 1:24-1:25
+    forall a . a -> List a -> List a
+testdata/language-features/basic-list/list13.lc 1:25-1:28
+    Char
+testdata/language-features/basic-list/list13.lc 1:25-1:29
+    List Char -> List Char
+testdata/language-features/basic-list/list13.lc 1:25-1:31
+    List Char
+testdata/language-features/basic-list/list13.lc 1:28-1:29
+    forall a . a -> List a -> List a
+testdata/language-features/basic-list/list13.lc 1:29-1:31
+    forall a . List a
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/list14.reject.out b/testdata/language-features/basic-list/list14.reject.out
index c8abf9be..8d1a59e9 100644
--- a/testdata/language-features/basic-list/list14.reject.out
+++ b/testdata/language-features/basic-list/list14.reject.out
@@ -16,10 +16,17 @@ in testdata/language-features/basic-list/list14.reject.lc:1:17:
 value = 'h':'i':()
                 ^^
 ------------ tooltips
-testdata/language-features/basic-list/list14.reject.lc 1:9-1:12  Char
-testdata/language-features/basic-list/list14.reject.lc 1:9-1:13  List Char -> List Char
-testdata/language-features/basic-list/list14.reject.lc 1:12-1:13  forall a . a -> List a -> List a
-testdata/language-features/basic-list/list14.reject.lc 1:13-1:16  Char
-testdata/language-features/basic-list/list14.reject.lc 1:13-1:17  List Char -> List Char
-testdata/language-features/basic-list/list14.reject.lc 1:16-1:17  forall a . a -> List a -> List a
-testdata/language-features/basic-list/list14.reject.lc 1:17-1:19  ()
+testdata/language-features/basic-list/list14.reject.lc 1:9-1:12
+    Char
+testdata/language-features/basic-list/list14.reject.lc 1:9-1:13
+    List Char -> List Char
+testdata/language-features/basic-list/list14.reject.lc 1:12-1:13
+    forall a . a -> List a -> List a
+testdata/language-features/basic-list/list14.reject.lc 1:13-1:16
+    Char
+testdata/language-features/basic-list/list14.reject.lc 1:13-1:17
+    List Char -> List Char
+testdata/language-features/basic-list/list14.reject.lc 1:16-1:17
+    forall a . a -> List a -> List a
+testdata/language-features/basic-list/list14.reject.lc 1:17-1:19
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/list15.reject.out b/testdata/language-features/basic-list/list15.reject.out
index 96a8907d..9caab32f 100644
--- a/testdata/language-features/basic-list/list15.reject.out
+++ b/testdata/language-features/basic-list/list15.reject.out
@@ -16,12 +16,21 @@ in testdata/language-features/basic-list/list15.reject.lc:1:20:
 value = 'h':'i':():[]
                    ^^
 ------------ tooltips
-testdata/language-features/basic-list/list15.reject.lc 1:9-1:12  Char
-testdata/language-features/basic-list/list15.reject.lc 1:9-1:13  List Char -> List Char
-testdata/language-features/basic-list/list15.reject.lc 1:12-1:13  forall a . a -> List a -> List a
-testdata/language-features/basic-list/list15.reject.lc 1:13-1:16  Char
-testdata/language-features/basic-list/list15.reject.lc 1:13-1:17  List Char -> List Char
-testdata/language-features/basic-list/list15.reject.lc 1:16-1:17  forall a . a -> List a -> List a
-testdata/language-features/basic-list/list15.reject.lc 1:17-1:19  ()
-testdata/language-features/basic-list/list15.reject.lc 1:17-1:20  List () -> List ()
-testdata/language-features/basic-list/list15.reject.lc 1:19-1:20  forall a . a -> List a -> List a
+testdata/language-features/basic-list/list15.reject.lc 1:9-1:12
+    Char
+testdata/language-features/basic-list/list15.reject.lc 1:9-1:13
+    List Char -> List Char
+testdata/language-features/basic-list/list15.reject.lc 1:12-1:13
+    forall a . a -> List a -> List a
+testdata/language-features/basic-list/list15.reject.lc 1:13-1:16
+    Char
+testdata/language-features/basic-list/list15.reject.lc 1:13-1:17
+    List Char -> List Char
+testdata/language-features/basic-list/list15.reject.lc 1:16-1:17
+    forall a . a -> List a -> List a
+testdata/language-features/basic-list/list15.reject.lc 1:17-1:19
+    ()
+testdata/language-features/basic-list/list15.reject.lc 1:17-1:20
+    List () -> List ()
+testdata/language-features/basic-list/list15.reject.lc 1:19-1:20
+    forall a . a -> List a -> List a
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/list16.reject.out b/testdata/language-features/basic-list/list16.reject.out
index e109192d..4ffd3ea0 100644
--- a/testdata/language-features/basic-list/list16.reject.out
+++ b/testdata/language-features/basic-list/list16.reject.out
@@ -16,7 +16,11 @@ in testdata/language-features/basic-list/list16.reject.lc:1:13:
 value = 'h':'i'
             ^^^
 ------------ tooltips
-testdata/language-features/basic-list/list16.reject.lc 1:9-1:12  Char
-testdata/language-features/basic-list/list16.reject.lc 1:9-1:13  List Char -> List Char
-testdata/language-features/basic-list/list16.reject.lc 1:12-1:13  forall a . a -> List a -> List a
-testdata/language-features/basic-list/list16.reject.lc 1:13-1:16  Char
+testdata/language-features/basic-list/list16.reject.lc 1:9-1:12
+    Char
+testdata/language-features/basic-list/list16.reject.lc 1:9-1:13
+    List Char -> List Char
+testdata/language-features/basic-list/list16.reject.lc 1:12-1:13
+    forall a . a -> List a -> List a
+testdata/language-features/basic-list/list16.reject.lc 1:13-1:16
+    Char
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/listcomp01.out b/testdata/language-features/basic-list/listcomp01.out
index 74cf6abb..56aeb025 100644
--- a/testdata/language-features/basic-list/listcomp01.out
+++ b/testdata/language-features/basic-list/listcomp01.out
@@ -6,15 +6,25 @@ value
       (Cons HNil (Cons HNil (Cons HNil (Cons HNil Nil)))))
 main is not found
 ------------ trace
-value :: List ()
+value :: List ()
 ------------ tooltips
-testdata/language-features/basic-list/listcomp01.lc 1:1-1:6  List ()
-testdata/language-features/basic-list/listcomp01.lc 1:9-1:34  List ()
-testdata/language-features/basic-list/listcomp01.lc 1:10-1:12  () | List () | _b -> List _a
-testdata/language-features/basic-list/listcomp01.lc 1:20-1:33  List ()
-testdata/language-features/basic-list/listcomp01.lc 1:21-1:23  ()
-testdata/language-features/basic-list/listcomp01.lc 1:24-1:26  ()
-testdata/language-features/basic-list/listcomp01.lc 1:24-1:32  List ()
-testdata/language-features/basic-list/listcomp01.lc 1:27-1:29  ()
-testdata/language-features/basic-list/listcomp01.lc 1:27-1:32  List ()
-testdata/language-features/basic-list/listcomp01.lc 1:30-1:32  () | List ()
+testdata/language-features/basic-list/listcomp01.lc 1:1-1:6
+    List ()
+testdata/language-features/basic-list/listcomp01.lc 1:9-1:34
+    List ()
+testdata/language-features/basic-list/listcomp01.lc 1:10-1:12
+    () | List ()
+testdata/language-features/basic-list/listcomp01.lc 1:20-1:33
+    List ()
+testdata/language-features/basic-list/listcomp01.lc 1:21-1:23
+    ()
+testdata/language-features/basic-list/listcomp01.lc 1:24-1:26
+    ()
+testdata/language-features/basic-list/listcomp01.lc 1:24-1:32
+    List ()
+testdata/language-features/basic-list/listcomp01.lc 1:27-1:29
+    ()
+testdata/language-features/basic-list/listcomp01.lc 1:27-1:32
+    List ()
+testdata/language-features/basic-list/listcomp01.lc 1:30-1:32
+    () | List ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/listcomp02.out b/testdata/language-features/basic-list/listcomp02.out
index 7e689b09..dfd424a4 100644
--- a/testdata/language-features/basic-list/listcomp02.out
+++ b/testdata/language-features/basic-list/listcomp02.out
@@ -3,18 +3,30 @@ l = _rhs (Cons HNil (Cons HNil (Cons HNil (Cons HNil Nil))))
 value = _rhs (concatMap \(a :: _) -> Cons a Nil l)
 main is not found
 ------------ trace
-l :: List ()
-value :: List ()
+l :: List ()
+value :: List ()
 ------------ tooltips
-testdata/language-features/basic-list/listcomp02.lc 1:1-1:2  List ()
-testdata/language-features/basic-list/listcomp02.lc 1:5-1:18  List ()
-testdata/language-features/basic-list/listcomp02.lc 1:6-1:8  ()
-testdata/language-features/basic-list/listcomp02.lc 1:9-1:11  ()
-testdata/language-features/basic-list/listcomp02.lc 1:9-1:17  List ()
-testdata/language-features/basic-list/listcomp02.lc 1:12-1:14  ()
-testdata/language-features/basic-list/listcomp02.lc 1:12-1:17  List ()
-testdata/language-features/basic-list/listcomp02.lc 1:15-1:17  () | List ()
-testdata/language-features/basic-list/listcomp02.lc 2:1-2:6  List ()
-testdata/language-features/basic-list/listcomp02.lc 2:9-2:21  List ()
-testdata/language-features/basic-list/listcomp02.lc 2:10-2:11  List _b | _b -> List _a | _d
-testdata/language-features/basic-list/listcomp02.lc 2:19-2:20  List ()
+testdata/language-features/basic-list/listcomp02.lc 1:1-1:2
+    List ()
+testdata/language-features/basic-list/listcomp02.lc 1:5-1:18
+    List ()
+testdata/language-features/basic-list/listcomp02.lc 1:6-1:8
+    ()
+testdata/language-features/basic-list/listcomp02.lc 1:9-1:11
+    ()
+testdata/language-features/basic-list/listcomp02.lc 1:9-1:17
+    List ()
+testdata/language-features/basic-list/listcomp02.lc 1:12-1:14
+    ()
+testdata/language-features/basic-list/listcomp02.lc 1:12-1:17
+    List ()
+testdata/language-features/basic-list/listcomp02.lc 1:15-1:17
+    () | List ()
+testdata/language-features/basic-list/listcomp02.lc 2:1-2:6
+    List ()
+testdata/language-features/basic-list/listcomp02.lc 2:9-2:21
+    List ()
+testdata/language-features/basic-list/listcomp02.lc 2:10-2:11
+    _d | List _b
+testdata/language-features/basic-list/listcomp02.lc 2:19-2:20
+    List ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/listcomp03.out b/testdata/language-features/basic-list/listcomp03.out
index 6bb450ce..4fce997f 100644
--- a/testdata/language-features/basic-list/listcomp03.out
+++ b/testdata/language-features/basic-list/listcomp03.out
@@ -6,17 +6,29 @@ value
       (Cons HNil (Cons HNil (Cons HNil (Cons HNil Nil)))))
 main is not found
 ------------ trace
-value :: List ()
+value :: List ()
 ------------ tooltips
-testdata/language-features/basic-list/listcomp03.lc 1:1-1:6  List ()
-testdata/language-features/basic-list/listcomp03.lc 1:9-1:41  List ()
-testdata/language-features/basic-list/listcomp03.lc 1:10-1:12  () | List ()
-testdata/language-features/basic-list/listcomp03.lc 1:10-1:40  List () | List () -> List () | _b -> List _a
-testdata/language-features/basic-list/listcomp03.lc 1:20-1:33  List ()
-testdata/language-features/basic-list/listcomp03.lc 1:21-1:23  ()
-testdata/language-features/basic-list/listcomp03.lc 1:24-1:26  ()
-testdata/language-features/basic-list/listcomp03.lc 1:24-1:32  List ()
-testdata/language-features/basic-list/listcomp03.lc 1:27-1:29  ()
-testdata/language-features/basic-list/listcomp03.lc 1:27-1:32  List ()
-testdata/language-features/basic-list/listcomp03.lc 1:30-1:32  () | List ()
-testdata/language-features/basic-list/listcomp03.lc 1:35-1:40  Bool
+testdata/language-features/basic-list/listcomp03.lc 1:1-1:6
+    List ()
+testdata/language-features/basic-list/listcomp03.lc 1:9-1:41
+    List ()
+testdata/language-features/basic-list/listcomp03.lc 1:10-1:12
+    () | List ()
+testdata/language-features/basic-list/listcomp03.lc 1:10-1:40
+    List () -> List () | List ()
+testdata/language-features/basic-list/listcomp03.lc 1:20-1:33
+    List ()
+testdata/language-features/basic-list/listcomp03.lc 1:21-1:23
+    ()
+testdata/language-features/basic-list/listcomp03.lc 1:24-1:26
+    ()
+testdata/language-features/basic-list/listcomp03.lc 1:24-1:32
+    List ()
+testdata/language-features/basic-list/listcomp03.lc 1:27-1:29
+    ()
+testdata/language-features/basic-list/listcomp03.lc 1:27-1:32
+    List ()
+testdata/language-features/basic-list/listcomp03.lc 1:30-1:32
+    () | List ()
+testdata/language-features/basic-list/listcomp03.lc 1:35-1:40
+    Bool
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/listcomp04.out b/testdata/language-features/basic-list/listcomp04.out
index 48f2b74f..05e9c859 100644
--- a/testdata/language-features/basic-list/listcomp04.out
+++ b/testdata/language-features/basic-list/listcomp04.out
@@ -3,20 +3,34 @@ l = _rhs (Cons HNil (Cons HNil (Cons HNil (Cons HNil Nil))))
 value = _rhs (concatMap \_ -> concatMap \_ -> Cons HNil Nil l l)
 main is not found
 ------------ trace
-l :: List ()
-value :: List ()
+l :: List ()
+value :: List ()
 ------------ tooltips
-testdata/language-features/basic-list/listcomp04.lc 1:1-1:2  List ()
-testdata/language-features/basic-list/listcomp04.lc 1:5-1:18  List ()
-testdata/language-features/basic-list/listcomp04.lc 1:6-1:8  ()
-testdata/language-features/basic-list/listcomp04.lc 1:9-1:11  ()
-testdata/language-features/basic-list/listcomp04.lc 1:9-1:17  List ()
-testdata/language-features/basic-list/listcomp04.lc 1:12-1:14  ()
-testdata/language-features/basic-list/listcomp04.lc 1:12-1:17  List ()
-testdata/language-features/basic-list/listcomp04.lc 1:15-1:17  () | List ()
-testdata/language-features/basic-list/listcomp04.lc 2:1-2:6  List ()
-testdata/language-features/basic-list/listcomp04.lc 2:9-2:30  List ()
-testdata/language-features/basic-list/listcomp04.lc 2:10-2:12  () | List () | _b -> List _a
-testdata/language-features/basic-list/listcomp04.lc 2:10-2:29  List () | _b -> List _a
-testdata/language-features/basic-list/listcomp04.lc 2:20-2:21  List ()
-testdata/language-features/basic-list/listcomp04.lc 2:28-2:29  List ()
+testdata/language-features/basic-list/listcomp04.lc 1:1-1:2
+    List ()
+testdata/language-features/basic-list/listcomp04.lc 1:5-1:18
+    List ()
+testdata/language-features/basic-list/listcomp04.lc 1:6-1:8
+    ()
+testdata/language-features/basic-list/listcomp04.lc 1:9-1:11
+    ()
+testdata/language-features/basic-list/listcomp04.lc 1:9-1:17
+    List ()
+testdata/language-features/basic-list/listcomp04.lc 1:12-1:14
+    ()
+testdata/language-features/basic-list/listcomp04.lc 1:12-1:17
+    List ()
+testdata/language-features/basic-list/listcomp04.lc 1:15-1:17
+    () | List ()
+testdata/language-features/basic-list/listcomp04.lc 2:1-2:6
+    List ()
+testdata/language-features/basic-list/listcomp04.lc 2:9-2:30
+    List ()
+testdata/language-features/basic-list/listcomp04.lc 2:10-2:12
+    () | List ()
+testdata/language-features/basic-list/listcomp04.lc 2:10-2:29
+    List ()
+testdata/language-features/basic-list/listcomp04.lc 2:20-2:21
+    List ()
+testdata/language-features/basic-list/listcomp04.lc 2:28-2:29
+    List ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/listcomp05.out b/testdata/language-features/basic-list/listcomp05.out
index ff151c96..c345731c 100644
--- a/testdata/language-features/basic-list/listcomp05.out
+++ b/testdata/language-features/basic-list/listcomp05.out
@@ -6,14 +6,21 @@ value
       (Cons HNil (Cons HNil Nil)))
 main is not found
 ------------ trace
-value :: List ()
+value :: List ()
 ------------ tooltips
-testdata/language-features/basic-list/listcomp05.lc 1:1-1:6  List ()
-testdata/language-features/basic-list/listcomp05.lc 1:9-1:39  List ()
-testdata/language-features/basic-list/listcomp05.lc 1:10-1:11  ()
-testdata/language-features/basic-list/listcomp05.lc 1:10-1:38  _b -> List _a
-testdata/language-features/basic-list/listcomp05.lc 1:19-1:26  List ()
-testdata/language-features/basic-list/listcomp05.lc 1:20-1:22  ()
-testdata/language-features/basic-list/listcomp05.lc 1:23-1:25  () | List ()
-testdata/language-features/basic-list/listcomp05.lc 1:32-1:33  () | _b
-testdata/language-features/basic-list/listcomp05.lc 1:36-1:38  ()
+testdata/language-features/basic-list/listcomp05.lc 1:1-1:6
+    List ()
+testdata/language-features/basic-list/listcomp05.lc 1:9-1:39
+    List ()
+testdata/language-features/basic-list/listcomp05.lc 1:10-1:11
+    ()
+testdata/language-features/basic-list/listcomp05.lc 1:19-1:26
+    List ()
+testdata/language-features/basic-list/listcomp05.lc 1:20-1:22
+    ()
+testdata/language-features/basic-list/listcomp05.lc 1:23-1:25
+    () | List ()
+testdata/language-features/basic-list/listcomp05.lc 1:32-1:33
+    _b | ()
+testdata/language-features/basic-list/listcomp05.lc 1:36-1:38
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/listcomp06.out b/testdata/language-features/basic-list/listcomp06.out
index 4219a6d0..c06f6155 100644
--- a/testdata/language-features/basic-list/listcomp06.out
+++ b/testdata/language-features/basic-list/listcomp06.out
@@ -17,26 +17,46 @@ value2
       (Cons HNil (Cons HNil Nil)))
 main is not found
 ------------ trace
-value1 :: List ()
-value2 :: List ()
+value1 :: List ()
+value2 :: List ()
 ------------ tooltips
-testdata/language-features/basic-list/listcomp06.lc 1:1-1:7  List ()
-testdata/language-features/basic-list/listcomp06.lc 1:10-1:46  List ()
-testdata/language-features/basic-list/listcomp06.lc 1:11-1:12  () | List ()
-testdata/language-features/basic-list/listcomp06.lc 1:11-1:45  List () -> List () | _b -> List _a
-testdata/language-features/basic-list/listcomp06.lc 1:20-1:27  List ()
-testdata/language-features/basic-list/listcomp06.lc 1:21-1:23  ()
-testdata/language-features/basic-list/listcomp06.lc 1:24-1:26  () | List ()
-testdata/language-features/basic-list/listcomp06.lc 1:33-1:34  () | _b
-testdata/language-features/basic-list/listcomp06.lc 1:37-1:39  ()
-testdata/language-features/basic-list/listcomp06.lc 1:41-1:45  Bool
-testdata/language-features/basic-list/listcomp06.lc 3:1-3:7  List ()
-testdata/language-features/basic-list/listcomp06.lc 3:10-3:46  List ()
-testdata/language-features/basic-list/listcomp06.lc 3:11-3:12  ()
-testdata/language-features/basic-list/listcomp06.lc 3:11-3:45  List () | _b -> List _a
-testdata/language-features/basic-list/listcomp06.lc 3:20-3:27  List ()
-testdata/language-features/basic-list/listcomp06.lc 3:21-3:23  ()
-testdata/language-features/basic-list/listcomp06.lc 3:24-3:26  () | List ()
-testdata/language-features/basic-list/listcomp06.lc 3:29-3:33  Bool
-testdata/language-features/basic-list/listcomp06.lc 3:39-3:40  () | _b
-testdata/language-features/basic-list/listcomp06.lc 3:43-3:45  ()
+testdata/language-features/basic-list/listcomp06.lc 1:1-1:7
+    List ()
+testdata/language-features/basic-list/listcomp06.lc 1:10-1:46
+    List ()
+testdata/language-features/basic-list/listcomp06.lc 1:11-1:12
+    () | List ()
+testdata/language-features/basic-list/listcomp06.lc 1:11-1:45
+    List () -> List ()
+testdata/language-features/basic-list/listcomp06.lc 1:20-1:27
+    List ()
+testdata/language-features/basic-list/listcomp06.lc 1:21-1:23
+    ()
+testdata/language-features/basic-list/listcomp06.lc 1:24-1:26
+    () | List ()
+testdata/language-features/basic-list/listcomp06.lc 1:33-1:34
+    _b | ()
+testdata/language-features/basic-list/listcomp06.lc 1:37-1:39
+    ()
+testdata/language-features/basic-list/listcomp06.lc 1:41-1:45
+    Bool
+testdata/language-features/basic-list/listcomp06.lc 3:1-3:7
+    List ()
+testdata/language-features/basic-list/listcomp06.lc 3:10-3:46
+    List ()
+testdata/language-features/basic-list/listcomp06.lc 3:11-3:12
+    ()
+testdata/language-features/basic-list/listcomp06.lc 3:11-3:45
+    List ()
+testdata/language-features/basic-list/listcomp06.lc 3:20-3:27
+    List ()
+testdata/language-features/basic-list/listcomp06.lc 3:21-3:23
+    ()
+testdata/language-features/basic-list/listcomp06.lc 3:24-3:26
+    () | List ()
+testdata/language-features/basic-list/listcomp06.lc 3:29-3:33
+    Bool
+testdata/language-features/basic-list/listcomp06.lc 3:39-3:40
+    _b | ()
+testdata/language-features/basic-list/listcomp06.lc 3:43-3:45
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/listcomp07.out b/testdata/language-features/basic-list/listcomp07.out
index 62a30caf..617c9b61 100644
--- a/testdata/language-features/basic-list/listcomp07.out
+++ b/testdata/language-features/basic-list/listcomp07.out
@@ -25,43 +25,73 @@ value3
       (Cons HNil (Cons HNil Nil)))
 main is not found
 ------------ trace
-value1 :: List ()
-value2 :: List ()
-value3 :: List ()
+value1 :: List ()
+value2 :: List ()
+value3 :: List ()
 ------------ tooltips
-testdata/language-features/basic-list/listcomp07.lc 1:1-1:7  List ()
-testdata/language-features/basic-list/listcomp07.lc 1:10-6:11  List ()
-testdata/language-features/basic-list/listcomp07.lc 1:12-1:13  ()
-testdata/language-features/basic-list/listcomp07.lc 1:12-5:21  _b -> List _a
-testdata/language-features/basic-list/listcomp07.lc 2:17-2:24  List ()
-testdata/language-features/basic-list/listcomp07.lc 2:18-2:20  ()
-testdata/language-features/basic-list/listcomp07.lc 2:21-2:23  () | List ()
-testdata/language-features/basic-list/listcomp07.lc 3:16-3:17  () | _b
-testdata/language-features/basic-list/listcomp07.lc 3:20-3:22  ()
-testdata/language-features/basic-list/listcomp07.lc 4:12-4:16  Bool
-testdata/language-features/basic-list/listcomp07.lc 5:16-5:17  () | _b
-testdata/language-features/basic-list/listcomp07.lc 5:20-5:21  ()
-testdata/language-features/basic-list/listcomp07.lc 8:1-8:7  List ()
-testdata/language-features/basic-list/listcomp07.lc 8:10-12:11  List ()
-testdata/language-features/basic-list/listcomp07.lc 8:12-8:13  ()
-testdata/language-features/basic-list/listcomp07.lc 8:12-11:21  _b -> List _a
-testdata/language-features/basic-list/listcomp07.lc 8:21-8:28  List ()
-testdata/language-features/basic-list/listcomp07.lc 8:22-8:24  ()
-testdata/language-features/basic-list/listcomp07.lc 8:25-8:27  () | List ()
-testdata/language-features/basic-list/listcomp07.lc 9:16-9:17  () | _b
-testdata/language-features/basic-list/listcomp07.lc 9:20-9:22  ()
-testdata/language-features/basic-list/listcomp07.lc 10:12-10:16  Bool
-testdata/language-features/basic-list/listcomp07.lc 11:16-11:17  () | _b
-testdata/language-features/basic-list/listcomp07.lc 11:20-11:21  ()
-testdata/language-features/basic-list/listcomp07.lc 14:1-14:7  List ()
-testdata/language-features/basic-list/listcomp07.lc 14:10-20:3  List ()
-testdata/language-features/basic-list/listcomp07.lc 14:12-14:13  ()
-testdata/language-features/basic-list/listcomp07.lc 14:12-19:15  _b -> List _a
-testdata/language-features/basic-list/listcomp07.lc 15:15-15:22  List ()
-testdata/language-features/basic-list/listcomp07.lc 15:16-15:18  ()
-testdata/language-features/basic-list/listcomp07.lc 15:19-15:21  () | List ()
-testdata/language-features/basic-list/listcomp07.lc 17:2-17:3  () | _b
-testdata/language-features/basic-list/listcomp07.lc 17:6-17:8  ()
-testdata/language-features/basic-list/listcomp07.lc 18:7-18:11  Bool
-testdata/language-features/basic-list/listcomp07.lc 19:10-19:11  () | _b
-testdata/language-features/basic-list/listcomp07.lc 19:14-19:15  ()
+testdata/language-features/basic-list/listcomp07.lc 1:1-1:7
+    List ()
+testdata/language-features/basic-list/listcomp07.lc 1:10-6:11
+    List ()
+testdata/language-features/basic-list/listcomp07.lc 1:12-1:13
+    ()
+testdata/language-features/basic-list/listcomp07.lc 2:17-2:24
+    List ()
+testdata/language-features/basic-list/listcomp07.lc 2:18-2:20
+    ()
+testdata/language-features/basic-list/listcomp07.lc 2:21-2:23
+    () | List ()
+testdata/language-features/basic-list/listcomp07.lc 3:16-3:17
+    _b | ()
+testdata/language-features/basic-list/listcomp07.lc 3:20-3:22
+    ()
+testdata/language-features/basic-list/listcomp07.lc 4:12-4:16
+    Bool
+testdata/language-features/basic-list/listcomp07.lc 5:16-5:17
+    _b | ()
+testdata/language-features/basic-list/listcomp07.lc 5:20-5:21
+    ()
+testdata/language-features/basic-list/listcomp07.lc 8:1-8:7
+    List ()
+testdata/language-features/basic-list/listcomp07.lc 8:10-12:11
+    List ()
+testdata/language-features/basic-list/listcomp07.lc 8:12-8:13
+    ()
+testdata/language-features/basic-list/listcomp07.lc 8:21-8:28
+    List ()
+testdata/language-features/basic-list/listcomp07.lc 8:22-8:24
+    ()
+testdata/language-features/basic-list/listcomp07.lc 8:25-8:27
+    () | List ()
+testdata/language-features/basic-list/listcomp07.lc 9:16-9:17
+    _b | ()
+testdata/language-features/basic-list/listcomp07.lc 9:20-9:22
+    ()
+testdata/language-features/basic-list/listcomp07.lc 10:12-10:16
+    Bool
+testdata/language-features/basic-list/listcomp07.lc 11:16-11:17
+    _b | ()
+testdata/language-features/basic-list/listcomp07.lc 11:20-11:21
+    ()
+testdata/language-features/basic-list/listcomp07.lc 14:1-14:7
+    List ()
+testdata/language-features/basic-list/listcomp07.lc 14:10-20:3
+    List ()
+testdata/language-features/basic-list/listcomp07.lc 14:12-14:13
+    ()
+testdata/language-features/basic-list/listcomp07.lc 15:15-15:22
+    List ()
+testdata/language-features/basic-list/listcomp07.lc 15:16-15:18
+    ()
+testdata/language-features/basic-list/listcomp07.lc 15:19-15:21
+    () | List ()
+testdata/language-features/basic-list/listcomp07.lc 17:2-17:3
+    _b | ()
+testdata/language-features/basic-list/listcomp07.lc 17:6-17:8
+    ()
+testdata/language-features/basic-list/listcomp07.lc 18:7-18:11
+    Bool
+testdata/language-features/basic-list/listcomp07.lc 19:10-19:11
+    _b | ()
+testdata/language-features/basic-list/listcomp07.lc 19:14-19:15
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/listcomp08.reject.out b/testdata/language-features/basic-list/listcomp08.reject.out
index 3a989de0..6ecdfd71 100644
--- a/testdata/language-features/basic-list/listcomp08.reject.out
+++ b/testdata/language-features/basic-list/listcomp08.reject.out
@@ -16,5 +16,5 @@ in testdata/language-features/basic-list/listcomp08.reject.lc:1:23:
 value = [x | x <- [], "not Bool"]
                       ^^^^^^^^^^
 ------------ tooltips
-testdata/language-features/basic-list/listcomp08.reject.lc 1:10-1:33  _b -> List _a
-testdata/language-features/basic-list/listcomp08.reject.lc 1:23-1:33  String
+testdata/language-features/basic-list/listcomp08.reject.lc 1:23-1:33
+    String
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/listcomp09.out b/testdata/language-features/basic-list/listcomp09.out
index 34f86f7f..60e73fcc 100644
--- a/testdata/language-features/basic-list/listcomp09.out
+++ b/testdata/language-features/basic-list/listcomp09.out
@@ -4,10 +4,15 @@ value1
     (concatMap \_ -> Cons \(a :: _) -> hlistNilCase (_ :: _) "Hello" a Nil Nil)
 main is not found
 ------------ trace
-value1 :: Type => List (() -> String)
+value1 :: Type => List (() -> String)
 ------------ tooltips
-testdata/language-features/basic-list/listcomp09.lc 1:1-1:7  Type => List (() -> String)
-testdata/language-features/basic-list/listcomp09.lc 1:10-1:36  List (() -> String)
-testdata/language-features/basic-list/listcomp09.lc 1:11-1:25  List (() -> String) | _b -> List _a
-testdata/language-features/basic-list/listcomp09.lc 1:18-1:25  String
-testdata/language-features/basic-list/listcomp09.lc 1:33-1:35  forall a . List a
+testdata/language-features/basic-list/listcomp09.lc 1:1-1:7
+    Type => List (() -> String)
+testdata/language-features/basic-list/listcomp09.lc 1:10-1:36
+    List (() -> String)
+testdata/language-features/basic-list/listcomp09.lc 1:11-1:25
+    List (() -> String)
+testdata/language-features/basic-list/listcomp09.lc 1:18-1:25
+    String
+testdata/language-features/basic-list/listcomp09.lc 1:33-1:35
+    forall a . List a
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/bool01.out b/testdata/language-features/basic-values/bool01.out
index 125ed17a..80315cf0 100644
--- a/testdata/language-features/basic-values/bool01.out
+++ b/testdata/language-features/basic-values/bool01.out
@@ -3,10 +3,14 @@ value1 = _rhs True
 value2 = _rhs False
 main is not found
 ------------ trace
-value1 :: Bool
-value2 :: Bool
+value1 :: Bool
+value2 :: Bool
 ------------ tooltips
-testdata/language-features/basic-values/bool01.lc 1:1-1:7  Bool
-testdata/language-features/basic-values/bool01.lc 1:10-1:14  Bool
-testdata/language-features/basic-values/bool01.lc 2:1-2:7  Bool
-testdata/language-features/basic-values/bool01.lc 2:10-2:15  Bool
+testdata/language-features/basic-values/bool01.lc 1:1-1:7
+    Bool
+testdata/language-features/basic-values/bool01.lc 1:10-1:14
+    Bool
+testdata/language-features/basic-values/bool01.lc 2:1-2:7
+    Bool
+testdata/language-features/basic-values/bool01.lc 2:10-2:15
+    Bool
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/case01.out b/testdata/language-features/basic-values/case01.out
index 1fc0f7f0..75dc7af3 100644
--- a/testdata/language-features/basic-values/case01.out
+++ b/testdata/language-features/basic-values/case01.out
@@ -7,34 +7,58 @@ value5 = _rhs ((\(a :: _) -> hlistNilCase (_ :: _) HNil a) HNil)
 value6 = _rhs ((\_ -> HNil) HNil)
 main is not found
 ------------ trace
-value1 :: ()
-value2 :: ()
-value3 :: ()
-value4 :: ()
-value5 :: ()
-value6 :: ()
+value1 :: ()
+value2 :: ()
+value3 :: ()
+value4 :: ()
+value5 :: ()
+value6 :: ()
 ------------ tooltips
-testdata/language-features/basic-values/case01.lc 1:1-1:7  ()
-testdata/language-features/basic-values/case01.lc 1:10-1:29  ()
-testdata/language-features/basic-values/case01.lc 1:15-1:17  ()
-testdata/language-features/basic-values/case01.lc 1:27-1:29  ()
-testdata/language-features/basic-values/case01.lc 3:1-3:7  ()
-testdata/language-features/basic-values/case01.lc 3:10-4:11  ()
-testdata/language-features/basic-values/case01.lc 3:15-3:17  ()
-testdata/language-features/basic-values/case01.lc 4:9-4:11  ()
-testdata/language-features/basic-values/case01.lc 6:1-6:7  ()
-testdata/language-features/basic-values/case01.lc 7:3-8:13  ()
-testdata/language-features/basic-values/case01.lc 7:8-7:10  ()
-testdata/language-features/basic-values/case01.lc 8:11-8:13  ()
-testdata/language-features/basic-values/case01.lc 10:1-10:7  ()
-testdata/language-features/basic-values/case01.lc 11:3-13:9  ()
-testdata/language-features/basic-values/case01.lc 11:8-11:10  ()
-testdata/language-features/basic-values/case01.lc 13:7-13:9  ()
-testdata/language-features/basic-values/case01.lc 15:1-15:7  ()
-testdata/language-features/basic-values/case01.lc 16:3-19:11  ()
-testdata/language-features/basic-values/case01.lc 16:8-16:10  ()
-testdata/language-features/basic-values/case01.lc 19:9-19:11  ()
-testdata/language-features/basic-values/case01.lc 21:1-21:7  ()
-testdata/language-features/basic-values/case01.lc 22:3-23:12  ()
-testdata/language-features/basic-values/case01.lc 22:8-22:10  ()
-testdata/language-features/basic-values/case01.lc 23:10-23:12  ()
+testdata/language-features/basic-values/case01.lc 1:1-1:7
+    ()
+testdata/language-features/basic-values/case01.lc 1:10-1:29
+    ()
+testdata/language-features/basic-values/case01.lc 1:15-1:17
+    ()
+testdata/language-features/basic-values/case01.lc 1:27-1:29
+    ()
+testdata/language-features/basic-values/case01.lc 3:1-3:7
+    ()
+testdata/language-features/basic-values/case01.lc 3:10-4:11
+    ()
+testdata/language-features/basic-values/case01.lc 3:15-3:17
+    ()
+testdata/language-features/basic-values/case01.lc 4:9-4:11
+    ()
+testdata/language-features/basic-values/case01.lc 6:1-6:7
+    ()
+testdata/language-features/basic-values/case01.lc 7:3-8:13
+    ()
+testdata/language-features/basic-values/case01.lc 7:8-7:10
+    ()
+testdata/language-features/basic-values/case01.lc 8:11-8:13
+    ()
+testdata/language-features/basic-values/case01.lc 10:1-10:7
+    ()
+testdata/language-features/basic-values/case01.lc 11:3-13:9
+    ()
+testdata/language-features/basic-values/case01.lc 11:8-11:10
+    ()
+testdata/language-features/basic-values/case01.lc 13:7-13:9
+    ()
+testdata/language-features/basic-values/case01.lc 15:1-15:7
+    ()
+testdata/language-features/basic-values/case01.lc 16:3-19:11
+    ()
+testdata/language-features/basic-values/case01.lc 16:8-16:10
+    ()
+testdata/language-features/basic-values/case01.lc 19:9-19:11
+    ()
+testdata/language-features/basic-values/case01.lc 21:1-21:7
+    ()
+testdata/language-features/basic-values/case01.lc 22:3-23:12
+    ()
+testdata/language-features/basic-values/case01.lc 22:8-22:10
+    ()
+testdata/language-features/basic-values/case01.lc 23:10-23:12
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/case02.out b/testdata/language-features/basic-values/case02.out
index 146ad059..0a13ee00 100644
--- a/testdata/language-features/basic-values/case02.out
+++ b/testdata/language-features/basic-values/case02.out
@@ -12,20 +12,34 @@ value2
       (fromInt 2))
 main is not found
 ------------ trace
-value1 :: forall a . (Eq a, Num a) => ()
-value2 :: forall a . (Eq a, Num a, Eq a, Num a) => String
+value1 :: forall a . (Eq a, Num a) => ()
+value2 :: forall a . (Eq a, Num a, Eq a, Num a) => String
 ------------ tooltips
-testdata/language-features/basic-values/case02.lc 1:1-1:7  forall a . (Eq a, Num a) => ()
-testdata/language-features/basic-values/case02.lc 1:10-3:10  ()
-testdata/language-features/basic-values/case02.lc 1:15-1:16  _b
-testdata/language-features/basic-values/case02.lc 2:8-2:10  ()
-testdata/language-features/basic-values/case02.lc 2:8-3:10  Bool -> ()
-testdata/language-features/basic-values/case02.lc 3:8-3:10  ()
-testdata/language-features/basic-values/case02.lc 5:1-5:7  forall a . (Eq a, Num a, Eq a, Num a) => String
-testdata/language-features/basic-values/case02.lc 5:10-8:11  String
-testdata/language-features/basic-values/case02.lc 5:15-5:16  _b
-testdata/language-features/basic-values/case02.lc 6:8-6:11  String
-testdata/language-features/basic-values/case02.lc 6:8-8:11  Bool -> String
-testdata/language-features/basic-values/case02.lc 7:8-7:11  String
-testdata/language-features/basic-values/case02.lc 7:8-8:11  Bool -> String | String
-testdata/language-features/basic-values/case02.lc 8:8-8:11  String
+testdata/language-features/basic-values/case02.lc 1:1-1:7
+    forall a . (Eq a, Num a) => ()
+testdata/language-features/basic-values/case02.lc 1:10-3:10
+    ()
+testdata/language-features/basic-values/case02.lc 1:15-1:16
+    _b
+testdata/language-features/basic-values/case02.lc 2:8-2:10
+    ()
+testdata/language-features/basic-values/case02.lc 2:8-3:10
+    Bool -> ()
+testdata/language-features/basic-values/case02.lc 3:8-3:10
+    ()
+testdata/language-features/basic-values/case02.lc 5:1-5:7
+    forall a . (Eq a, Num a, Eq a, Num a) => String
+testdata/language-features/basic-values/case02.lc 5:10-8:11
+    String
+testdata/language-features/basic-values/case02.lc 5:15-5:16
+    _b
+testdata/language-features/basic-values/case02.lc 6:8-6:11
+    String
+testdata/language-features/basic-values/case02.lc 6:8-8:11
+    Bool -> String
+testdata/language-features/basic-values/case02.lc 7:8-7:11
+    String
+testdata/language-features/basic-values/case02.lc 7:8-8:11
+    Bool -> String | String
+testdata/language-features/basic-values/case02.lc 8:8-8:11
+    String
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/case03.reject.out b/testdata/language-features/basic-values/case03.reject.out
index a964eb15..6b272e26 100644
--- a/testdata/language-features/basic-values/case03.reject.out
+++ b/testdata/language-features/basic-values/case03.reject.out
@@ -10,8 +10,13 @@ value1 = case () of
   1 -> ()
   _ -> ()
 ------------ tooltips
-testdata/language-features/basic-values/case03.reject.lc 1:10-3:10  ()
-testdata/language-features/basic-values/case03.reject.lc 1:15-1:17  ()
-testdata/language-features/basic-values/case03.reject.lc 2:8-2:10  ()
-testdata/language-features/basic-values/case03.reject.lc 2:8-3:10  Bool -> ()
-testdata/language-features/basic-values/case03.reject.lc 3:8-3:10  ()
+testdata/language-features/basic-values/case03.reject.lc 1:10-3:10
+    ()
+testdata/language-features/basic-values/case03.reject.lc 1:15-1:17
+    ()
+testdata/language-features/basic-values/case03.reject.lc 2:8-2:10
+    ()
+testdata/language-features/basic-values/case03.reject.lc 2:8-3:10
+    Bool -> ()
+testdata/language-features/basic-values/case03.reject.lc 3:8-3:10
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/case04.reject.out b/testdata/language-features/basic-values/case04.reject.out
index ff2abacc..00cb4f39 100644
--- a/testdata/language-features/basic-values/case04.reject.out
+++ b/testdata/language-features/basic-values/case04.reject.out
@@ -16,5 +16,7 @@ in testdata/language-features/basic-values/case04.reject.lc:2:8:
   1 -> '1'
        ^^^
 ------------ tooltips
-testdata/language-features/basic-values/case04.reject.lc 2:8-2:11  Char
-testdata/language-features/basic-values/case04.reject.lc 3:8-3:10  ()
+testdata/language-features/basic-values/case04.reject.lc 2:8-2:11
+    Char
+testdata/language-features/basic-values/case04.reject.lc 3:8-3:10
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/case05.out b/testdata/language-features/basic-values/case05.out
index 7b58c84f..91b16728 100644
--- a/testdata/language-features/basic-values/case05.out
+++ b/testdata/language-features/basic-values/case05.out
@@ -4,15 +4,19 @@ value
     ((\(b :: _) -> 'BoolCase \_ -> _ :: _ undefined '1' (fromInt 1 == b)) a)
 main is not found
 ------------ trace
-value :: forall a . (Eq a, Num a) => a -> Char
+value :: forall a . (Eq a, Num a) => a -> Char
 ------------ tooltips
-testdata/language-features/basic-values/case05.lc 1:1-1:6  forall a . (Eq a, Num a) => a -> Char
-testdata/language-features/basic-values/case05.lc 1:11-2:11  Char
-testdata/language-features/basic-values/case05.lc 1:16-1:17  _e
-testdata/language-features/basic-values/case05.lc 2:8-2:11  Char
+testdata/language-features/basic-values/case05.lc 1:1-1:6
+    forall a . (Eq a, Num a) => a -> Char
+testdata/language-features/basic-values/case05.lc 1:11-2:11
+    Char
+testdata/language-features/basic-values/case05.lc 1:16-1:17
+    _e
+testdata/language-features/basic-values/case05.lc 2:8-2:11
+    Char
 ------------ warnings
 Uncovered pattern(s) at testdata/language-features/basic-values/case05.lc:1:16:
 value x = case x of
                ^
 Missing case(s):
-  _ | False <- fromInt 1 == _a
+  _ | False <- fromInt 1 == _a
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/case06.out b/testdata/language-features/basic-values/case06.out
index 92b5e196..0ebb8113 100644
--- a/testdata/language-features/basic-values/case06.out
+++ b/testdata/language-features/basic-values/case06.out
@@ -4,11 +4,17 @@ value
     ((\(b :: _) -> 'BoolCase \_ -> _ :: _ '_' '1' (fromInt 1 == b)) a)
 main is not found
 ------------ trace
-value :: forall a . (Eq a, Num a) => a -> Char
+value :: forall a . (Eq a, Num a) => a -> Char
 ------------ tooltips
-testdata/language-features/basic-values/case06.lc 1:1-1:6  forall a . (Eq a, Num a) => a -> Char
-testdata/language-features/basic-values/case06.lc 1:11-3:11  Char
-testdata/language-features/basic-values/case06.lc 1:16-1:17  _e
-testdata/language-features/basic-values/case06.lc 2:8-2:11  Char
-testdata/language-features/basic-values/case06.lc 2:8-3:11  Bool -> Char
-testdata/language-features/basic-values/case06.lc 3:8-3:11  Char
+testdata/language-features/basic-values/case06.lc 1:1-1:6
+    forall a . (Eq a, Num a) => a -> Char
+testdata/language-features/basic-values/case06.lc 1:11-3:11
+    Char
+testdata/language-features/basic-values/case06.lc 1:16-1:17
+    _e
+testdata/language-features/basic-values/case06.lc 2:8-2:11
+    Char
+testdata/language-features/basic-values/case06.lc 2:8-3:11
+    Bool -> Char
+testdata/language-features/basic-values/case06.lc 3:8-3:11
+    Char
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/data01.out b/testdata/language-features/basic-values/data01.out
index aa1f0c31..7c8cf3d7 100644
--- a/testdata/language-features/basic-values/data01.out
+++ b/testdata/language-features/basic-values/data01.out
@@ -13,44 +13,61 @@ data D1 :: Type where
     C3 :: D1
 main is not found
 ------------ trace
-'A :: Type
-B :: A
-C :: A
-D :: A
+'A :: Type
+B :: A
+C :: A
+D :: A
 'ACase
-  :: forall (a :: A -> Type) -> a 'B -> a 'C -> a 'D -> forall (b :: A) -> a b
-match'A :: forall (a :: Type -> Type) -> a A -> forall b -> a b -> a b
-'E :: Type
-F :: E
-G :: () -> E
-H :: E
+  :: forall (a :: A -> Type) -> a 'B -> a 'C -> a 'D -> forall (b :: A) -> a b
+match'A :: forall (a :: Type -> Type) -> a A -> forall b -> a b -> a b
+'E :: Type
+F :: E
+G :: () -> E
+H :: E
 'ECase
-  :: forall (a :: E -> Type)
-    -> a 'F -> (forall (b :: ()) -> a ('G b)) -> a 'H -> forall (c :: E) -> a c
-match'E :: forall (a :: Type -> Type) -> a E -> forall b -> a b -> a b
-'D1 :: Type
-C1 :: D1
-C2 :: () -> D1
-C3 :: D1
+  :: forall (a :: E -> Type)
+    -> a 'F -> (forall (b :: ()) -> a ('G b)) -> a 'H -> forall (c :: E) -> a c
+match'E :: forall (a :: Type -> Type) -> a E -> forall b -> a b -> a b
+'D1 :: Type
+C1 :: D1
+C2 :: () -> D1
+C3 :: D1
 'D1Case
-  :: forall (a :: D1 -> Type)
-    -> a 'C1 -> (forall (b :: ()) -> a ('C2 b)) -> a 'C3 -> forall (c :: D1) -> a c
-match'D1 :: forall (a :: Type -> Type) -> a D1 -> forall b -> a b -> a b
+  :: forall (a :: D1 -> Type)
+    -> a 'C1 -> (forall (b :: ()) -> a ('C2 b)) -> a 'C3 -> forall (c :: D1) -> a c
+match'D1 :: forall (a :: Type -> Type) -> a D1 -> forall b -> a b -> a b
 ------------ tooltips
-testdata/language-features/basic-values/data01.lc 1:6-1:7  Type
-testdata/language-features/basic-values/data01.lc 1:6-1:13  Type
-testdata/language-features/basic-values/data01.lc 1:8-1:9  A
-testdata/language-features/basic-values/data01.lc 1:10-1:11  A
-testdata/language-features/basic-values/data01.lc 1:12-1:13  A
-testdata/language-features/basic-values/data01.lc 3:6-3:7  Type
-testdata/language-features/basic-values/data01.lc 3:6-3:22  Type
-testdata/language-features/basic-values/data01.lc 3:10-3:11  E
-testdata/language-features/basic-values/data01.lc 3:14-3:15  () -> E | E | Type
-testdata/language-features/basic-values/data01.lc 3:16-3:18  Type
-testdata/language-features/basic-values/data01.lc 3:21-3:22  E
-testdata/language-features/basic-values/data01.lc 5:6-5:8  Type
-testdata/language-features/basic-values/data01.lc 5:6-6:13  Type
-testdata/language-features/basic-values/data01.lc 5:9-5:11  D1
-testdata/language-features/basic-values/data01.lc 6:5-6:7  () -> D1 | D1 | Type
-testdata/language-features/basic-values/data01.lc 6:7-6:9  Type
-testdata/language-features/basic-values/data01.lc 6:11-6:13  D1
+testdata/language-features/basic-values/data01.lc 1:6-1:7
+    Type | Type | Type | Type | Type | Type | Type
+testdata/language-features/basic-values/data01.lc 1:6-1:13
+    Type | Type | Type
+testdata/language-features/basic-values/data01.lc 1:8-1:9
+    A
+testdata/language-features/basic-values/data01.lc 1:10-1:11
+    A
+testdata/language-features/basic-values/data01.lc 1:12-1:13
+    A
+testdata/language-features/basic-values/data01.lc 3:6-3:7
+    Type | Type | Type | Type | Type | Type | Type | Type
+testdata/language-features/basic-values/data01.lc 3:6-3:22
+    Type | Type | Type
+testdata/language-features/basic-values/data01.lc 3:10-3:11
+    E
+testdata/language-features/basic-values/data01.lc 3:14-3:15
+    () -> E | E | Type | Type
+testdata/language-features/basic-values/data01.lc 3:16-3:18
+    Type
+testdata/language-features/basic-values/data01.lc 3:21-3:22
+    E
+testdata/language-features/basic-values/data01.lc 5:6-5:8
+    Type | Type | Type | Type | Type | Type | Type | Type
+testdata/language-features/basic-values/data01.lc 5:6-6:13
+    Type | Type | Type
+testdata/language-features/basic-values/data01.lc 5:9-5:11
+    D1
+testdata/language-features/basic-values/data01.lc 6:5-6:7
+    () -> D1 | D1 | Type | Type
+testdata/language-features/basic-values/data01.lc 6:7-6:9
+    Type
+testdata/language-features/basic-values/data01.lc 6:11-6:13
+    D1
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/def01.out b/testdata/language-features/basic-values/def01.out
index 7519f75e..bdc4950d 100644
--- a/testdata/language-features/basic-values/def01.out
+++ b/testdata/language-features/basic-values/def01.out
@@ -4,13 +4,19 @@ fun1 = \_ -> _rhs (fromInt 1)
 fun2 = \_ -> \_ -> \_ -> \_ -> \_ -> _rhs 'c'
 main is not found
 ------------ trace
-unit :: ()
-fun1 :: forall a b . Num b => a -> b
-fun2 :: forall a b c d e . a -> b -> c -> d -> e -> Char
+unit :: ()
+fun1 :: forall a b . Num b => a -> b
+fun2 :: forall a b c d e . a -> b -> c -> d -> e -> Char
 ------------ tooltips
-testdata/language-features/basic-values/def01.lc 1:1-1:5  ()
-testdata/language-features/basic-values/def01.lc 1:8-1:10  ()
-testdata/language-features/basic-values/def01.lc 3:1-3:5  forall a b . Num b => a -> b
-testdata/language-features/basic-values/def01.lc 3:10-3:11  _b
-testdata/language-features/basic-values/def01.lc 5:1-5:5  forall a b c d e . a -> b -> c -> d -> e -> Char
-testdata/language-features/basic-values/def01.lc 5:18-5:21  Char
+testdata/language-features/basic-values/def01.lc 1:1-1:5
+    ()
+testdata/language-features/basic-values/def01.lc 1:8-1:10
+    ()
+testdata/language-features/basic-values/def01.lc 3:1-3:5
+    forall a b . Num b => a -> b
+testdata/language-features/basic-values/def01.lc 3:10-3:11
+    _b
+testdata/language-features/basic-values/def01.lc 5:1-5:5
+    forall a b c d e . a -> b -> c -> d -> e -> Char
+testdata/language-features/basic-values/def01.lc 5:18-5:21
+    Char
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/def03.out b/testdata/language-features/basic-values/def03.out
index 1dca3720..986e6522 100644
--- a/testdata/language-features/basic-values/def03.out
+++ b/testdata/language-features/basic-values/def03.out
@@ -7,15 +7,19 @@ fun
     (fromInt 1 == a)
 main is not found
 ------------ trace
-fun :: forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
+fun :: forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
 ------------ tooltips
-testdata/language-features/basic-values/def03.lc 1:1-1:4  forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
-testdata/language-features/basic-values/def03.lc 1:9-1:12  Char
-testdata/language-features/basic-values/def03.lc 1:9-2:12  Bool -> Char
-testdata/language-features/basic-values/def03.lc 2:9-2:12  Char
+testdata/language-features/basic-values/def03.lc 1:1-1:4
+    forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
+testdata/language-features/basic-values/def03.lc 1:9-1:12
+    Char
+testdata/language-features/basic-values/def03.lc 1:9-2:12
+    Bool -> Char
+testdata/language-features/basic-values/def03.lc 2:9-2:12
+    Char | Char
 ------------ warnings
 Uncovered pattern(s) at testdata/language-features/basic-values/def03.lc:1:1:
 fun 1 = '1'
 fun 2 = '2'
 Missing case(s):
-  _ | False <- fromInt 1 == _a , False <- fromInt 2 == _a
+  _ | False <- fromInt 1 == _a , False <- fromInt 2 == _a
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/def04.out b/testdata/language-features/basic-values/def04.out
index 8c4b3f46..a7f42118 100644
--- a/testdata/language-features/basic-values/def04.out
+++ b/testdata/language-features/basic-values/def04.out
@@ -13,18 +13,30 @@ fun2
     (fromInt 1 == a)
 main is not found
 ------------ trace
-fun :: forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
-fun2 :: forall a b . (Eq a, Num a, Eq a, Num a) => a -> b -> Char
+fun :: forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
+fun2 :: forall a b . (Eq a, Num a, Eq a, Num a) => a -> b -> Char
 ------------ tooltips
-testdata/language-features/basic-values/def04.lc 1:1-1:4  forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
-testdata/language-features/basic-values/def04.lc 1:9-1:12  Char
-testdata/language-features/basic-values/def04.lc 1:9-3:12  Bool -> Char
-testdata/language-features/basic-values/def04.lc 2:9-2:12  Char
-testdata/language-features/basic-values/def04.lc 2:9-3:12  Bool -> Char | Char
-testdata/language-features/basic-values/def04.lc 3:9-3:12  Char
-testdata/language-features/basic-values/def04.lc 5:1-5:5  forall a b . (Eq a, Num a, Eq a, Num a) => a -> b -> Char
-testdata/language-features/basic-values/def04.lc 5:12-5:15  Char
-testdata/language-features/basic-values/def04.lc 5:12-7:15  Bool -> Char
-testdata/language-features/basic-values/def04.lc 6:12-6:15  Char
-testdata/language-features/basic-values/def04.lc 6:12-7:15  Bool -> Char | Char
-testdata/language-features/basic-values/def04.lc 7:12-7:15  Char
+testdata/language-features/basic-values/def04.lc 1:1-1:4
+    forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
+testdata/language-features/basic-values/def04.lc 1:9-1:12
+    Char
+testdata/language-features/basic-values/def04.lc 1:9-3:12
+    Bool -> Char
+testdata/language-features/basic-values/def04.lc 2:9-2:12
+    Char
+testdata/language-features/basic-values/def04.lc 2:9-3:12
+    Bool -> Char | Char
+testdata/language-features/basic-values/def04.lc 3:9-3:12
+    Char
+testdata/language-features/basic-values/def04.lc 5:1-5:5
+    forall a b . (Eq a, Num a, Eq a, Num a) => a -> b -> Char
+testdata/language-features/basic-values/def04.lc 5:12-5:15
+    Char
+testdata/language-features/basic-values/def04.lc 5:12-7:15
+    Bool -> Char
+testdata/language-features/basic-values/def04.lc 6:12-6:15
+    Char
+testdata/language-features/basic-values/def04.lc 6:12-7:15
+    Bool -> Char | Char
+testdata/language-features/basic-values/def04.lc 7:12-7:15
+    Char
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/def07.reject.out b/testdata/language-features/basic-values/def07.reject.out
index 8cb5a1a4..e5afb538 100644
--- a/testdata/language-features/basic-values/def07.reject.out
+++ b/testdata/language-features/basic-values/def07.reject.out
@@ -5,9 +5,9 @@ and at testdata/language-features/basic-values/def07.reject.lc:1:1:
 fun 1 = '1'
 ^^^
 ------------ trace
-fun :: forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
-fun2 :: forall a b . (Eq a, Num a) => a -> b -> Char
-fun :: forall a . a -> Char
+fun :: forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
+fun2 :: forall a b . (Eq a, Num a) => a -> b -> Char
+fun :: forall a . a -> Char
 !already defined fun at testdata/language-features/basic-values/def07.reject.lc:4:1:
 fun _ = '_'
 ^^^
@@ -15,14 +15,22 @@ and at testdata/language-features/basic-values/def07.reject.lc:1:1:
 fun 1 = '1'
 ^^^
 ------------ tooltips
-testdata/language-features/basic-values/def07.reject.lc 1:1-1:4  forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
-testdata/language-features/basic-values/def07.reject.lc 1:9-1:12  Char
-testdata/language-features/basic-values/def07.reject.lc 1:9-2:12  Bool -> Char
-testdata/language-features/basic-values/def07.reject.lc 2:9-2:12  Char
-testdata/language-features/basic-values/def07.reject.lc 3:1-3:5  forall a b . (Eq a, Num a) => a -> b -> Char
-testdata/language-features/basic-values/def07.reject.lc 3:12-3:15  Char
-testdata/language-features/basic-values/def07.reject.lc 4:1-4:4  forall a . a -> Char
-testdata/language-features/basic-values/def07.reject.lc 4:9-4:12  Char
+testdata/language-features/basic-values/def07.reject.lc 1:1-1:4
+    forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
+testdata/language-features/basic-values/def07.reject.lc 1:9-1:12
+    Char
+testdata/language-features/basic-values/def07.reject.lc 1:9-2:12
+    Bool -> Char
+testdata/language-features/basic-values/def07.reject.lc 2:9-2:12
+    Char | Char
+testdata/language-features/basic-values/def07.reject.lc 3:1-3:5
+    forall a b . (Eq a, Num a) => a -> b -> Char
+testdata/language-features/basic-values/def07.reject.lc 3:12-3:15
+    Char
+testdata/language-features/basic-values/def07.reject.lc 4:1-4:4
+    forall a . a -> Char
+testdata/language-features/basic-values/def07.reject.lc 4:9-4:12
+    Char
 ------------ warnings
 Uncovered pattern(s) at testdata/language-features/basic-values/def07.reject.lc:1:1:
 fun 1 = '1'
@@ -33,4 +41,4 @@ Uncovered pattern(s) at testdata/language-features/basic-values/def07.reject.lc:
 fun2 1 _ = '1'
 ^^^^
 Missing case(s):
-  _ _ | False <- fromInt 1 == _b
+  _ _ | False <- fromInt 1 == _b
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/deforder01.out b/testdata/language-features/basic-values/deforder01.out
index be9385d0..2d6ace49 100644
--- a/testdata/language-features/basic-values/deforder01.out
+++ b/testdata/language-features/basic-values/deforder01.out
@@ -3,10 +3,14 @@ x = _rhs '1'
 y = _rhs x
 main is not found
 ------------ trace
-x :: Char
-y :: Char
+x :: Char
+y :: Char
 ------------ tooltips
-testdata/language-features/basic-values/deforder01.lc 1:1-1:2  Char
-testdata/language-features/basic-values/deforder01.lc 1:5-1:8  Char
-testdata/language-features/basic-values/deforder01.lc 2:1-2:2  Char
-testdata/language-features/basic-values/deforder01.lc 2:5-2:6  Char
+testdata/language-features/basic-values/deforder01.lc 1:1-1:2
+    Char
+testdata/language-features/basic-values/deforder01.lc 1:5-1:8
+    Char
+testdata/language-features/basic-values/deforder01.lc 2:1-2:2
+    Char
+testdata/language-features/basic-values/deforder01.lc 2:5-2:6
+    Char
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/deforder02.out b/testdata/language-features/basic-values/deforder02.out
index b8990ab3..7a36e690 100644
--- a/testdata/language-features/basic-values/deforder02.out
+++ b/testdata/language-features/basic-values/deforder02.out
@@ -3,10 +3,14 @@ x = _rhs '1'
 y = _rhs x
 main is not found
 ------------ trace
-x :: Char
-y :: Char
+x :: Char
+y :: Char
 ------------ tooltips
-testdata/language-features/basic-values/deforder02.lc 1:1-1:2  Char
-testdata/language-features/basic-values/deforder02.lc 1:5-1:6  Char
-testdata/language-features/basic-values/deforder02.lc 2:1-2:2  Char
-testdata/language-features/basic-values/deforder02.lc 2:5-2:8  Char
+testdata/language-features/basic-values/deforder02.lc 1:1-1:2
+    Char
+testdata/language-features/basic-values/deforder02.lc 1:5-1:6
+    Char
+testdata/language-features/basic-values/deforder02.lc 2:1-2:2
+    Char
+testdata/language-features/basic-values/deforder02.lc 2:5-2:8
+    Char
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/deforder03.out b/testdata/language-features/basic-values/deforder03.out
index e6f8794d..efc49155 100644
--- a/testdata/language-features/basic-values/deforder03.out
+++ b/testdata/language-features/basic-values/deforder03.out
@@ -2,9 +2,13 @@
 value = _rhs \(a := _rhs HNil) (b := _rhs a) -> '1'
 main is not found
 ------------ trace
-value :: Char
+value :: Char
 ------------ tooltips
-testdata/language-features/basic-values/deforder03.lc 1:1-1:6  Char
-testdata/language-features/basic-values/deforder03.lc 1:17-1:19  ()
-testdata/language-features/basic-values/deforder03.lc 2:17-2:18  ()
-testdata/language-features/basic-values/deforder03.lc 3:12-3:15  Char
+testdata/language-features/basic-values/deforder03.lc 1:1-1:6
+    Char
+testdata/language-features/basic-values/deforder03.lc 1:17-1:19
+    ()
+testdata/language-features/basic-values/deforder03.lc 2:17-2:18
+    ()
+testdata/language-features/basic-values/deforder03.lc 3:12-3:15
+    Char
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/deforder04.out b/testdata/language-features/basic-values/deforder04.out
index ec663000..05e51d11 100644
--- a/testdata/language-features/basic-values/deforder04.out
+++ b/testdata/language-features/basic-values/deforder04.out
@@ -2,9 +2,13 @@
 value = _rhs \(a := _rhs HNil) (b := _rhs a) -> '1'
 main is not found
 ------------ trace
-value :: Char
+value :: Char
 ------------ tooltips
-testdata/language-features/basic-values/deforder04.lc 1:1-1:6  Char
-testdata/language-features/basic-values/deforder04.lc 1:17-1:18  ()
-testdata/language-features/basic-values/deforder04.lc 2:17-2:19  ()
-testdata/language-features/basic-values/deforder04.lc 3:12-3:15  Char
+testdata/language-features/basic-values/deforder04.lc 1:1-1:6
+    Char
+testdata/language-features/basic-values/deforder04.lc 1:17-1:18
+    ()
+testdata/language-features/basic-values/deforder04.lc 2:17-2:19
+    ()
+testdata/language-features/basic-values/deforder04.lc 3:12-3:15
+    Char
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/deforder05.out b/testdata/language-features/basic-values/deforder05.out
index 58a3f0fc..b5da0fdd 100644
--- a/testdata/language-features/basic-values/deforder05.out
+++ b/testdata/language-features/basic-values/deforder05.out
@@ -2,9 +2,13 @@
 value = _rhs \(a := _rhs HNil) (b := _rhs a) -> '1'
 main is not found
 ------------ trace
-value :: Char
+value :: Char
 ------------ tooltips
-testdata/language-features/basic-values/deforder05.lc 1:1-1:6  Char
-testdata/language-features/basic-values/deforder05.lc 1:9-1:12  Char
-testdata/language-features/basic-values/deforder05.lc 1:23-1:24  ()
-testdata/language-features/basic-values/deforder05.lc 2:23-2:25  ()
+testdata/language-features/basic-values/deforder05.lc 1:1-1:6
+    Char
+testdata/language-features/basic-values/deforder05.lc 1:9-1:12
+    Char
+testdata/language-features/basic-values/deforder05.lc 1:23-1:24
+    ()
+testdata/language-features/basic-values/deforder05.lc 2:23-2:25
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/deforder06.out b/testdata/language-features/basic-values/deforder06.out
index 48f45d42..7c4a2b4a 100644
--- a/testdata/language-features/basic-values/deforder06.out
+++ b/testdata/language-features/basic-values/deforder06.out
@@ -2,9 +2,13 @@
 value = _rhs \(a := _rhs HNil) (b := _rhs a) -> '1'
 main is not found
 ------------ trace
-value :: Char
+value :: Char
 ------------ tooltips
-testdata/language-features/basic-values/deforder06.lc 1:1-1:6  Char
-testdata/language-features/basic-values/deforder06.lc 1:9-1:12  Char
-testdata/language-features/basic-values/deforder06.lc 1:23-1:25  ()
-testdata/language-features/basic-values/deforder06.lc 2:23-2:24  ()
+testdata/language-features/basic-values/deforder06.lc 1:1-1:6
+    Char
+testdata/language-features/basic-values/deforder06.lc 1:9-1:12
+    Char
+testdata/language-features/basic-values/deforder06.lc 1:23-1:25
+    ()
+testdata/language-features/basic-values/deforder06.lc 2:23-2:24
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/fixity01.out b/testdata/language-features/basic-values/fixity01.out
index 2274b6a6..ba0fb828 100644
--- a/testdata/language-features/basic-values/fixity01.out
+++ b/testdata/language-features/basic-values/fixity01.out
@@ -9,16 +9,24 @@ infixr 6 >>>>
 infixr 6 funR
 main is not found
 ------------ trace
-funL :: forall a b . a -> b -> a
-funR :: forall a b . a -> b -> a
-<<<< :: forall a b . a -> b -> a
->>>> :: forall a b . a -> b -> b
+funL :: forall a b . a -> b -> a
+funR :: forall a b . a -> b -> a
+<<<< :: forall a b . a -> b -> a
+>>>> :: forall a b . a -> b -> b
 ------------ tooltips
-testdata/language-features/basic-values/fixity01.lc 1:1-1:5  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity01.lc 1:12-1:13  _d
-testdata/language-features/basic-values/fixity01.lc 2:1-2:5  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity01.lc 2:12-2:13  _d
-testdata/language-features/basic-values/fixity01.lc 4:3-4:7  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity01.lc 4:12-4:13  _d
-testdata/language-features/basic-values/fixity01.lc 5:3-5:7  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity01.lc 5:12-5:13  _b
+testdata/language-features/basic-values/fixity01.lc 1:1-1:5
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity01.lc 1:12-1:13
+    _d
+testdata/language-features/basic-values/fixity01.lc 2:1-2:5
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity01.lc 2:12-2:13
+    _d
+testdata/language-features/basic-values/fixity01.lc 4:3-4:7
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity01.lc 4:12-4:13
+    _d
+testdata/language-features/basic-values/fixity01.lc 5:3-5:7
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity01.lc 5:12-5:13
+    _b
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/fixity02.out b/testdata/language-features/basic-values/fixity02.out
index 38f4bea0..d38a6d55 100644
--- a/testdata/language-features/basic-values/fixity02.out
+++ b/testdata/language-features/basic-values/fixity02.out
@@ -25,272 +25,520 @@ funValue7 = _rhs (HNil `funL` 'c' `funR` "hi" `funL` 1.2 :: String)
 funValue8 = _rhs (HNil `funL` 'c' `funL` "hi" `funL` 1.2 :: HList 'Nil)
 main is not found
 ------------ trace
-funL :: forall a b . a -> b -> a
-funR :: forall a b . a -> b -> b
-<@ :: forall a b . a -> b -> a
-@> :: forall a b . a -> b -> b
-value1 :: Float
-value2 :: Float
-value3 :: Float
-value4 :: Float
-value5 :: String
-value6 :: Char
-value7 :: String
-value8 :: ()
-funValue1 :: Float
-funValue2 :: Float
-funValue3 :: Float
-funValue4 :: Float
-funValue5 :: String
-funValue6 :: Char
-funValue7 :: String
-funValue8 :: ()
+funL :: forall a b . a -> b -> a
+funR :: forall a b . a -> b -> b
+<@ :: forall a b . a -> b -> a
+@> :: forall a b . a -> b -> b
+value1 :: Float
+value2 :: Float
+value3 :: Float
+value4 :: Float
+value5 :: String
+value6 :: Char
+value7 :: String
+value8 :: ()
+funValue1 :: Float
+funValue2 :: Float
+funValue3 :: Float
+funValue4 :: Float
+funValue5 :: String
+funValue6 :: Char
+funValue7 :: String
+funValue8 :: ()
 ------------ tooltips
-testdata/language-features/basic-values/fixity02.lc 1:1-1:5  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 1:12-1:13  _d
-testdata/language-features/basic-values/fixity02.lc 2:1-2:5  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 2:12-2:13  _b
-testdata/language-features/basic-values/fixity02.lc 4:3-4:5  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 4:10-4:11  _d
-testdata/language-features/basic-values/fixity02.lc 5:3-5:5  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 5:10-5:11  _b
-testdata/language-features/basic-values/fixity02.lc 11:1-11:7  Float
-testdata/language-features/basic-values/fixity02.lc 11:10-11:12  ()
-testdata/language-features/basic-values/fixity02.lc 11:10-11:15  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 11:10-11:34  Float
-testdata/language-features/basic-values/fixity02.lc 11:13-11:15  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 11:16-11:19  Char
-testdata/language-features/basic-values/fixity02.lc 11:16-11:22  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 11:16-11:34  Float
-testdata/language-features/basic-values/fixity02.lc 11:20-11:22  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 11:23-11:27  String
-testdata/language-features/basic-values/fixity02.lc 11:23-11:30  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 11:23-11:34  Float
-testdata/language-features/basic-values/fixity02.lc 11:28-11:30  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 11:31-11:34  Float
-testdata/language-features/basic-values/fixity02.lc 11:38-11:43  Type
-testdata/language-features/basic-values/fixity02.lc 12:1-12:7  Float
-testdata/language-features/basic-values/fixity02.lc 12:10-12:12  ()
-testdata/language-features/basic-values/fixity02.lc 12:10-12:15  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 12:10-12:34  Float
-testdata/language-features/basic-values/fixity02.lc 12:13-12:15  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 12:16-12:19  Char
-testdata/language-features/basic-values/fixity02.lc 12:16-12:22  _a -> Char
-testdata/language-features/basic-values/fixity02.lc 12:16-12:27  Char
-testdata/language-features/basic-values/fixity02.lc 12:16-12:30  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 12:16-12:34  Float
-testdata/language-features/basic-values/fixity02.lc 12:20-12:22  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 12:23-12:27  String
-testdata/language-features/basic-values/fixity02.lc 12:28-12:30  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 12:31-12:34  Float
-testdata/language-features/basic-values/fixity02.lc 12:38-12:43  Type
-testdata/language-features/basic-values/fixity02.lc 13:1-13:7  Float
-testdata/language-features/basic-values/fixity02.lc 13:10-13:12  ()
-testdata/language-features/basic-values/fixity02.lc 13:10-13:15  _a -> ()
-testdata/language-features/basic-values/fixity02.lc 13:10-13:19  ()
-testdata/language-features/basic-values/fixity02.lc 13:10-13:22  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 13:10-13:34  Float
-testdata/language-features/basic-values/fixity02.lc 13:13-13:15  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 13:16-13:19  Char
-testdata/language-features/basic-values/fixity02.lc 13:20-13:22  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 13:23-13:27  String
-testdata/language-features/basic-values/fixity02.lc 13:23-13:30  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 13:23-13:34  Float
-testdata/language-features/basic-values/fixity02.lc 13:28-13:30  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 13:31-13:34  Float
-testdata/language-features/basic-values/fixity02.lc 13:38-13:43  Type
-testdata/language-features/basic-values/fixity02.lc 14:1-14:7  Float
-testdata/language-features/basic-values/fixity02.lc 14:10-14:12  ()
-testdata/language-features/basic-values/fixity02.lc 14:10-14:15  _a -> ()
-testdata/language-features/basic-values/fixity02.lc 14:10-14:27  ()
-testdata/language-features/basic-values/fixity02.lc 14:10-14:30  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 14:10-14:34  Float
-testdata/language-features/basic-values/fixity02.lc 14:13-14:15  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 14:16-14:19  Char
-testdata/language-features/basic-values/fixity02.lc 14:16-14:22  _a -> Char
-testdata/language-features/basic-values/fixity02.lc 14:16-14:27  Char
-testdata/language-features/basic-values/fixity02.lc 14:20-14:22  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 14:23-14:27  String
-testdata/language-features/basic-values/fixity02.lc 14:28-14:30  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 14:31-14:34  Float
-testdata/language-features/basic-values/fixity02.lc 14:38-14:43  Type
-testdata/language-features/basic-values/fixity02.lc 15:1-15:7  String
-testdata/language-features/basic-values/fixity02.lc 15:10-15:12  ()
-testdata/language-features/basic-values/fixity02.lc 15:10-15:15  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 15:10-15:34  String
-testdata/language-features/basic-values/fixity02.lc 15:13-15:15  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 15:16-15:19  Char
-testdata/language-features/basic-values/fixity02.lc 15:16-15:22  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 15:16-15:34  String
-testdata/language-features/basic-values/fixity02.lc 15:20-15:22  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 15:23-15:27  String
-testdata/language-features/basic-values/fixity02.lc 15:23-15:30  _a -> String
-testdata/language-features/basic-values/fixity02.lc 15:23-15:34  String
-testdata/language-features/basic-values/fixity02.lc 15:28-15:30  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 15:31-15:34  Float
-testdata/language-features/basic-values/fixity02.lc 15:38-15:44  Type
-testdata/language-features/basic-values/fixity02.lc 16:1-16:7  Char
-testdata/language-features/basic-values/fixity02.lc 16:10-16:12  ()
-testdata/language-features/basic-values/fixity02.lc 16:10-16:15  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 16:10-16:34  Char
-testdata/language-features/basic-values/fixity02.lc 16:13-16:15  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 16:16-16:19  Char
-testdata/language-features/basic-values/fixity02.lc 16:16-16:22  _a -> Char
-testdata/language-features/basic-values/fixity02.lc 16:16-16:34  Char
-testdata/language-features/basic-values/fixity02.lc 16:20-16:22  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 16:23-16:27  String
-testdata/language-features/basic-values/fixity02.lc 16:23-16:30  _a -> String
-testdata/language-features/basic-values/fixity02.lc 16:23-16:34  String
-testdata/language-features/basic-values/fixity02.lc 16:28-16:30  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 16:31-16:34  Float
-testdata/language-features/basic-values/fixity02.lc 16:38-16:42  Type
-testdata/language-features/basic-values/fixity02.lc 17:1-17:7  String
-testdata/language-features/basic-values/fixity02.lc 17:10-17:12  ()
-testdata/language-features/basic-values/fixity02.lc 17:10-17:15  _a -> ()
-testdata/language-features/basic-values/fixity02.lc 17:10-17:19  ()
-testdata/language-features/basic-values/fixity02.lc 17:10-17:22  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 17:10-17:34  String
-testdata/language-features/basic-values/fixity02.lc 17:13-17:15  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 17:16-17:19  Char
-testdata/language-features/basic-values/fixity02.lc 17:20-17:22  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 17:23-17:27  String
-testdata/language-features/basic-values/fixity02.lc 17:23-17:30  _a -> String
-testdata/language-features/basic-values/fixity02.lc 17:23-17:34  String
-testdata/language-features/basic-values/fixity02.lc 17:28-17:30  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 17:31-17:34  Float
-testdata/language-features/basic-values/fixity02.lc 17:38-17:44  Type
-testdata/language-features/basic-values/fixity02.lc 18:1-18:7  ()
-testdata/language-features/basic-values/fixity02.lc 18:10-18:12  ()
-testdata/language-features/basic-values/fixity02.lc 18:10-18:15  _a -> ()
-testdata/language-features/basic-values/fixity02.lc 18:10-18:34  ()
-testdata/language-features/basic-values/fixity02.lc 18:13-18:15  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 18:16-18:19  Char
-testdata/language-features/basic-values/fixity02.lc 18:16-18:22  _a -> Char
-testdata/language-features/basic-values/fixity02.lc 18:16-18:34  Char
-testdata/language-features/basic-values/fixity02.lc 18:20-18:22  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 18:23-18:27  String
-testdata/language-features/basic-values/fixity02.lc 18:23-18:30  _a -> String
-testdata/language-features/basic-values/fixity02.lc 18:23-18:34  String
-testdata/language-features/basic-values/fixity02.lc 18:28-18:30  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 18:31-18:34  Float
-testdata/language-features/basic-values/fixity02.lc 18:38-18:40  Type
-testdata/language-features/basic-values/fixity02.lc 20:1-20:10  Float
-testdata/language-features/basic-values/fixity02.lc 20:13-20:15  ()
-testdata/language-features/basic-values/fixity02.lc 20:13-20:22  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 20:13-20:49  Float
-testdata/language-features/basic-values/fixity02.lc 20:16-20:22  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 20:23-20:26  Char
-testdata/language-features/basic-values/fixity02.lc 20:23-20:33  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 20:23-20:49  Float
-testdata/language-features/basic-values/fixity02.lc 20:27-20:33  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 20:34-20:38  String
-testdata/language-features/basic-values/fixity02.lc 20:34-20:45  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 20:34-20:49  Float
-testdata/language-features/basic-values/fixity02.lc 20:39-20:45  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 20:46-20:49  Float
-testdata/language-features/basic-values/fixity02.lc 20:53-20:58  Type
-testdata/language-features/basic-values/fixity02.lc 21:1-21:10  Float
-testdata/language-features/basic-values/fixity02.lc 21:13-21:15  ()
-testdata/language-features/basic-values/fixity02.lc 21:13-21:22  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 21:13-21:49  Float
-testdata/language-features/basic-values/fixity02.lc 21:16-21:22  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 21:23-21:26  Char
-testdata/language-features/basic-values/fixity02.lc 21:23-21:33  _a -> Char
-testdata/language-features/basic-values/fixity02.lc 21:23-21:38  Char
-testdata/language-features/basic-values/fixity02.lc 21:23-21:45  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 21:23-21:49  Float
-testdata/language-features/basic-values/fixity02.lc 21:27-21:33  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 21:34-21:38  String
-testdata/language-features/basic-values/fixity02.lc 21:39-21:45  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 21:46-21:49  Float
-testdata/language-features/basic-values/fixity02.lc 21:53-21:58  Type
-testdata/language-features/basic-values/fixity02.lc 22:1-22:10  Float
-testdata/language-features/basic-values/fixity02.lc 22:13-22:15  ()
-testdata/language-features/basic-values/fixity02.lc 22:13-22:22  _a -> ()
-testdata/language-features/basic-values/fixity02.lc 22:13-22:26  ()
-testdata/language-features/basic-values/fixity02.lc 22:13-22:33  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 22:13-22:49  Float
-testdata/language-features/basic-values/fixity02.lc 22:16-22:22  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 22:23-22:26  Char
-testdata/language-features/basic-values/fixity02.lc 22:27-22:33  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 22:34-22:38  String
-testdata/language-features/basic-values/fixity02.lc 22:34-22:45  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 22:34-22:49  Float
-testdata/language-features/basic-values/fixity02.lc 22:39-22:45  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 22:46-22:49  Float
-testdata/language-features/basic-values/fixity02.lc 22:53-22:58  Type
-testdata/language-features/basic-values/fixity02.lc 23:1-23:10  Float
-testdata/language-features/basic-values/fixity02.lc 23:13-23:15  ()
-testdata/language-features/basic-values/fixity02.lc 23:13-23:22  _a -> ()
-testdata/language-features/basic-values/fixity02.lc 23:13-23:38  ()
-testdata/language-features/basic-values/fixity02.lc 23:13-23:45  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 23:13-23:49  Float
-testdata/language-features/basic-values/fixity02.lc 23:16-23:22  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 23:23-23:26  Char
-testdata/language-features/basic-values/fixity02.lc 23:23-23:33  _a -> Char
-testdata/language-features/basic-values/fixity02.lc 23:23-23:38  Char
-testdata/language-features/basic-values/fixity02.lc 23:27-23:33  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 23:34-23:38  String
-testdata/language-features/basic-values/fixity02.lc 23:39-23:45  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 23:46-23:49  Float
-testdata/language-features/basic-values/fixity02.lc 23:53-23:58  Type
-testdata/language-features/basic-values/fixity02.lc 24:1-24:10  String
-testdata/language-features/basic-values/fixity02.lc 24:13-24:15  ()
-testdata/language-features/basic-values/fixity02.lc 24:13-24:22  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 24:13-24:49  String
-testdata/language-features/basic-values/fixity02.lc 24:16-24:22  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 24:23-24:26  Char
-testdata/language-features/basic-values/fixity02.lc 24:23-24:33  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 24:23-24:49  String
-testdata/language-features/basic-values/fixity02.lc 24:27-24:33  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 24:34-24:38  String
-testdata/language-features/basic-values/fixity02.lc 24:34-24:45  _a -> String
-testdata/language-features/basic-values/fixity02.lc 24:34-24:49  String
-testdata/language-features/basic-values/fixity02.lc 24:39-24:45  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 24:46-24:49  Float
-testdata/language-features/basic-values/fixity02.lc 24:53-24:59  Type
-testdata/language-features/basic-values/fixity02.lc 25:1-25:10  Char
-testdata/language-features/basic-values/fixity02.lc 25:13-25:15  ()
-testdata/language-features/basic-values/fixity02.lc 25:13-25:22  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 25:13-25:49  Char
-testdata/language-features/basic-values/fixity02.lc 25:16-25:22  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 25:23-25:26  Char
-testdata/language-features/basic-values/fixity02.lc 25:23-25:33  _a -> Char
-testdata/language-features/basic-values/fixity02.lc 25:23-25:49  Char
-testdata/language-features/basic-values/fixity02.lc 25:27-25:33  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 25:34-25:38  String
-testdata/language-features/basic-values/fixity02.lc 25:34-25:45  _a -> String
-testdata/language-features/basic-values/fixity02.lc 25:34-25:49  String
-testdata/language-features/basic-values/fixity02.lc 25:39-25:45  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 25:46-25:49  Float
-testdata/language-features/basic-values/fixity02.lc 25:53-25:57  Type
-testdata/language-features/basic-values/fixity02.lc 26:1-26:10  String
-testdata/language-features/basic-values/fixity02.lc 26:13-26:15  ()
-testdata/language-features/basic-values/fixity02.lc 26:13-26:22  _a -> ()
-testdata/language-features/basic-values/fixity02.lc 26:13-26:26  ()
-testdata/language-features/basic-values/fixity02.lc 26:13-26:33  _a -> _a
-testdata/language-features/basic-values/fixity02.lc 26:13-26:49  String
-testdata/language-features/basic-values/fixity02.lc 26:16-26:22  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 26:23-26:26  Char
-testdata/language-features/basic-values/fixity02.lc 26:27-26:33  forall a b . a -> b -> b
-testdata/language-features/basic-values/fixity02.lc 26:34-26:38  String
-testdata/language-features/basic-values/fixity02.lc 26:34-26:45  _a -> String
-testdata/language-features/basic-values/fixity02.lc 26:34-26:49  String
-testdata/language-features/basic-values/fixity02.lc 26:39-26:45  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 26:46-26:49  Float
-testdata/language-features/basic-values/fixity02.lc 26:53-26:59  Type
-testdata/language-features/basic-values/fixity02.lc 27:1-27:10  ()
-testdata/language-features/basic-values/fixity02.lc 27:13-27:15  ()
-testdata/language-features/basic-values/fixity02.lc 27:13-27:22  _a -> ()
-testdata/language-features/basic-values/fixity02.lc 27:13-27:49  ()
-testdata/language-features/basic-values/fixity02.lc 27:16-27:22  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 27:23-27:26  Char
-testdata/language-features/basic-values/fixity02.lc 27:23-27:33  _a -> Char
-testdata/language-features/basic-values/fixity02.lc 27:23-27:49  Char
-testdata/language-features/basic-values/fixity02.lc 27:27-27:33  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 27:34-27:38  String
-testdata/language-features/basic-values/fixity02.lc 27:34-27:45  _a -> String
-testdata/language-features/basic-values/fixity02.lc 27:34-27:49  String
-testdata/language-features/basic-values/fixity02.lc 27:39-27:45  forall a b . a -> b -> a
-testdata/language-features/basic-values/fixity02.lc 27:46-27:49  Float
-testdata/language-features/basic-values/fixity02.lc 27:53-27:55  Type
+testdata/language-features/basic-values/fixity02.lc 1:1-1:5
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 1:12-1:13
+    _d
+testdata/language-features/basic-values/fixity02.lc 2:1-2:5
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 2:12-2:13
+    _b
+testdata/language-features/basic-values/fixity02.lc 4:3-4:5
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 4:10-4:11
+    _d
+testdata/language-features/basic-values/fixity02.lc 5:3-5:5
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 5:10-5:11
+    _b
+testdata/language-features/basic-values/fixity02.lc 11:1-11:7
+    Float
+testdata/language-features/basic-values/fixity02.lc 11:10-11:12
+    ()
+testdata/language-features/basic-values/fixity02.lc 11:10-11:15
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 11:10-11:34
+    Float
+testdata/language-features/basic-values/fixity02.lc 11:13-11:15
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 11:16-11:19
+    Char
+testdata/language-features/basic-values/fixity02.lc 11:16-11:22
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 11:16-11:34
+    Float
+testdata/language-features/basic-values/fixity02.lc 11:20-11:22
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 11:23-11:27
+    String
+testdata/language-features/basic-values/fixity02.lc 11:23-11:30
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 11:23-11:34
+    Float
+testdata/language-features/basic-values/fixity02.lc 11:28-11:30
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 11:31-11:34
+    Float
+testdata/language-features/basic-values/fixity02.lc 11:38-11:43
+    Type
+testdata/language-features/basic-values/fixity02.lc 12:1-12:7
+    Float
+testdata/language-features/basic-values/fixity02.lc 12:10-12:12
+    ()
+testdata/language-features/basic-values/fixity02.lc 12:10-12:15
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 12:10-12:34
+    Float
+testdata/language-features/basic-values/fixity02.lc 12:13-12:15
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 12:16-12:19
+    Char
+testdata/language-features/basic-values/fixity02.lc 12:16-12:22
+    _a -> Char
+testdata/language-features/basic-values/fixity02.lc 12:16-12:27
+    Char
+testdata/language-features/basic-values/fixity02.lc 12:16-12:30
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 12:16-12:34
+    Float
+testdata/language-features/basic-values/fixity02.lc 12:20-12:22
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 12:23-12:27
+    String
+testdata/language-features/basic-values/fixity02.lc 12:28-12:30
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 12:31-12:34
+    Float
+testdata/language-features/basic-values/fixity02.lc 12:38-12:43
+    Type
+testdata/language-features/basic-values/fixity02.lc 13:1-13:7
+    Float
+testdata/language-features/basic-values/fixity02.lc 13:10-13:12
+    ()
+testdata/language-features/basic-values/fixity02.lc 13:10-13:15
+    _a -> ()
+testdata/language-features/basic-values/fixity02.lc 13:10-13:19
+    ()
+testdata/language-features/basic-values/fixity02.lc 13:10-13:22
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 13:10-13:34
+    Float
+testdata/language-features/basic-values/fixity02.lc 13:13-13:15
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 13:16-13:19
+    Char
+testdata/language-features/basic-values/fixity02.lc 13:20-13:22
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 13:23-13:27
+    String
+testdata/language-features/basic-values/fixity02.lc 13:23-13:30
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 13:23-13:34
+    Float
+testdata/language-features/basic-values/fixity02.lc 13:28-13:30
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 13:31-13:34
+    Float
+testdata/language-features/basic-values/fixity02.lc 13:38-13:43
+    Type
+testdata/language-features/basic-values/fixity02.lc 14:1-14:7
+    Float
+testdata/language-features/basic-values/fixity02.lc 14:10-14:12
+    ()
+testdata/language-features/basic-values/fixity02.lc 14:10-14:15
+    _a -> ()
+testdata/language-features/basic-values/fixity02.lc 14:10-14:27
+    ()
+testdata/language-features/basic-values/fixity02.lc 14:10-14:30
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 14:10-14:34
+    Float
+testdata/language-features/basic-values/fixity02.lc 14:13-14:15
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 14:16-14:19
+    Char
+testdata/language-features/basic-values/fixity02.lc 14:16-14:22
+    _a -> Char
+testdata/language-features/basic-values/fixity02.lc 14:16-14:27
+    Char
+testdata/language-features/basic-values/fixity02.lc 14:20-14:22
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 14:23-14:27
+    String
+testdata/language-features/basic-values/fixity02.lc 14:28-14:30
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 14:31-14:34
+    Float
+testdata/language-features/basic-values/fixity02.lc 14:38-14:43
+    Type
+testdata/language-features/basic-values/fixity02.lc 15:1-15:7
+    String
+testdata/language-features/basic-values/fixity02.lc 15:10-15:12
+    ()
+testdata/language-features/basic-values/fixity02.lc 15:10-15:15
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 15:10-15:34
+    String
+testdata/language-features/basic-values/fixity02.lc 15:13-15:15
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 15:16-15:19
+    Char
+testdata/language-features/basic-values/fixity02.lc 15:16-15:22
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 15:16-15:34
+    String
+testdata/language-features/basic-values/fixity02.lc 15:20-15:22
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 15:23-15:27
+    String
+testdata/language-features/basic-values/fixity02.lc 15:23-15:30
+    _a -> String
+testdata/language-features/basic-values/fixity02.lc 15:23-15:34
+    String
+testdata/language-features/basic-values/fixity02.lc 15:28-15:30
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 15:31-15:34
+    Float
+testdata/language-features/basic-values/fixity02.lc 15:38-15:44
+    Type
+testdata/language-features/basic-values/fixity02.lc 16:1-16:7
+    Char
+testdata/language-features/basic-values/fixity02.lc 16:10-16:12
+    ()
+testdata/language-features/basic-values/fixity02.lc 16:10-16:15
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 16:10-16:34
+    Char
+testdata/language-features/basic-values/fixity02.lc 16:13-16:15
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 16:16-16:19
+    Char
+testdata/language-features/basic-values/fixity02.lc 16:16-16:22
+    _a -> Char
+testdata/language-features/basic-values/fixity02.lc 16:16-16:34
+    Char
+testdata/language-features/basic-values/fixity02.lc 16:20-16:22
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 16:23-16:27
+    String
+testdata/language-features/basic-values/fixity02.lc 16:23-16:30
+    _a -> String
+testdata/language-features/basic-values/fixity02.lc 16:23-16:34
+    String
+testdata/language-features/basic-values/fixity02.lc 16:28-16:30
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 16:31-16:34
+    Float
+testdata/language-features/basic-values/fixity02.lc 16:38-16:42
+    Type
+testdata/language-features/basic-values/fixity02.lc 17:1-17:7
+    String
+testdata/language-features/basic-values/fixity02.lc 17:10-17:12
+    ()
+testdata/language-features/basic-values/fixity02.lc 17:10-17:15
+    _a -> ()
+testdata/language-features/basic-values/fixity02.lc 17:10-17:19
+    ()
+testdata/language-features/basic-values/fixity02.lc 17:10-17:22
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 17:10-17:34
+    String
+testdata/language-features/basic-values/fixity02.lc 17:13-17:15
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 17:16-17:19
+    Char
+testdata/language-features/basic-values/fixity02.lc 17:20-17:22
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 17:23-17:27
+    String
+testdata/language-features/basic-values/fixity02.lc 17:23-17:30
+    _a -> String
+testdata/language-features/basic-values/fixity02.lc 17:23-17:34
+    String
+testdata/language-features/basic-values/fixity02.lc 17:28-17:30
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 17:31-17:34
+    Float
+testdata/language-features/basic-values/fixity02.lc 17:38-17:44
+    Type
+testdata/language-features/basic-values/fixity02.lc 18:1-18:7
+    ()
+testdata/language-features/basic-values/fixity02.lc 18:10-18:12
+    ()
+testdata/language-features/basic-values/fixity02.lc 18:10-18:15
+    _a -> ()
+testdata/language-features/basic-values/fixity02.lc 18:10-18:34
+    ()
+testdata/language-features/basic-values/fixity02.lc 18:13-18:15
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 18:16-18:19
+    Char
+testdata/language-features/basic-values/fixity02.lc 18:16-18:22
+    _a -> Char
+testdata/language-features/basic-values/fixity02.lc 18:16-18:34
+    Char
+testdata/language-features/basic-values/fixity02.lc 18:20-18:22
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 18:23-18:27
+    String
+testdata/language-features/basic-values/fixity02.lc 18:23-18:30
+    _a -> String
+testdata/language-features/basic-values/fixity02.lc 18:23-18:34
+    String
+testdata/language-features/basic-values/fixity02.lc 18:28-18:30
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 18:31-18:34
+    Float
+testdata/language-features/basic-values/fixity02.lc 18:38-18:40
+    Type
+testdata/language-features/basic-values/fixity02.lc 20:1-20:10
+    Float
+testdata/language-features/basic-values/fixity02.lc 20:13-20:15
+    ()
+testdata/language-features/basic-values/fixity02.lc 20:13-20:22
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 20:13-20:49
+    Float
+testdata/language-features/basic-values/fixity02.lc 20:16-20:22
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 20:23-20:26
+    Char
+testdata/language-features/basic-values/fixity02.lc 20:23-20:33
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 20:23-20:49
+    Float
+testdata/language-features/basic-values/fixity02.lc 20:27-20:33
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 20:34-20:38
+    String
+testdata/language-features/basic-values/fixity02.lc 20:34-20:45
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 20:34-20:49
+    Float
+testdata/language-features/basic-values/fixity02.lc 20:39-20:45
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 20:46-20:49
+    Float
+testdata/language-features/basic-values/fixity02.lc 20:53-20:58
+    Type
+testdata/language-features/basic-values/fixity02.lc 21:1-21:10
+    Float
+testdata/language-features/basic-values/fixity02.lc 21:13-21:15
+    ()
+testdata/language-features/basic-values/fixity02.lc 21:13-21:22
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 21:13-21:49
+    Float
+testdata/language-features/basic-values/fixity02.lc 21:16-21:22
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 21:23-21:26
+    Char
+testdata/language-features/basic-values/fixity02.lc 21:23-21:33
+    _a -> Char
+testdata/language-features/basic-values/fixity02.lc 21:23-21:38
+    Char
+testdata/language-features/basic-values/fixity02.lc 21:23-21:45
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 21:23-21:49
+    Float
+testdata/language-features/basic-values/fixity02.lc 21:27-21:33
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 21:34-21:38
+    String
+testdata/language-features/basic-values/fixity02.lc 21:39-21:45
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 21:46-21:49
+    Float
+testdata/language-features/basic-values/fixity02.lc 21:53-21:58
+    Type
+testdata/language-features/basic-values/fixity02.lc 22:1-22:10
+    Float
+testdata/language-features/basic-values/fixity02.lc 22:13-22:15
+    ()
+testdata/language-features/basic-values/fixity02.lc 22:13-22:22
+    _a -> ()
+testdata/language-features/basic-values/fixity02.lc 22:13-22:26
+    ()
+testdata/language-features/basic-values/fixity02.lc 22:13-22:33
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 22:13-22:49
+    Float
+testdata/language-features/basic-values/fixity02.lc 22:16-22:22
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 22:23-22:26
+    Char
+testdata/language-features/basic-values/fixity02.lc 22:27-22:33
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 22:34-22:38
+    String
+testdata/language-features/basic-values/fixity02.lc 22:34-22:45
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 22:34-22:49
+    Float
+testdata/language-features/basic-values/fixity02.lc 22:39-22:45
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 22:46-22:49
+    Float
+testdata/language-features/basic-values/fixity02.lc 22:53-22:58
+    Type
+testdata/language-features/basic-values/fixity02.lc 23:1-23:10
+    Float
+testdata/language-features/basic-values/fixity02.lc 23:13-23:15
+    ()
+testdata/language-features/basic-values/fixity02.lc 23:13-23:22
+    _a -> ()
+testdata/language-features/basic-values/fixity02.lc 23:13-23:38
+    ()
+testdata/language-features/basic-values/fixity02.lc 23:13-23:45
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 23:13-23:49
+    Float
+testdata/language-features/basic-values/fixity02.lc 23:16-23:22
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 23:23-23:26
+    Char
+testdata/language-features/basic-values/fixity02.lc 23:23-23:33
+    _a -> Char
+testdata/language-features/basic-values/fixity02.lc 23:23-23:38
+    Char
+testdata/language-features/basic-values/fixity02.lc 23:27-23:33
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 23:34-23:38
+    String
+testdata/language-features/basic-values/fixity02.lc 23:39-23:45
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 23:46-23:49
+    Float
+testdata/language-features/basic-values/fixity02.lc 23:53-23:58
+    Type
+testdata/language-features/basic-values/fixity02.lc 24:1-24:10
+    String
+testdata/language-features/basic-values/fixity02.lc 24:13-24:15
+    ()
+testdata/language-features/basic-values/fixity02.lc 24:13-24:22
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 24:13-24:49
+    String
+testdata/language-features/basic-values/fixity02.lc 24:16-24:22
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 24:23-24:26
+    Char
+testdata/language-features/basic-values/fixity02.lc 24:23-24:33
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 24:23-24:49
+    String
+testdata/language-features/basic-values/fixity02.lc 24:27-24:33
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 24:34-24:38
+    String
+testdata/language-features/basic-values/fixity02.lc 24:34-24:45
+    _a -> String
+testdata/language-features/basic-values/fixity02.lc 24:34-24:49
+    String
+testdata/language-features/basic-values/fixity02.lc 24:39-24:45
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 24:46-24:49
+    Float
+testdata/language-features/basic-values/fixity02.lc 24:53-24:59
+    Type
+testdata/language-features/basic-values/fixity02.lc 25:1-25:10
+    Char
+testdata/language-features/basic-values/fixity02.lc 25:13-25:15
+    ()
+testdata/language-features/basic-values/fixity02.lc 25:13-25:22
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 25:13-25:49
+    Char
+testdata/language-features/basic-values/fixity02.lc 25:16-25:22
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 25:23-25:26
+    Char
+testdata/language-features/basic-values/fixity02.lc 25:23-25:33
+    _a -> Char
+testdata/language-features/basic-values/fixity02.lc 25:23-25:49
+    Char
+testdata/language-features/basic-values/fixity02.lc 25:27-25:33
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 25:34-25:38
+    String
+testdata/language-features/basic-values/fixity02.lc 25:34-25:45
+    _a -> String
+testdata/language-features/basic-values/fixity02.lc 25:34-25:49
+    String
+testdata/language-features/basic-values/fixity02.lc 25:39-25:45
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 25:46-25:49
+    Float
+testdata/language-features/basic-values/fixity02.lc 25:53-25:57
+    Type
+testdata/language-features/basic-values/fixity02.lc 26:1-26:10
+    String
+testdata/language-features/basic-values/fixity02.lc 26:13-26:15
+    ()
+testdata/language-features/basic-values/fixity02.lc 26:13-26:22
+    _a -> ()
+testdata/language-features/basic-values/fixity02.lc 26:13-26:26
+    ()
+testdata/language-features/basic-values/fixity02.lc 26:13-26:33
+    _a -> _a
+testdata/language-features/basic-values/fixity02.lc 26:13-26:49
+    String
+testdata/language-features/basic-values/fixity02.lc 26:16-26:22
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 26:23-26:26
+    Char
+testdata/language-features/basic-values/fixity02.lc 26:27-26:33
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 26:34-26:38
+    String
+testdata/language-features/basic-values/fixity02.lc 26:34-26:45
+    _a -> String
+testdata/language-features/basic-values/fixity02.lc 26:34-26:49
+    String
+testdata/language-features/basic-values/fixity02.lc 26:39-26:45
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 26:46-26:49
+    Float
+testdata/language-features/basic-values/fixity02.lc 26:53-26:59
+    Type
+testdata/language-features/basic-values/fixity02.lc 27:1-27:10
+    ()
+testdata/language-features/basic-values/fixity02.lc 27:13-27:15
+    ()
+testdata/language-features/basic-values/fixity02.lc 27:13-27:22
+    _a -> ()
+testdata/language-features/basic-values/fixity02.lc 27:13-27:49
+    ()
+testdata/language-features/basic-values/fixity02.lc 27:16-27:22
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 27:23-27:26
+    Char
+testdata/language-features/basic-values/fixity02.lc 27:23-27:33
+    _a -> Char
+testdata/language-features/basic-values/fixity02.lc 27:23-27:49
+    Char
+testdata/language-features/basic-values/fixity02.lc 27:27-27:33
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 27:34-27:38
+    String
+testdata/language-features/basic-values/fixity02.lc 27:34-27:45
+    _a -> String
+testdata/language-features/basic-values/fixity02.lc 27:34-27:49
+    String
+testdata/language-features/basic-values/fixity02.lc 27:39-27:45
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 27:46-27:49
+    Float
+testdata/language-features/basic-values/fixity02.lc 27:53-27:55
+    Type
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/if01.out b/testdata/language-features/basic-values/if01.out
index 1e472faf..b16d8586 100644
--- a/testdata/language-features/basic-values/if01.out
+++ b/testdata/language-features/basic-values/if01.out
@@ -3,18 +3,30 @@ value1 = _rhs (primIfThenElse True HNil HNil)
 value2 = _rhs (primIfThenElse False 1.0 2.0)
 main is not found
 ------------ trace
-value1 :: ()
-value2 :: Float
+value1 :: ()
+value2 :: Float
 ------------ tooltips
-testdata/language-features/basic-values/if01.lc 1:1-1:7  ()
-testdata/language-features/basic-values/if01.lc 1:10-1:33  ()
-testdata/language-features/basic-values/if01.lc 1:13-1:17  Bool
-testdata/language-features/basic-values/if01.lc 1:13-1:25  () -> ()
-testdata/language-features/basic-values/if01.lc 1:23-1:25  ()
-testdata/language-features/basic-values/if01.lc 1:31-1:33  ()
-testdata/language-features/basic-values/if01.lc 2:1-2:7  Float
-testdata/language-features/basic-values/if01.lc 2:10-2:36  Float
-testdata/language-features/basic-values/if01.lc 2:13-2:18  Bool
-testdata/language-features/basic-values/if01.lc 2:13-2:27  Float -> Float
-testdata/language-features/basic-values/if01.lc 2:24-2:27  Float
-testdata/language-features/basic-values/if01.lc 2:33-2:36  Float
+testdata/language-features/basic-values/if01.lc 1:1-1:7
+    ()
+testdata/language-features/basic-values/if01.lc 1:10-1:33
+    ()
+testdata/language-features/basic-values/if01.lc 1:13-1:17
+    Bool
+testdata/language-features/basic-values/if01.lc 1:13-1:25
+    () -> ()
+testdata/language-features/basic-values/if01.lc 1:23-1:25
+    ()
+testdata/language-features/basic-values/if01.lc 1:31-1:33
+    ()
+testdata/language-features/basic-values/if01.lc 2:1-2:7
+    Float
+testdata/language-features/basic-values/if01.lc 2:10-2:36
+    Float
+testdata/language-features/basic-values/if01.lc 2:13-2:18
+    Bool
+testdata/language-features/basic-values/if01.lc 2:13-2:27
+    Float -> Float
+testdata/language-features/basic-values/if01.lc 2:24-2:27
+    Float
+testdata/language-features/basic-values/if01.lc 2:33-2:36
+    Float
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/if03.reject.out b/testdata/language-features/basic-values/if03.reject.out
index 125dd5b5..9ba86d9c 100644
--- a/testdata/language-features/basic-values/if03.reject.out
+++ b/testdata/language-features/basic-values/if03.reject.out
@@ -16,4 +16,5 @@ in testdata/language-features/basic-values/if03.reject.lc:1:13:
 value1 = if () then () else ()
             ^^
 ------------ tooltips
-testdata/language-features/basic-values/if03.reject.lc 1:13-1:15  ()
+testdata/language-features/basic-values/if03.reject.lc 1:13-1:15
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/if04.reject.out b/testdata/language-features/basic-values/if04.reject.out
index 6313eddc..c0df8c35 100644
--- a/testdata/language-features/basic-values/if04.reject.out
+++ b/testdata/language-features/basic-values/if04.reject.out
@@ -16,7 +16,11 @@ in testdata/language-features/basic-values/if04.reject.lc:1:31:
 value1 = if True then () else '_'
                               ^^^
 ------------ tooltips
-testdata/language-features/basic-values/if04.reject.lc 1:13-1:17  Bool
-testdata/language-features/basic-values/if04.reject.lc 1:13-1:25  () -> ()
-testdata/language-features/basic-values/if04.reject.lc 1:23-1:25  ()
-testdata/language-features/basic-values/if04.reject.lc 1:31-1:34  Char
+testdata/language-features/basic-values/if04.reject.lc 1:13-1:17
+    Bool
+testdata/language-features/basic-values/if04.reject.lc 1:13-1:25
+    () -> ()
+testdata/language-features/basic-values/if04.reject.lc 1:23-1:25
+    ()
+testdata/language-features/basic-values/if04.reject.lc 1:31-1:34
+    Char
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/indentation01.out b/testdata/language-features/basic-values/indentation01.out
index 0540da3c..a607690b 100644
--- a/testdata/language-features/basic-values/indentation01.out
+++ b/testdata/language-features/basic-values/indentation01.out
@@ -3,10 +3,14 @@ tuple1 = _rhs HNil
 tuple2 = _rhs HNil
 main is not found
 ------------ trace
-tuple1 :: ()
-tuple2 :: ()
+tuple1 :: ()
+tuple2 :: ()
 ------------ tooltips
-testdata/language-features/basic-values/indentation01.lc 1:1-1:7  ()
-testdata/language-features/basic-values/indentation01.lc 1:10-1:12  ()
-testdata/language-features/basic-values/indentation01.lc 2:1-2:7  ()
-testdata/language-features/basic-values/indentation01.lc 2:10-2:12  ()
+testdata/language-features/basic-values/indentation01.lc 1:1-1:7
+    ()
+testdata/language-features/basic-values/indentation01.lc 1:10-1:12
+    ()
+testdata/language-features/basic-values/indentation01.lc 2:1-2:7
+    ()
+testdata/language-features/basic-values/indentation01.lc 2:10-2:12
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/indentation02.out b/testdata/language-features/basic-values/indentation02.out
index 8fa11e6c..97b138e0 100644
--- a/testdata/language-features/basic-values/indentation02.out
+++ b/testdata/language-features/basic-values/indentation02.out
@@ -3,10 +3,14 @@ tuple1 = _rhs HNil
 tuple2 = _rhs HNil
 main is not found
 ------------ trace
-tuple1 :: ()
-tuple2 :: ()
+tuple1 :: ()
+tuple2 :: ()
 ------------ tooltips
-testdata/language-features/basic-values/indentation02.lc 1:3-1:9  ()
-testdata/language-features/basic-values/indentation02.lc 1:12-1:14  ()
-testdata/language-features/basic-values/indentation02.lc 2:3-2:9  ()
-testdata/language-features/basic-values/indentation02.lc 2:12-2:14  ()
+testdata/language-features/basic-values/indentation02.lc 1:3-1:9
+    ()
+testdata/language-features/basic-values/indentation02.lc 1:12-1:14
+    ()
+testdata/language-features/basic-values/indentation02.lc 2:3-2:9
+    ()
+testdata/language-features/basic-values/indentation02.lc 2:12-2:14
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/infix01.out b/testdata/language-features/basic-values/infix01.out
index ec2b9ce7..dbfe5d56 100644
--- a/testdata/language-features/basic-values/infix01.out
+++ b/testdata/language-features/basic-values/infix01.out
@@ -3,14 +3,22 @@ fun = \_ -> \_ -> _rhs HNil
 value = \(a :: _) (b :: _) -> _rhs (a `fun` b)
 main is not found
 ------------ trace
-fun :: forall a b . a -> b -> ()
-value :: forall a b . a -> b -> ()
+fun :: forall a b . a -> b -> ()
+value :: forall a b . a -> b -> ()
 ------------ tooltips
-testdata/language-features/basic-values/infix01.lc 1:1-1:4  forall a b . a -> b -> ()
-testdata/language-features/basic-values/infix01.lc 1:11-1:13  ()
-testdata/language-features/basic-values/infix01.lc 3:1-3:6  forall a b . a -> b -> ()
-testdata/language-features/basic-values/infix01.lc 3:13-3:14  _f
-testdata/language-features/basic-values/infix01.lc 3:13-3:20  _a -> ()
-testdata/language-features/basic-values/infix01.lc 3:13-3:22  ()
-testdata/language-features/basic-values/infix01.lc 3:15-3:20  forall a b . a -> b -> ()
-testdata/language-features/basic-values/infix01.lc 3:21-3:22  _c
+testdata/language-features/basic-values/infix01.lc 1:1-1:4
+    forall a b . a -> b -> ()
+testdata/language-features/basic-values/infix01.lc 1:11-1:13
+    ()
+testdata/language-features/basic-values/infix01.lc 3:1-3:6
+    forall a b . a -> b -> ()
+testdata/language-features/basic-values/infix01.lc 3:13-3:14
+    _f
+testdata/language-features/basic-values/infix01.lc 3:13-3:20
+    _a -> ()
+testdata/language-features/basic-values/infix01.lc 3:13-3:22
+    ()
+testdata/language-features/basic-values/infix01.lc 3:15-3:20
+    forall a b . a -> b -> ()
+testdata/language-features/basic-values/infix01.lc 3:21-3:22
+    _c
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/infix02.out b/testdata/language-features/basic-values/infix02.out
index 2db04d26..c86a773f 100644
--- a/testdata/language-features/basic-values/infix02.out
+++ b/testdata/language-features/basic-values/infix02.out
@@ -3,14 +3,22 @@ fun = \_ -> \_ -> \_ -> _rhs HNil
 value = \(a :: _) (b :: _) -> _rhs (a `fun` b)
 main is not found
 ------------ trace
-fun :: forall a b c . a -> b -> c -> ()
-value :: forall a b c . a -> b -> c -> ()
+fun :: forall a b c . a -> b -> c -> ()
+value :: forall a b c . a -> b -> c -> ()
 ------------ tooltips
-testdata/language-features/basic-values/infix02.lc 1:1-1:4  forall a b c . a -> b -> c -> ()
-testdata/language-features/basic-values/infix02.lc 1:13-1:15  ()
-testdata/language-features/basic-values/infix02.lc 3:1-3:6  forall a b c . a -> b -> c -> ()
-testdata/language-features/basic-values/infix02.lc 3:13-3:14  _g
-testdata/language-features/basic-values/infix02.lc 3:13-3:20  _b -> _a -> ()
-testdata/language-features/basic-values/infix02.lc 3:13-3:22  _a -> ()
-testdata/language-features/basic-values/infix02.lc 3:15-3:20  forall a b c . a -> b -> c -> ()
-testdata/language-features/basic-values/infix02.lc 3:21-3:22  _d
+testdata/language-features/basic-values/infix02.lc 1:1-1:4
+    forall a b c . a -> b -> c -> ()
+testdata/language-features/basic-values/infix02.lc 1:13-1:15
+    ()
+testdata/language-features/basic-values/infix02.lc 3:1-3:6
+    forall a b c . a -> b -> c -> ()
+testdata/language-features/basic-values/infix02.lc 3:13-3:14
+    _g
+testdata/language-features/basic-values/infix02.lc 3:13-3:20
+    _b -> _a -> ()
+testdata/language-features/basic-values/infix02.lc 3:13-3:22
+    _a -> ()
+testdata/language-features/basic-values/infix02.lc 3:15-3:20
+    forall a b c . a -> b -> c -> ()
+testdata/language-features/basic-values/infix02.lc 3:21-3:22
+    _d
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/infix03.out b/testdata/language-features/basic-values/infix03.out
index d089f79d..6011a719 100644
--- a/testdata/language-features/basic-values/infix03.out
+++ b/testdata/language-features/basic-values/infix03.out
@@ -6,38 +6,61 @@ d2 = \(a :: _) (b :: _) -> _rhs (a `D2` b)
 d3 = \(a :: _) (b :: _) -> _rhs (a `D3` b)
 main is not found
 ------------ trace
-'D :: Type
-D2 :: () -> () -> D
-D3 :: () -> () -> () -> D
+'D :: Type
+D2 :: () -> () -> D
+D3 :: () -> () -> () -> D
 'DCase
-  :: forall (a :: D -> Type)
-    -> (forall (b :: ()) (c :: ()) -> a ('D2 b c))
-      -> (forall (d :: ()) (e :: ()) (f :: ()) -> a ('D3 d e f))
-        -> forall (g :: D) -> a g
-match'D :: forall (a :: Type -> Type) -> a D -> forall b -> a b -> a b
-d2 :: () -> () -> D
-d3 :: () -> () -> () -> D
+  :: forall (a :: D -> Type)
+    -> (forall (b :: ()) (c :: ()) -> a ('D2 b c))
+      -> (forall (d :: ()) (e :: ()) (f :: ()) -> a ('D3 d e f))
+        -> forall (g :: D) -> a g
+match'D :: forall (a :: Type -> Type) -> a D -> forall b -> a b -> a b
+d2 :: () -> () -> D
+d3 :: () -> () -> () -> D
 ------------ tooltips
-testdata/language-features/basic-values/infix03.lc 1:6-1:7  Type
-testdata/language-features/basic-values/infix03.lc 1:6-1:18  Type
-testdata/language-features/basic-values/infix03.lc 1:6-2:12  Type
-testdata/language-features/basic-values/infix03.lc 1:6-2:21  Type
-testdata/language-features/basic-values/infix03.lc 1:10-1:12  () -> () -> D | D | Type
-testdata/language-features/basic-values/infix03.lc 1:13-1:15  Type
-testdata/language-features/basic-values/infix03.lc 1:16-1:18  Type
-testdata/language-features/basic-values/infix03.lc 2:10-2:12  () -> () -> () -> D | D | Type
-testdata/language-features/basic-values/infix03.lc 2:13-2:15  Type
-testdata/language-features/basic-values/infix03.lc 2:16-2:18  Type
-testdata/language-features/basic-values/infix03.lc 2:19-2:21  Type
-testdata/language-features/basic-values/infix03.lc 4:1-4:3  () -> () -> D
-testdata/language-features/basic-values/infix03.lc 4:10-4:11  _d
-testdata/language-features/basic-values/infix03.lc 4:10-4:16  () -> D
-testdata/language-features/basic-values/infix03.lc 4:10-4:18  D
-testdata/language-features/basic-values/infix03.lc 4:12-4:16  () -> () -> D
-testdata/language-features/basic-values/infix03.lc 4:17-4:18  _b
-testdata/language-features/basic-values/infix03.lc 6:1-6:3  () -> () -> () -> D
-testdata/language-features/basic-values/infix03.lc 6:10-6:11  _d
-testdata/language-features/basic-values/infix03.lc 6:10-6:16  () -> () -> D
-testdata/language-features/basic-values/infix03.lc 6:10-6:18  () -> D
-testdata/language-features/basic-values/infix03.lc 6:12-6:16  () -> () -> () -> D
-testdata/language-features/basic-values/infix03.lc 6:17-6:18  _b
+testdata/language-features/basic-values/infix03.lc 1:6-1:7
+    Type | Type | Type | Type | Type | Type | Type | Type
+testdata/language-features/basic-values/infix03.lc 1:6-1:18
+    Type
+testdata/language-features/basic-values/infix03.lc 1:6-2:12
+    Type | Type
+testdata/language-features/basic-values/infix03.lc 1:6-2:21
+    Type | Type
+testdata/language-features/basic-values/infix03.lc 1:10-1:12
+    () -> () -> D | D | Type | Type | Type
+testdata/language-features/basic-values/infix03.lc 1:13-1:15
+    Type
+testdata/language-features/basic-values/infix03.lc 1:16-1:18
+    Type
+testdata/language-features/basic-values/infix03.lc 2:10-2:12
+    () -> () -> () -> D | D | Type | Type | Type | Type
+testdata/language-features/basic-values/infix03.lc 2:13-2:15
+    Type
+testdata/language-features/basic-values/infix03.lc 2:16-2:18
+    Type
+testdata/language-features/basic-values/infix03.lc 2:19-2:21
+    Type
+testdata/language-features/basic-values/infix03.lc 4:1-4:3
+    () -> () -> D
+testdata/language-features/basic-values/infix03.lc 4:10-4:11
+    _d
+testdata/language-features/basic-values/infix03.lc 4:10-4:16
+    () -> D
+testdata/language-features/basic-values/infix03.lc 4:10-4:18
+    D
+testdata/language-features/basic-values/infix03.lc 4:12-4:16
+    () -> () -> D
+testdata/language-features/basic-values/infix03.lc 4:17-4:18
+    _b
+testdata/language-features/basic-values/infix03.lc 6:1-6:3
+    () -> () -> () -> D
+testdata/language-features/basic-values/infix03.lc 6:10-6:11
+    _d
+testdata/language-features/basic-values/infix03.lc 6:10-6:16
+    () -> () -> D
+testdata/language-features/basic-values/infix03.lc 6:10-6:18
+    () -> D
+testdata/language-features/basic-values/infix03.lc 6:12-6:16
+    () -> () -> () -> D
+testdata/language-features/basic-values/infix03.lc 6:17-6:18
+    _b
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/lambda01.out b/testdata/language-features/basic-values/lambda01.out
index 5d57cdfd..4598e8d8 100644
--- a/testdata/language-features/basic-values/lambda01.out
+++ b/testdata/language-features/basic-values/lambda01.out
@@ -5,17 +5,25 @@ fun3 = _rhs \_ -> HNil
 fun4 = _rhs \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> HNil
 main is not found
 ------------ trace
-fun1 :: forall a . a -> ()
-fun2 :: forall a . a -> ()
-fun3 :: forall a . a -> ()
+fun1 :: forall a . a -> ()
+fun2 :: forall a . a -> ()
+fun3 :: forall a . a -> ()
 fun4
-  :: forall a b c d e f g h i . a -> b -> c -> d -> e -> f -> g -> h -> i -> ()
+  :: forall a b c d e f g h i . a -> b -> c -> d -> e -> f -> g -> h -> i -> ()
 ------------ tooltips
-testdata/language-features/basic-values/lambda01.lc 1:1-1:5  forall a . a -> ()
-testdata/language-features/basic-values/lambda01.lc 1:14-1:16  ()
-testdata/language-features/basic-values/lambda01.lc 2:1-2:5  forall a . a -> ()
-testdata/language-features/basic-values/lambda01.lc 2:15-2:17  ()
-testdata/language-features/basic-values/lambda01.lc 3:1-3:5  forall a . a -> ()
-testdata/language-features/basic-values/lambda01.lc 3:13-3:15  ()
-testdata/language-features/basic-values/lambda01.lc 4:1-4:5  forall a b c d e f g h i . a -> b -> c -> d -> e -> f -> g -> h -> i -> ()
-testdata/language-features/basic-values/lambda01.lc 5:28-5:30  ()
+testdata/language-features/basic-values/lambda01.lc 1:1-1:5
+    forall a . a -> ()
+testdata/language-features/basic-values/lambda01.lc 1:14-1:16
+    ()
+testdata/language-features/basic-values/lambda01.lc 2:1-2:5
+    forall a . a -> ()
+testdata/language-features/basic-values/lambda01.lc 2:15-2:17
+    ()
+testdata/language-features/basic-values/lambda01.lc 3:1-3:5
+    forall a . a -> ()
+testdata/language-features/basic-values/lambda01.lc 3:13-3:15
+    ()
+testdata/language-features/basic-values/lambda01.lc 4:1-4:5
+    forall a b c d e f g h i . a -> b -> c -> d -> e -> f -> g -> h -> i -> ()
+testdata/language-features/basic-values/lambda01.lc 5:28-5:30
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/lambda03.out b/testdata/language-features/basic-values/lambda03.out
index 33988c84..990af1ad 100644
--- a/testdata/language-features/basic-values/lambda03.out
+++ b/testdata/language-features/basic-values/lambda03.out
@@ -3,10 +3,14 @@ fun1 = _rhs \_ (a :: _) -> \_ -> a
 fun2 = \(a :: _) -> _rhs \_ -> \_ -> \_ -> a
 main is not found
 ------------ trace
-fun1 :: forall a b c . a -> b -> c -> b
-fun2 :: forall a b c d . a -> b -> c -> d -> a
+fun1 :: forall a b c . a -> b -> c -> b
+fun2 :: forall a b c d . a -> b -> c -> d -> a
 ------------ tooltips
-testdata/language-features/basic-values/lambda03.lc 1:1-1:5  forall a b c . a -> b -> c -> b
-testdata/language-features/basic-values/lambda03.lc 1:22-1:23  _d
-testdata/language-features/basic-values/lambda03.lc 2:1-2:5  forall a b c d . a -> b -> c -> d -> a
-testdata/language-features/basic-values/lambda03.lc 2:25-2:26  _h
+testdata/language-features/basic-values/lambda03.lc 1:1-1:5
+    forall a b c . a -> b -> c -> b
+testdata/language-features/basic-values/lambda03.lc 1:22-1:23
+    _d
+testdata/language-features/basic-values/lambda03.lc 2:1-2:5
+    forall a b c d . a -> b -> c -> d -> a
+testdata/language-features/basic-values/lambda03.lc 2:25-2:26
+    _h
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/let01.out b/testdata/language-features/basic-values/let01.out
index 24948a10..33524e88 100644
--- a/testdata/language-features/basic-values/let01.out
+++ b/testdata/language-features/basic-values/let01.out
@@ -6,26 +6,43 @@ value4 = _rhs \(a := _rhs (fromInt 1)) -> fromInt 1
 value5 = _rhs \(a := _rhs (fromInt 1)) (b := _rhs (fromInt 2)) -> fromInt 1
 main is not found
 ------------ trace
-value1 :: forall a . Num a => a
-value2 :: forall a . Num a => a
-value3 :: forall a . Num a => a
-value4 :: forall a . Num a => a
-value5 :: forall a . Num a => a
+value1 :: forall a . Num a => a
+value2 :: forall a . Num a => a
+value3 :: forall a . Num a => a
+value4 :: forall a . Num a => a
+value5 :: forall a . Num a => a
 ------------ tooltips
-testdata/language-features/basic-values/let01.lc 1:1-1:7  forall a . Num a => a
-testdata/language-features/basic-values/let01.lc 1:18-1:19  _b
-testdata/language-features/basic-values/let01.lc 1:23-1:24  _b
-testdata/language-features/basic-values/let01.lc 3:1-3:7  forall a . Num a => a
-testdata/language-features/basic-values/let01.lc 4:11-4:12  _b
-testdata/language-features/basic-values/let01.lc 5:6-5:7  _b
-testdata/language-features/basic-values/let01.lc 7:1-7:7  forall a . Num a => a
-testdata/language-features/basic-values/let01.lc 8:11-8:12  _b
-testdata/language-features/basic-values/let01.lc 9:11-9:14  Char
-testdata/language-features/basic-values/let01.lc 10:6-10:7  _b
-testdata/language-features/basic-values/let01.lc 12:1-12:7  forall a . Num a => a
-testdata/language-features/basic-values/let01.lc 12:18-12:19  _b
-testdata/language-features/basic-values/let01.lc 13:13-13:14  _b
-testdata/language-features/basic-values/let01.lc 15:1-15:7  forall a . Num a => a
-testdata/language-features/basic-values/let01.lc 15:18-15:19  _b
-testdata/language-features/basic-values/let01.lc 16:18-16:19  _b
-testdata/language-features/basic-values/let01.lc 17:13-17:14  _b
+testdata/language-features/basic-values/let01.lc 1:1-1:7
+    forall a . Num a => a
+testdata/language-features/basic-values/let01.lc 1:18-1:19
+    _b
+testdata/language-features/basic-values/let01.lc 1:23-1:24
+    _b
+testdata/language-features/basic-values/let01.lc 3:1-3:7
+    forall a . Num a => a
+testdata/language-features/basic-values/let01.lc 4:11-4:12
+    _b
+testdata/language-features/basic-values/let01.lc 5:6-5:7
+    _b
+testdata/language-features/basic-values/let01.lc 7:1-7:7
+    forall a . Num a => a
+testdata/language-features/basic-values/let01.lc 8:11-8:12
+    _b
+testdata/language-features/basic-values/let01.lc 9:11-9:14
+    Char
+testdata/language-features/basic-values/let01.lc 10:6-10:7
+    _b
+testdata/language-features/basic-values/let01.lc 12:1-12:7
+    forall a . Num a => a
+testdata/language-features/basic-values/let01.lc 12:18-12:19
+    _b
+testdata/language-features/basic-values/let01.lc 13:13-13:14
+    _b
+testdata/language-features/basic-values/let01.lc 15:1-15:7
+    forall a . Num a => a
+testdata/language-features/basic-values/let01.lc 15:18-15:19
+    _b
+testdata/language-features/basic-values/let01.lc 16:18-16:19
+    _b
+testdata/language-features/basic-values/let01.lc 17:13-17:14
+    _b
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/let02.out b/testdata/language-features/basic-values/let02.out
index 92afbe41..44be34a1 100644
--- a/testdata/language-features/basic-values/let02.out
+++ b/testdata/language-features/basic-values/let02.out
@@ -8,14 +8,23 @@ value
             \(e := _rhs HNil) (f := _rhs (fromInt 1)) (g := _rhs "hello") -> 'B') -> HNil
 main is not found
 ------------ trace
-value :: ()
+value :: ()
 ------------ tooltips
-testdata/language-features/basic-values/let02.lc 1:1-1:6  ()
-testdata/language-features/basic-values/let02.lc 2:11-2:13  ()
-testdata/language-features/basic-values/let02.lc 3:19-3:22  Char
-testdata/language-features/basic-values/let02.lc 3:26-3:28  ()
-testdata/language-features/basic-values/let02.lc 5:17-5:19  ()
-testdata/language-features/basic-values/let02.lc 6:17-6:18  _b
-testdata/language-features/basic-values/let02.lc 7:17-7:24  String
-testdata/language-features/basic-values/let02.lc 8:12-8:15  Char
-testdata/language-features/basic-values/let02.lc 9:6-9:8  ()
+testdata/language-features/basic-values/let02.lc 1:1-1:6
+    ()
+testdata/language-features/basic-values/let02.lc 2:11-2:13
+    ()
+testdata/language-features/basic-values/let02.lc 3:19-3:22
+    Char
+testdata/language-features/basic-values/let02.lc 3:26-3:28
+    ()
+testdata/language-features/basic-values/let02.lc 5:17-5:19
+    ()
+testdata/language-features/basic-values/let02.lc 6:17-6:18
+    _b
+testdata/language-features/basic-values/let02.lc 7:17-7:24
+    String
+testdata/language-features/basic-values/let02.lc 8:12-8:15
+    Char
+testdata/language-features/basic-values/let02.lc 9:6-9:8
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/literal01.out b/testdata/language-features/basic-values/literal01.out
index a8328841..b45e2a20 100644
--- a/testdata/language-features/basic-values/literal01.out
+++ b/testdata/language-features/basic-values/literal01.out
@@ -9,28 +9,44 @@ stringValue1 = _rhs "Hello World"
 stringValue2 = _rhs "\nHello World\tagain!\r\n"
 main is not found
 ------------ trace
-intValue1 :: forall a . Num a => a
-intValue2 :: forall a . Num a => a
-intValue3 :: forall a . Num a => a
-floatValue1 :: Float
-floatValue2 :: Float
-charValue :: Char
-stringValue1 :: String
-stringValue2 :: String
+intValue1 :: forall a . Num a => a
+intValue2 :: forall a . Num a => a
+intValue3 :: forall a . Num a => a
+floatValue1 :: Float
+floatValue2 :: Float
+charValue :: Char
+stringValue1 :: String
+stringValue2 :: String
 ------------ tooltips
-testdata/language-features/basic-values/literal01.lc 1:1-1:10  forall a . Num a => a
-testdata/language-features/basic-values/literal01.lc 1:13-1:14  _b
-testdata/language-features/basic-values/literal01.lc 2:1-2:10  forall a . Num a => a
-testdata/language-features/basic-values/literal01.lc 2:13-2:14  _b
-testdata/language-features/basic-values/literal01.lc 3:1-3:10  forall a . Num a => a
-testdata/language-features/basic-values/literal01.lc 3:13-3:18  _b
-testdata/language-features/basic-values/literal01.lc 5:1-5:12  Float
-testdata/language-features/basic-values/literal01.lc 5:15-5:18  Float
-testdata/language-features/basic-values/literal01.lc 6:1-6:12  Float
-testdata/language-features/basic-values/literal01.lc 6:15-6:22  Float
-testdata/language-features/basic-values/literal01.lc 8:1-8:10  Char
-testdata/language-features/basic-values/literal01.lc 8:13-8:16  Char
-testdata/language-features/basic-values/literal01.lc 10:1-10:13  String
-testdata/language-features/basic-values/literal01.lc 10:16-10:29  String
-testdata/language-features/basic-values/literal01.lc 11:1-11:13  String
-testdata/language-features/basic-values/literal01.lc 11:16-11:45  String
+testdata/language-features/basic-values/literal01.lc 1:1-1:10
+    forall a . Num a => a
+testdata/language-features/basic-values/literal01.lc 1:13-1:14
+    _b
+testdata/language-features/basic-values/literal01.lc 2:1-2:10
+    forall a . Num a => a
+testdata/language-features/basic-values/literal01.lc 2:13-2:14
+    _b
+testdata/language-features/basic-values/literal01.lc 3:1-3:10
+    forall a . Num a => a
+testdata/language-features/basic-values/literal01.lc 3:13-3:18
+    _b
+testdata/language-features/basic-values/literal01.lc 5:1-5:12
+    Float
+testdata/language-features/basic-values/literal01.lc 5:15-5:18
+    Float
+testdata/language-features/basic-values/literal01.lc 6:1-6:12
+    Float
+testdata/language-features/basic-values/literal01.lc 6:15-6:22
+    Float
+testdata/language-features/basic-values/literal01.lc 8:1-8:10
+    Char
+testdata/language-features/basic-values/literal01.lc 8:13-8:16
+    Char
+testdata/language-features/basic-values/literal01.lc 10:1-10:13
+    String
+testdata/language-features/basic-values/literal01.lc 10:16-10:29
+    String
+testdata/language-features/basic-values/literal01.lc 11:1-11:13
+    String
+testdata/language-features/basic-values/literal01.lc 11:16-11:45
+    String
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/operator01.out b/testdata/language-features/basic-values/operator01.out
index deae312b..0b8f12c3 100644
--- a/testdata/language-features/basic-values/operator01.out
+++ b/testdata/language-features/basic-values/operator01.out
@@ -5,16 +5,24 @@ $$$# = \_ -> \_ -> _rhs HNil
 $$$ = \_ -> \_ -> _rhs HNil
 main is not found
 ------------ trace
-#$# :: forall a b . a -> b -> ()
-$$# :: forall a b . a -> b -> ()
-$$$# :: forall a b . a -> b -> ()
-$$$ :: forall a b . a -> b -> ()
+#$# :: forall a b . a -> b -> ()
+$$# :: forall a b . a -> b -> ()
+$$$# :: forall a b . a -> b -> ()
+$$$ :: forall a b . a -> b -> ()
 ------------ tooltips
-testdata/language-features/basic-values/operator01.lc 1:3-1:6  forall a b . a -> b -> ()
-testdata/language-features/basic-values/operator01.lc 1:11-1:13  ()
-testdata/language-features/basic-values/operator01.lc 3:3-3:6  forall a b . a -> b -> ()
-testdata/language-features/basic-values/operator01.lc 3:8-3:10  ()
-testdata/language-features/basic-values/operator01.lc 5:3-5:7  forall a b . a -> b -> ()
-testdata/language-features/basic-values/operator01.lc 6:3-6:5  ()
-testdata/language-features/basic-values/operator01.lc 8:3-8:6  forall a b . a -> b -> ()
-testdata/language-features/basic-values/operator01.lc 8:11-8:13  ()
+testdata/language-features/basic-values/operator01.lc 1:3-1:6
+    forall a b . a -> b -> ()
+testdata/language-features/basic-values/operator01.lc 1:11-1:13
+    ()
+testdata/language-features/basic-values/operator01.lc 3:3-3:6
+    forall a b . a -> b -> ()
+testdata/language-features/basic-values/operator01.lc 3:8-3:10
+    ()
+testdata/language-features/basic-values/operator01.lc 5:3-5:7
+    forall a b . a -> b -> ()
+testdata/language-features/basic-values/operator01.lc 6:3-6:5
+    ()
+testdata/language-features/basic-values/operator01.lc 8:3-8:6
+    forall a b . a -> b -> ()
+testdata/language-features/basic-values/operator01.lc 8:11-8:13
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/operator02.reject.out b/testdata/language-features/basic-values/operator02.reject.out
index cbf2cb0f..5d30716a 100644
--- a/testdata/language-features/basic-values/operator02.reject.out
+++ b/testdata/language-features/basic-values/operator02.reject.out
@@ -5,9 +5,9 @@ and at testdata/language-features/basic-values/operator02.reject.lc:1:3:
 a #$# b = ()
   ^^^
 ------------ trace
-#$# :: forall a b . a -> b -> ()
-fun :: forall a . a -> ()
-#$# :: forall a b . a -> b -> ()
+#$# :: forall a b . a -> b -> ()
+fun :: forall a . a -> ()
+#$# :: forall a b . a -> b -> ()
 !already defined #$# at testdata/language-features/basic-values/operator02.reject.lc:3:3:
 a #$# b = ()
   ^^^
@@ -15,9 +15,15 @@ and at testdata/language-features/basic-values/operator02.reject.lc:1:3:
 a #$# b = ()
   ^^^
 ------------ tooltips
-testdata/language-features/basic-values/operator02.reject.lc 1:3-1:6  forall a b . a -> b -> ()
-testdata/language-features/basic-values/operator02.reject.lc 1:11-1:13  ()
-testdata/language-features/basic-values/operator02.reject.lc 2:1-2:4  forall a . a -> ()
-testdata/language-features/basic-values/operator02.reject.lc 2:9-2:11  ()
-testdata/language-features/basic-values/operator02.reject.lc 3:3-3:6  forall a b . a -> b -> ()
-testdata/language-features/basic-values/operator02.reject.lc 3:11-3:13  ()
+testdata/language-features/basic-values/operator02.reject.lc 1:3-1:6
+    forall a b . a -> b -> ()
+testdata/language-features/basic-values/operator02.reject.lc 1:11-1:13
+    ()
+testdata/language-features/basic-values/operator02.reject.lc 2:1-2:4
+    forall a . a -> ()
+testdata/language-features/basic-values/operator02.reject.lc 2:9-2:11
+    ()
+testdata/language-features/basic-values/operator02.reject.lc 3:3-3:6
+    forall a b . a -> b -> ()
+testdata/language-features/basic-values/operator02.reject.lc 3:11-3:13
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/operator05.out b/testdata/language-features/basic-values/operator05.out
index d6ef392d..b6f270bb 100644
--- a/testdata/language-features/basic-values/operator05.out
+++ b/testdata/language-features/basic-values/operator05.out
@@ -2,12 +2,19 @@
 value1 = _rhs \(a := \_ -> \_ -> _rhs HNil) -> a HNil HNil
 main is not found
 ------------ trace
-value1 :: ()
+value1 :: ()
 ------------ tooltips
-testdata/language-features/basic-values/operator05.lc 1:1-1:7  ()
-testdata/language-features/basic-values/operator05.lc 1:24-1:26  ()
-testdata/language-features/basic-values/operator05.lc 2:13-2:15  ()
-testdata/language-features/basic-values/operator05.lc 2:13-2:19  _a -> ()
-testdata/language-features/basic-values/operator05.lc 2:13-2:22  ()
-testdata/language-features/basic-values/operator05.lc 2:16-2:19  forall a b . a -> b -> ()
-testdata/language-features/basic-values/operator05.lc 2:20-2:22  ()
+testdata/language-features/basic-values/operator05.lc 1:1-1:7
+    ()
+testdata/language-features/basic-values/operator05.lc 1:24-1:26
+    ()
+testdata/language-features/basic-values/operator05.lc 2:13-2:15
+    ()
+testdata/language-features/basic-values/operator05.lc 2:13-2:19
+    _a -> ()
+testdata/language-features/basic-values/operator05.lc 2:13-2:22
+    ()
+testdata/language-features/basic-values/operator05.lc 2:16-2:19
+    forall a b . a -> b -> ()
+testdata/language-features/basic-values/operator05.lc 2:20-2:22
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/operator06.out b/testdata/language-features/basic-values/operator06.out
index 0252f155..d91194d9 100644
--- a/testdata/language-features/basic-values/operator06.out
+++ b/testdata/language-features/basic-values/operator06.out
@@ -2,12 +2,19 @@
 value1 = _rhs \(a := \_ -> \_ -> _rhs HNil) -> a HNil HNil
 main is not found
 ------------ trace
-value1 :: ()
+value1 :: ()
 ------------ tooltips
-testdata/language-features/basic-values/operator06.lc 1:1-1:7  ()
-testdata/language-features/basic-values/operator06.lc 1:10-1:12  ()
-testdata/language-features/basic-values/operator06.lc 1:10-1:16  _a -> ()
-testdata/language-features/basic-values/operator06.lc 1:10-1:19  ()
-testdata/language-features/basic-values/operator06.lc 1:13-1:16  forall a b . a -> b -> ()
-testdata/language-features/basic-values/operator06.lc 1:17-1:19  ()
-testdata/language-features/basic-values/operator06.lc 2:19-2:21  ()
+testdata/language-features/basic-values/operator06.lc 1:1-1:7
+    ()
+testdata/language-features/basic-values/operator06.lc 1:10-1:12
+    ()
+testdata/language-features/basic-values/operator06.lc 1:10-1:16
+    _a -> ()
+testdata/language-features/basic-values/operator06.lc 1:10-1:19
+    ()
+testdata/language-features/basic-values/operator06.lc 1:13-1:16
+    forall a b . a -> b -> ()
+testdata/language-features/basic-values/operator06.lc 1:17-1:19
+    ()
+testdata/language-features/basic-values/operator06.lc 2:19-2:21
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/redefine01.reject.out b/testdata/language-features/basic-values/redefine01.reject.out
index 5bd93d2a..e0204f0e 100644
--- a/testdata/language-features/basic-values/redefine01.reject.out
+++ b/testdata/language-features/basic-values/redefine01.reject.out
@@ -5,9 +5,9 @@ and at testdata/language-features/basic-values/redefine01.reject.lc:1:1:
 unit = ()
 ^^^^
 ------------ trace
-unit :: ()
-tuple :: ()
-unit :: ()
+unit :: ()
+tuple :: ()
+unit :: ()
 !already defined unit at testdata/language-features/basic-values/redefine01.reject.lc:3:1:
 unit = ()
 ^^^^
@@ -15,9 +15,15 @@ and at testdata/language-features/basic-values/redefine01.reject.lc:1:1:
 unit = ()
 ^^^^
 ------------ tooltips
-testdata/language-features/basic-values/redefine01.reject.lc 1:1-1:5  ()
-testdata/language-features/basic-values/redefine01.reject.lc 1:8-1:10  ()
-testdata/language-features/basic-values/redefine01.reject.lc 2:1-2:6  ()
-testdata/language-features/basic-values/redefine01.reject.lc 2:9-2:11  ()
-testdata/language-features/basic-values/redefine01.reject.lc 3:1-3:5  ()
-testdata/language-features/basic-values/redefine01.reject.lc 3:8-3:10  ()
+testdata/language-features/basic-values/redefine01.reject.lc 1:1-1:5
+    ()
+testdata/language-features/basic-values/redefine01.reject.lc 1:8-1:10
+    ()
+testdata/language-features/basic-values/redefine01.reject.lc 2:1-2:6
+    ()
+testdata/language-features/basic-values/redefine01.reject.lc 2:9-2:11
+    ()
+testdata/language-features/basic-values/redefine01.reject.lc 3:1-3:5
+    ()
+testdata/language-features/basic-values/redefine01.reject.lc 3:8-3:10
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/shadowing01.out b/testdata/language-features/basic-values/shadowing01.out
index 6bddb912..39fdca99 100644
--- a/testdata/language-features/basic-values/shadowing01.out
+++ b/testdata/language-features/basic-values/shadowing01.out
@@ -12,16 +12,27 @@ value
                     \(g := _rhs HNil) (h := _rhs 'C') (i := _rhs 3.12) -> "world") -> HNil) -> '7'
 main is not found
 ------------ trace
-value :: Char
+value :: Char
 ------------ tooltips
-testdata/language-features/basic-values/shadowing01.lc 1:1-1:6  Char
-testdata/language-features/basic-values/shadowing01.lc 2:11-2:14  Char
-testdata/language-features/basic-values/shadowing01.lc 3:11-3:18  String
-testdata/language-features/basic-values/shadowing01.lc 5:17-5:18  _b
-testdata/language-features/basic-values/shadowing01.lc 6:17-6:21  Float
-testdata/language-features/basic-values/shadowing01.lc 7:25-7:27  ()
-testdata/language-features/basic-values/shadowing01.lc 8:25-8:28  Char
-testdata/language-features/basic-values/shadowing01.lc 9:25-9:29  Float
-testdata/language-features/basic-values/shadowing01.lc 10:20-10:27  String
-testdata/language-features/basic-values/shadowing01.lc 11:14-11:16  ()
-testdata/language-features/basic-values/shadowing01.lc 12:6-12:9  Char
+testdata/language-features/basic-values/shadowing01.lc 1:1-1:6
+    Char
+testdata/language-features/basic-values/shadowing01.lc 2:11-2:14
+    Char
+testdata/language-features/basic-values/shadowing01.lc 3:11-3:18
+    String
+testdata/language-features/basic-values/shadowing01.lc 5:17-5:18
+    _b
+testdata/language-features/basic-values/shadowing01.lc 6:17-6:21
+    Float
+testdata/language-features/basic-values/shadowing01.lc 7:25-7:27
+    ()
+testdata/language-features/basic-values/shadowing01.lc 8:25-8:28
+    Char
+testdata/language-features/basic-values/shadowing01.lc 9:25-9:29
+    Float
+testdata/language-features/basic-values/shadowing01.lc 10:20-10:27
+    String
+testdata/language-features/basic-values/shadowing01.lc 11:14-11:16
+    ()
+testdata/language-features/basic-values/shadowing01.lc 12:6-12:9
+    Char
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/shadowing02.out b/testdata/language-features/basic-values/shadowing02.out
index e5eaf957..4da8cccd 100644
--- a/testdata/language-features/basic-values/shadowing02.out
+++ b/testdata/language-features/basic-values/shadowing02.out
@@ -16,24 +16,41 @@ value2
                         (i := _rhs 'C') (j := _rhs 3.12) (k := _rhs c) -> world) -> HNil) -> '7'
 main is not found
 ------------ trace
-c :: forall a . Num a => a
-world :: String
-value2 :: Char
+c :: forall a . Num a => a
+world :: String
+value2 :: Char
 ------------ tooltips
-testdata/language-features/basic-values/shadowing02.lc 1:1-1:2  forall a . Num a => a
-testdata/language-features/basic-values/shadowing02.lc 1:5-1:6  _b
-testdata/language-features/basic-values/shadowing02.lc 2:1-2:6  String
-testdata/language-features/basic-values/shadowing02.lc 2:9-2:16  String
-testdata/language-features/basic-values/shadowing02.lc 3:1-3:7  Char
-testdata/language-features/basic-values/shadowing02.lc 4:11-4:14  Char
-testdata/language-features/basic-values/shadowing02.lc 5:11-5:18  String
-testdata/language-features/basic-values/shadowing02.lc 6:11-6:14  _b
-testdata/language-features/basic-values/shadowing02.lc 8:17-8:18  _b
-testdata/language-features/basic-values/shadowing02.lc 9:17-9:21  Float
-testdata/language-features/basic-values/shadowing02.lc 10:25-10:27  ()
-testdata/language-features/basic-values/shadowing02.lc 11:25-11:28  Char
-testdata/language-features/basic-values/shadowing02.lc 12:25-12:29  Float
-testdata/language-features/basic-values/shadowing02.lc 13:25-13:26  forall a . Num a => a
-testdata/language-features/basic-values/shadowing02.lc 14:20-14:25  String
-testdata/language-features/basic-values/shadowing02.lc 15:14-15:16  ()
-testdata/language-features/basic-values/shadowing02.lc 16:6-16:9  Char
+testdata/language-features/basic-values/shadowing02.lc 1:1-1:2
+    forall a . Num a => a
+testdata/language-features/basic-values/shadowing02.lc 1:5-1:6
+    _b
+testdata/language-features/basic-values/shadowing02.lc 2:1-2:6
+    String
+testdata/language-features/basic-values/shadowing02.lc 2:9-2:16
+    String
+testdata/language-features/basic-values/shadowing02.lc 3:1-3:7
+    Char
+testdata/language-features/basic-values/shadowing02.lc 4:11-4:14
+    Char
+testdata/language-features/basic-values/shadowing02.lc 5:11-5:18
+    String
+testdata/language-features/basic-values/shadowing02.lc 6:11-6:14
+    _b
+testdata/language-features/basic-values/shadowing02.lc 8:17-8:18
+    _b
+testdata/language-features/basic-values/shadowing02.lc 9:17-9:21
+    Float
+testdata/language-features/basic-values/shadowing02.lc 10:25-10:27
+    ()
+testdata/language-features/basic-values/shadowing02.lc 11:25-11:28
+    Char
+testdata/language-features/basic-values/shadowing02.lc 12:25-12:29
+    Float
+testdata/language-features/basic-values/shadowing02.lc 13:25-13:26
+    forall a . Num a => a
+testdata/language-features/basic-values/shadowing02.lc 14:20-14:25
+    String
+testdata/language-features/basic-values/shadowing02.lc 15:14-15:16
+    ()
+testdata/language-features/basic-values/shadowing02.lc 16:6-16:9
+    Char
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/shadowing03.out b/testdata/language-features/basic-values/shadowing03.out
index 7c734e30..8bfee196 100644
--- a/testdata/language-features/basic-values/shadowing03.out
+++ b/testdata/language-features/basic-values/shadowing03.out
@@ -2,7 +2,9 @@
 x = \_ -> \_ -> _rhs HNil
 main is not found
 ------------ trace
-x :: forall a b . a -> b -> ()
+x :: forall a b . a -> b -> ()
 ------------ tooltips
-testdata/language-features/basic-values/shadowing03.lc 1:1-1:2  forall a b . a -> b -> ()
-testdata/language-features/basic-values/shadowing03.lc 1:9-1:11  ()
+testdata/language-features/basic-values/shadowing03.lc 1:1-1:2
+    forall a b . a -> b -> ()
+testdata/language-features/basic-values/shadowing03.lc 1:9-1:11
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/shadowing04.out b/testdata/language-features/basic-values/shadowing04.out
index 8cd2c778..281cb141 100644
--- a/testdata/language-features/basic-values/shadowing04.out
+++ b/testdata/language-features/basic-values/shadowing04.out
@@ -2,7 +2,9 @@
 __ = \_ -> \_ -> _rhs HNil
 main is not found
 ------------ trace
-__ :: forall a b . a -> b -> ()
+__ :: forall a b . a -> b -> ()
 ------------ tooltips
-testdata/language-features/basic-values/shadowing04.lc 1:1-1:3  forall a b . a -> b -> ()
-testdata/language-features/basic-values/shadowing04.lc 1:11-1:13  ()
+testdata/language-features/basic-values/shadowing04.lc 1:1-1:3
+    forall a b . a -> b -> ()
+testdata/language-features/basic-values/shadowing04.lc 1:11-1:13
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/tuple01.out b/testdata/language-features/basic-values/tuple01.out
index b1208a3a..9ae4b926 100644
--- a/testdata/language-features/basic-values/tuple01.out
+++ b/testdata/language-features/basic-values/tuple01.out
@@ -2,7 +2,9 @@
 unit = _rhs HNil
 main is not found
 ------------ trace
-unit :: ()
+unit :: ()
 ------------ tooltips
-testdata/language-features/basic-values/tuple01.lc 1:1-1:5  ()
-testdata/language-features/basic-values/tuple01.lc 1:8-1:10  ()
+testdata/language-features/basic-values/tuple01.lc 1:1-1:5
+    ()
+testdata/language-features/basic-values/tuple01.lc 1:8-1:10
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/tuple02.out b/testdata/language-features/basic-values/tuple02.out
index 0419494e..8cdbb1b2 100644
--- a/testdata/language-features/basic-values/tuple02.out
+++ b/testdata/language-features/basic-values/tuple02.out
@@ -6,27 +6,47 @@ tuple2 = _rhs (HCons HNil (HCons HNil HNil))
 tuple3 = _rhs (HCons (HCons "name" (HCons 'c' HNil)) (HCons HNil HNil))
 main is not found
 ------------ trace
-tuple1 :: forall a . Num a => (a, Float, Char, String, ())
-tuple2 :: ((), ())
-tuple3 :: ((String, Char), ())
+tuple1 :: forall a . Num a => (a, Float, Char, String, ())
+tuple2 :: ((), ())
+tuple3 :: ((String, Char), ())
 ------------ tooltips
-testdata/language-features/basic-values/tuple02.lc 1:1-1:7  forall a . Num a => (a, Float, Char, String, ())
-testdata/language-features/basic-values/tuple02.lc 1:10-1:33  (_b, Float, Char, String, ())
-testdata/language-features/basic-values/tuple02.lc 1:11-1:12  _b
-testdata/language-features/basic-values/tuple02.lc 1:13-1:16  Float
-testdata/language-features/basic-values/tuple02.lc 1:13-1:32  (Float, Char, String, ())
-testdata/language-features/basic-values/tuple02.lc 1:17-1:20  Char
-testdata/language-features/basic-values/tuple02.lc 1:17-1:32  (Char, String, ())
-testdata/language-features/basic-values/tuple02.lc 1:21-1:29  String
-testdata/language-features/basic-values/tuple02.lc 1:21-1:32  (String, ())
-testdata/language-features/basic-values/tuple02.lc 1:30-1:32  ((())) | ()
-testdata/language-features/basic-values/tuple02.lc 3:1-3:7  ((), ())
-testdata/language-features/basic-values/tuple02.lc 3:10-3:17  ((), ())
-testdata/language-features/basic-values/tuple02.lc 3:11-3:13  ()
-testdata/language-features/basic-values/tuple02.lc 3:14-3:16  ((())) | ()
-testdata/language-features/basic-values/tuple02.lc 5:1-5:7  ((String, Char), ())
-testdata/language-features/basic-values/tuple02.lc 5:10-5:27  ((String, Char), ())
-testdata/language-features/basic-values/tuple02.lc 5:11-5:23  (String, Char)
-testdata/language-features/basic-values/tuple02.lc 5:12-5:18  String
-testdata/language-features/basic-values/tuple02.lc 5:19-5:22  ((Char)) | Char
-testdata/language-features/basic-values/tuple02.lc 5:24-5:26  ((())) | ()
+testdata/language-features/basic-values/tuple02.lc 1:1-1:7
+    forall a . Num a => (a, Float, Char, String, ())
+testdata/language-features/basic-values/tuple02.lc 1:10-1:33
+    (_b, Float, Char, String, ())
+testdata/language-features/basic-values/tuple02.lc 1:11-1:12
+    _b
+testdata/language-features/basic-values/tuple02.lc 1:13-1:16
+    Float
+testdata/language-features/basic-values/tuple02.lc 1:13-1:32
+    (Float, Char, String, ())
+testdata/language-features/basic-values/tuple02.lc 1:17-1:20
+    Char
+testdata/language-features/basic-values/tuple02.lc 1:17-1:32
+    (Char, String, ())
+testdata/language-features/basic-values/tuple02.lc 1:21-1:29
+    String
+testdata/language-features/basic-values/tuple02.lc 1:21-1:32
+    (String, ())
+testdata/language-features/basic-values/tuple02.lc 1:30-1:32
+    () | ((()))
+testdata/language-features/basic-values/tuple02.lc 3:1-3:7
+    ((), ())
+testdata/language-features/basic-values/tuple02.lc 3:10-3:17
+    ((), ())
+testdata/language-features/basic-values/tuple02.lc 3:11-3:13
+    ()
+testdata/language-features/basic-values/tuple02.lc 3:14-3:16
+    () | ((()))
+testdata/language-features/basic-values/tuple02.lc 5:1-5:7
+    ((String, Char), ())
+testdata/language-features/basic-values/tuple02.lc 5:10-5:27
+    ((String, Char), ())
+testdata/language-features/basic-values/tuple02.lc 5:11-5:23
+    (String, Char)
+testdata/language-features/basic-values/tuple02.lc 5:12-5:18
+    String
+testdata/language-features/basic-values/tuple02.lc 5:19-5:22
+    Char | ((Char))
+testdata/language-features/basic-values/tuple02.lc 5:24-5:26
+    () | ((()))
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/typesig01.out b/testdata/language-features/basic-values/typesig01.out
index 491eb5f1..0daccfb4 100644
--- a/testdata/language-features/basic-values/typesig01.out
+++ b/testdata/language-features/basic-values/typesig01.out
@@ -3,12 +3,18 @@ value1 = _rhs 'a' :: Char
 value2 = _rhs 'a' :: Char
 main is not found
 ------------ trace
-value1 :: Char
-value2 :: Char
+value1 :: Char
+value2 :: Char
 ------------ tooltips
-testdata/language-features/basic-values/typesig01.lc 1:11-1:15  Type
-testdata/language-features/basic-values/typesig01.lc 2:1-2:7  Char
-testdata/language-features/basic-values/typesig01.lc 2:10-2:13  Char
-testdata/language-features/basic-values/typesig01.lc 4:9-4:13  Type
-testdata/language-features/basic-values/typesig01.lc 5:1-5:7  Char
-testdata/language-features/basic-values/typesig01.lc 5:8-5:11  Char
+testdata/language-features/basic-values/typesig01.lc 1:11-1:15
+    Type
+testdata/language-features/basic-values/typesig01.lc 2:1-2:7
+    Char
+testdata/language-features/basic-values/typesig01.lc 2:10-2:13
+    Char
+testdata/language-features/basic-values/typesig01.lc 4:9-4:13
+    Type
+testdata/language-features/basic-values/typesig01.lc 5:1-5:7
+    Char
+testdata/language-features/basic-values/typesig01.lc 5:8-5:11
+    Char
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/typesig02.out b/testdata/language-features/basic-values/typesig02.out
index e7b64644..cfd8e29d 100644
--- a/testdata/language-features/basic-values/typesig02.out
+++ b/testdata/language-features/basic-values/typesig02.out
@@ -3,12 +3,18 @@ value1 = _rhs ('a' :: Char)
 value2 = _rhs ('a' :: Char)
 main is not found
 ------------ trace
-value1 :: Char
-value2 :: Char
+value1 :: Char
+value2 :: Char
 ------------ tooltips
-testdata/language-features/basic-values/typesig02.lc 1:1-1:7  Char
-testdata/language-features/basic-values/typesig02.lc 1:10-1:13  Char
-testdata/language-features/basic-values/typesig02.lc 1:17-1:21  Type
-testdata/language-features/basic-values/typesig02.lc 3:1-3:7  Char
-testdata/language-features/basic-values/typesig02.lc 3:8-3:11  Char
-testdata/language-features/basic-values/typesig02.lc 3:13-3:17  Type
+testdata/language-features/basic-values/typesig02.lc 1:1-1:7
+    Char
+testdata/language-features/basic-values/typesig02.lc 1:10-1:13
+    Char
+testdata/language-features/basic-values/typesig02.lc 1:17-1:21
+    Type
+testdata/language-features/basic-values/typesig02.lc 3:1-3:7
+    Char
+testdata/language-features/basic-values/typesig02.lc 3:8-3:11
+    Char
+testdata/language-features/basic-values/typesig02.lc 3:13-3:17
+    Type
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/typesig03.out b/testdata/language-features/basic-values/typesig03.out
index 393824b3..acca5245 100644
--- a/testdata/language-features/basic-values/typesig03.out
+++ b/testdata/language-features/basic-values/typesig03.out
@@ -7,24 +7,42 @@ fun2
     :: forall (a :: _) (b :: _) (c :: _) . a -> b -> c -> HList 'Nil
 main is not found
 ------------ trace
-fun1 :: forall a b c . a -> b -> c -> ()
-fun2 :: forall a b c . a -> b -> c -> ()
+fun1 :: forall a b c . a -> b -> c -> ()
+fun2 :: forall a b c . a -> b -> c -> ()
 ------------ tooltips
-testdata/language-features/basic-values/typesig03.lc 1:9-1:10  _f
-testdata/language-features/basic-values/typesig03.lc 1:9-1:26  Type
-testdata/language-features/basic-values/typesig03.lc 1:14-1:15  _e
-testdata/language-features/basic-values/typesig03.lc 1:14-1:26  Type
-testdata/language-features/basic-values/typesig03.lc 1:19-1:20  _d
-testdata/language-features/basic-values/typesig03.lc 1:19-1:26  Type
-testdata/language-features/basic-values/typesig03.lc 1:24-1:26  Type
-testdata/language-features/basic-values/typesig03.lc 2:1-2:5  forall a b c . a -> b -> c -> ()
-testdata/language-features/basic-values/typesig03.lc 2:14-2:16  () | _c -> () | _c -> _b -> () | _c -> _b -> _a -> ()
-testdata/language-features/basic-values/typesig03.lc 4:7-4:8  _f
-testdata/language-features/basic-values/typesig03.lc 4:7-4:18  Type
-testdata/language-features/basic-values/typesig03.lc 4:10-4:11  _e
-testdata/language-features/basic-values/typesig03.lc 4:10-4:18  Type
-testdata/language-features/basic-values/typesig03.lc 4:13-4:14  _d
-testdata/language-features/basic-values/typesig03.lc 4:13-4:18  Type
-testdata/language-features/basic-values/typesig03.lc 4:16-4:18  Type
-testdata/language-features/basic-values/typesig03.lc 5:1-5:5  forall a b c . a -> b -> c -> ()
-testdata/language-features/basic-values/typesig03.lc 5:14-5:16  () | _c -> () | _c -> _b -> () | _c -> _b -> _a -> ()
+testdata/language-features/basic-values/typesig03.lc 1:9-1:10
+    _f
+testdata/language-features/basic-values/typesig03.lc 1:9-1:26
+    Type | Type | Type
+testdata/language-features/basic-values/typesig03.lc 1:14-1:15
+    _e
+testdata/language-features/basic-values/typesig03.lc 1:14-1:26
+    Type
+testdata/language-features/basic-values/typesig03.lc 1:19-1:20
+    _d
+testdata/language-features/basic-values/typesig03.lc 1:19-1:26
+    Type
+testdata/language-features/basic-values/typesig03.lc 1:24-1:26
+    Type | Type
+testdata/language-features/basic-values/typesig03.lc 2:1-2:5
+    forall a b c . a -> b -> c -> ()
+testdata/language-features/basic-values/typesig03.lc 2:14-2:16
+    ()
+testdata/language-features/basic-values/typesig03.lc 4:7-4:8
+    _f
+testdata/language-features/basic-values/typesig03.lc 4:7-4:18
+    Type | Type | Type
+testdata/language-features/basic-values/typesig03.lc 4:10-4:11
+    _e
+testdata/language-features/basic-values/typesig03.lc 4:10-4:18
+    Type
+testdata/language-features/basic-values/typesig03.lc 4:13-4:14
+    _d
+testdata/language-features/basic-values/typesig03.lc 4:13-4:18
+    Type
+testdata/language-features/basic-values/typesig03.lc 4:16-4:18
+    Type | Type
+testdata/language-features/basic-values/typesig03.lc 5:1-5:5
+    forall a b c . a -> b -> c -> ()
+testdata/language-features/basic-values/typesig03.lc 5:14-5:16
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/typesig04.out b/testdata/language-features/basic-values/typesig04.out
index e6fbc596..9cae9eb3 100644
--- a/testdata/language-features/basic-values/typesig04.out
+++ b/testdata/language-features/basic-values/typesig04.out
@@ -7,22 +7,38 @@ fun2
     :: forall (a :: _) (b :: _) (c :: _) . a -> (b -> c) -> HList 'Nil
 main is not found
 ------------ trace
-fun1 :: forall a b c . a -> (b -> c) -> ()
-fun2 :: forall a b c . a -> (b -> c) -> ()
+fun1 :: forall a b c . a -> (b -> c) -> ()
+fun2 :: forall a b c . a -> (b -> c) -> ()
 ------------ tooltips
-testdata/language-features/basic-values/typesig04.lc 1:9-1:10  _f
-testdata/language-features/basic-values/typesig04.lc 1:9-1:28  Type
-testdata/language-features/basic-values/typesig04.lc 1:14-1:28  Type
-testdata/language-features/basic-values/typesig04.lc 1:15-1:16  _e
-testdata/language-features/basic-values/typesig04.lc 1:20-1:21  Type | _d
-testdata/language-features/basic-values/typesig04.lc 1:26-1:28  Type
-testdata/language-features/basic-values/typesig04.lc 2:1-2:5  forall a b c . a -> (b -> c) -> ()
-testdata/language-features/basic-values/typesig04.lc 2:12-2:14  () | (_c -> _b) -> () | _c -> (_b -> _a) -> ()
-testdata/language-features/basic-values/typesig04.lc 4:7-4:8  _f
-testdata/language-features/basic-values/typesig04.lc 4:7-4:20  Type
-testdata/language-features/basic-values/typesig04.lc 4:10-4:20  Type
-testdata/language-features/basic-values/typesig04.lc 4:11-4:12  _e
-testdata/language-features/basic-values/typesig04.lc 4:14-4:15  Type | _d
-testdata/language-features/basic-values/typesig04.lc 4:18-4:20  Type
-testdata/language-features/basic-values/typesig04.lc 5:1-5:5  forall a b c . a -> (b -> c) -> ()
-testdata/language-features/basic-values/typesig04.lc 5:12-5:14  () | (_c -> _b) -> () | _c -> (_b -> _a) -> ()
+testdata/language-features/basic-values/typesig04.lc 1:9-1:10
+    _f
+testdata/language-features/basic-values/typesig04.lc 1:9-1:28
+    Type | Type | Type
+testdata/language-features/basic-values/typesig04.lc 1:14-1:28
+    Type
+testdata/language-features/basic-values/typesig04.lc 1:15-1:16
+    _e
+testdata/language-features/basic-values/typesig04.lc 1:20-1:21
+    _d | Type
+testdata/language-features/basic-values/typesig04.lc 1:26-1:28
+    Type | Type
+testdata/language-features/basic-values/typesig04.lc 2:1-2:5
+    forall a b c . a -> (b -> c) -> ()
+testdata/language-features/basic-values/typesig04.lc 2:12-2:14
+    ()
+testdata/language-features/basic-values/typesig04.lc 4:7-4:8
+    _f
+testdata/language-features/basic-values/typesig04.lc 4:7-4:20
+    Type | Type | Type
+testdata/language-features/basic-values/typesig04.lc 4:10-4:20
+    Type
+testdata/language-features/basic-values/typesig04.lc 4:11-4:12
+    _e
+testdata/language-features/basic-values/typesig04.lc 4:14-4:15
+    _d | Type
+testdata/language-features/basic-values/typesig04.lc 4:18-4:20
+    Type | Type
+testdata/language-features/basic-values/typesig04.lc 5:1-5:5
+    forall a b c . a -> (b -> c) -> ()
+testdata/language-features/basic-values/typesig04.lc 5:12-5:14
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/typesig05.out b/testdata/language-features/basic-values/typesig05.out
index 1f40f653..b2676de8 100644
--- a/testdata/language-features/basic-values/typesig05.out
+++ b/testdata/language-features/basic-values/typesig05.out
@@ -7,42 +7,74 @@ value3 = _rhs (funL 'a' "b") :: Char
 value4 = _rhs (funR 'a' "b") :: String
 main is not found
 ------------ trace
-funL :: forall a b . a -> b -> a
-funR :: forall a b . a -> b -> b
-value1 :: Char
-value2 :: String
-value3 :: Char
-value4 :: String
+funL :: forall a b . a -> b -> a
+funR :: forall a b . a -> b -> b
+value1 :: Char
+value2 :: String
+value3 :: Char
+value4 :: String
 ------------ tooltips
-testdata/language-features/basic-values/typesig05.lc 1:1-1:5  forall a b . a -> b -> a
-testdata/language-features/basic-values/typesig05.lc 1:12-1:13  _d
-testdata/language-features/basic-values/typesig05.lc 2:1-2:5  forall a b . a -> b -> b
-testdata/language-features/basic-values/typesig05.lc 2:12-2:13  _b
-testdata/language-features/basic-values/typesig05.lc 4:1-4:7  Char
-testdata/language-features/basic-values/typesig05.lc 4:10-4:14  forall a b . a -> b -> a
-testdata/language-features/basic-values/typesig05.lc 4:10-4:18  _a -> Char
-testdata/language-features/basic-values/typesig05.lc 4:10-4:22  Char
-testdata/language-features/basic-values/typesig05.lc 4:15-4:18  Char
-testdata/language-features/basic-values/typesig05.lc 4:19-4:22  String
-testdata/language-features/basic-values/typesig05.lc 4:26-4:30  Type
-testdata/language-features/basic-values/typesig05.lc 5:1-5:7  String
-testdata/language-features/basic-values/typesig05.lc 5:10-5:14  forall a b . a -> b -> b
-testdata/language-features/basic-values/typesig05.lc 5:10-5:18  _a -> _a
-testdata/language-features/basic-values/typesig05.lc 5:10-5:22  String
-testdata/language-features/basic-values/typesig05.lc 5:15-5:18  Char
-testdata/language-features/basic-values/typesig05.lc 5:19-5:22  String
-testdata/language-features/basic-values/typesig05.lc 5:26-5:32  Type
-testdata/language-features/basic-values/typesig05.lc 7:11-7:15  Type
-testdata/language-features/basic-values/typesig05.lc 8:1-8:7  Char
-testdata/language-features/basic-values/typesig05.lc 8:10-8:14  forall a b . a -> b -> a
-testdata/language-features/basic-values/typesig05.lc 8:10-8:18  _a -> Char
-testdata/language-features/basic-values/typesig05.lc 8:10-8:22  Char
-testdata/language-features/basic-values/typesig05.lc 8:15-8:18  Char
-testdata/language-features/basic-values/typesig05.lc 8:19-8:22  String
-testdata/language-features/basic-values/typesig05.lc 10:11-10:17  Type
-testdata/language-features/basic-values/typesig05.lc 11:1-11:7  String
-testdata/language-features/basic-values/typesig05.lc 11:10-11:14  forall a b . a -> b -> b
-testdata/language-features/basic-values/typesig05.lc 11:10-11:18  _a -> _a
-testdata/language-features/basic-values/typesig05.lc 11:10-11:22  String
-testdata/language-features/basic-values/typesig05.lc 11:15-11:18  Char
-testdata/language-features/basic-values/typesig05.lc 11:19-11:22  String
+testdata/language-features/basic-values/typesig05.lc 1:1-1:5
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/typesig05.lc 1:12-1:13
+    _d
+testdata/language-features/basic-values/typesig05.lc 2:1-2:5
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/typesig05.lc 2:12-2:13
+    _b
+testdata/language-features/basic-values/typesig05.lc 4:1-4:7
+    Char
+testdata/language-features/basic-values/typesig05.lc 4:10-4:14
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/typesig05.lc 4:10-4:18
+    _a -> Char
+testdata/language-features/basic-values/typesig05.lc 4:10-4:22
+    Char
+testdata/language-features/basic-values/typesig05.lc 4:15-4:18
+    Char
+testdata/language-features/basic-values/typesig05.lc 4:19-4:22
+    String
+testdata/language-features/basic-values/typesig05.lc 4:26-4:30
+    Type
+testdata/language-features/basic-values/typesig05.lc 5:1-5:7
+    String
+testdata/language-features/basic-values/typesig05.lc 5:10-5:14
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/typesig05.lc 5:10-5:18
+    _a -> _a
+testdata/language-features/basic-values/typesig05.lc 5:10-5:22
+    String
+testdata/language-features/basic-values/typesig05.lc 5:15-5:18
+    Char
+testdata/language-features/basic-values/typesig05.lc 5:19-5:22
+    String
+testdata/language-features/basic-values/typesig05.lc 5:26-5:32
+    Type
+testdata/language-features/basic-values/typesig05.lc 7:11-7:15
+    Type
+testdata/language-features/basic-values/typesig05.lc 8:1-8:7
+    Char
+testdata/language-features/basic-values/typesig05.lc 8:10-8:14
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/typesig05.lc 8:10-8:18
+    _a -> Char
+testdata/language-features/basic-values/typesig05.lc 8:10-8:22
+    Char
+testdata/language-features/basic-values/typesig05.lc 8:15-8:18
+    Char
+testdata/language-features/basic-values/typesig05.lc 8:19-8:22
+    String
+testdata/language-features/basic-values/typesig05.lc 10:11-10:17
+    Type
+testdata/language-features/basic-values/typesig05.lc 11:1-11:7
+    String
+testdata/language-features/basic-values/typesig05.lc 11:10-11:14
+    forall a b . a -> b -> b
+testdata/language-features/basic-values/typesig05.lc 11:10-11:18
+    _a -> _a
+testdata/language-features/basic-values/typesig05.lc 11:10-11:22
+    String
+testdata/language-features/basic-values/typesig05.lc 11:15-11:18
+    Char
+testdata/language-features/basic-values/typesig05.lc 11:19-11:22
+    String
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/typesig06.out b/testdata/language-features/basic-values/typesig06.out
index 6c86ce15..5a4bfa41 100644
--- a/testdata/language-features/basic-values/typesig06.out
+++ b/testdata/language-features/basic-values/typesig06.out
@@ -5,26 +5,44 @@ value1 = _rhs ("hi" <@ 1.2 :: String)
 value2 = _rhs ("hi" `funL` 1.2 :: String)
 main is not found
 ------------ trace
-funL :: forall a b . a -> b -> a
-<@ :: forall a b . a -> b -> a
-value1 :: String
-value2 :: String
+funL :: forall a b . a -> b -> a
+<@ :: forall a b . a -> b -> a
+value1 :: String
+value2 :: String
 ------------ tooltips
-testdata/language-features/basic-values/typesig06.lc 1:1-1:5  forall a b . a -> b -> a
-testdata/language-features/basic-values/typesig06.lc 1:12-1:13  _d
-testdata/language-features/basic-values/typesig06.lc 2:3-2:5  forall a b . a -> b -> a
-testdata/language-features/basic-values/typesig06.lc 2:10-2:11  _d
-testdata/language-features/basic-values/typesig06.lc 4:1-4:7  String
-testdata/language-features/basic-values/typesig06.lc 4:10-4:14  String
-testdata/language-features/basic-values/typesig06.lc 4:10-4:17  _a -> String
-testdata/language-features/basic-values/typesig06.lc 4:10-4:21  String
-testdata/language-features/basic-values/typesig06.lc 4:15-4:17  forall a b . a -> b -> a
-testdata/language-features/basic-values/typesig06.lc 4:18-4:21  Float
-testdata/language-features/basic-values/typesig06.lc 4:25-4:31  Type
-testdata/language-features/basic-values/typesig06.lc 5:1-5:7  String
-testdata/language-features/basic-values/typesig06.lc 5:10-5:14  String
-testdata/language-features/basic-values/typesig06.lc 5:10-5:21  _a -> String
-testdata/language-features/basic-values/typesig06.lc 5:10-5:25  String
-testdata/language-features/basic-values/typesig06.lc 5:15-5:21  forall a b . a -> b -> a
-testdata/language-features/basic-values/typesig06.lc 5:22-5:25  Float
-testdata/language-features/basic-values/typesig06.lc 5:29-5:35  Type
+testdata/language-features/basic-values/typesig06.lc 1:1-1:5
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/typesig06.lc 1:12-1:13
+    _d
+testdata/language-features/basic-values/typesig06.lc 2:3-2:5
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/typesig06.lc 2:10-2:11
+    _d
+testdata/language-features/basic-values/typesig06.lc 4:1-4:7
+    String
+testdata/language-features/basic-values/typesig06.lc 4:10-4:14
+    String
+testdata/language-features/basic-values/typesig06.lc 4:10-4:17
+    _a -> String
+testdata/language-features/basic-values/typesig06.lc 4:10-4:21
+    String
+testdata/language-features/basic-values/typesig06.lc 4:15-4:17
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/typesig06.lc 4:18-4:21
+    Float
+testdata/language-features/basic-values/typesig06.lc 4:25-4:31
+    Type
+testdata/language-features/basic-values/typesig06.lc 5:1-5:7
+    String
+testdata/language-features/basic-values/typesig06.lc 5:10-5:14
+    String
+testdata/language-features/basic-values/typesig06.lc 5:10-5:21
+    _a -> String
+testdata/language-features/basic-values/typesig06.lc 5:10-5:25
+    String
+testdata/language-features/basic-values/typesig06.lc 5:15-5:21
+    forall a b . a -> b -> a
+testdata/language-features/basic-values/typesig06.lc 5:22-5:25
+    Float
+testdata/language-features/basic-values/typesig06.lc 5:29-5:35
+    Type
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/typesig07.out b/testdata/language-features/basic-values/typesig07.out
index 08742feb..8d454af6 100644
--- a/testdata/language-features/basic-values/typesig07.out
+++ b/testdata/language-features/basic-values/typesig07.out
@@ -7,27 +7,44 @@ value4 = (\_ -> \_ -> _rhs HNil) :: HList 'Nil -> HList 'Nil -> HList 'Nil
 value6 = (\_ -> \_ -> _rhs HNil) :: HList 'Nil -> HList 'Nil -> HList 'Nil
 main is not found
 ------------ trace
-value1 :: Int
-value2 :: Int
-value3 :: Int
-value4 :: () -> () -> ()
-@@@ :: () -> () -> ()
-value6 :: () -> () -> ()
+value1 :: Int
+value2 :: Int
+value3 :: Int
+value4 :: () -> () -> ()
+@@@ :: () -> () -> ()
+value6 :: () -> () -> ()
 ------------ tooltips
-testdata/language-features/basic-values/typesig07.lc 1:27-1:30  Type
-testdata/language-features/basic-values/typesig07.lc 3:1-3:7  Int
-testdata/language-features/basic-values/typesig07.lc 3:10-3:11  _b
-testdata/language-features/basic-values/typesig07.lc 4:1-4:7  Int
-testdata/language-features/basic-values/typesig07.lc 4:10-4:11  _b
-testdata/language-features/basic-values/typesig07.lc 5:1-5:7  Int
-testdata/language-features/basic-values/typesig07.lc 5:10-5:11  _b
-testdata/language-features/basic-values/typesig07.lc 8:12-8:14  Type
-testdata/language-features/basic-values/typesig07.lc 8:18-8:20  Type
-testdata/language-features/basic-values/typesig07.lc 8:18-8:26  Type
-testdata/language-features/basic-values/typesig07.lc 8:24-8:26  Type
-testdata/language-features/basic-values/typesig07.lc 10:1-10:7  () -> () -> ()
-testdata/language-features/basic-values/typesig07.lc 10:14-10:16  () | () -> () | () -> () -> ()
-testdata/language-features/basic-values/typesig07.lc 11:3-11:6  () -> () -> ()
-testdata/language-features/basic-values/typesig07.lc 11:11-11:13  () | () -> () | () -> () -> ()
-testdata/language-features/basic-values/typesig07.lc 12:1-12:7  () -> () -> ()
-testdata/language-features/basic-values/typesig07.lc 12:14-12:16  () | () -> () | () -> () -> ()
+testdata/language-features/basic-values/typesig07.lc 1:27-1:30
+    Type | Type | Type
+testdata/language-features/basic-values/typesig07.lc 3:1-3:7
+    Int
+testdata/language-features/basic-values/typesig07.lc 3:10-3:11
+    _b
+testdata/language-features/basic-values/typesig07.lc 4:1-4:7
+    Int
+testdata/language-features/basic-values/typesig07.lc 4:10-4:11
+    _b
+testdata/language-features/basic-values/typesig07.lc 5:1-5:7
+    Int
+testdata/language-features/basic-values/typesig07.lc 5:10-5:11
+    _b
+testdata/language-features/basic-values/typesig07.lc 8:12-8:14
+    Type | Type | Type
+testdata/language-features/basic-values/typesig07.lc 8:18-8:20
+    Type | Type | Type
+testdata/language-features/basic-values/typesig07.lc 8:18-8:26
+    Type | Type | Type
+testdata/language-features/basic-values/typesig07.lc 8:24-8:26
+    Type | Type | Type | Type | Type | Type
+testdata/language-features/basic-values/typesig07.lc 10:1-10:7
+    () -> () -> ()
+testdata/language-features/basic-values/typesig07.lc 10:14-10:16
+    ()
+testdata/language-features/basic-values/typesig07.lc 11:3-11:6
+    () -> () -> ()
+testdata/language-features/basic-values/typesig07.lc 11:11-11:13
+    ()
+testdata/language-features/basic-values/typesig07.lc 12:1-12:7
+    () -> () -> ()
+testdata/language-features/basic-values/typesig07.lc 12:14-12:16
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/typesyn01.out b/testdata/language-features/basic-values/typesyn01.out
index 3d10ddaa..f9a6aa11 100644
--- a/testdata/language-features/basic-values/typesyn01.out
+++ b/testdata/language-features/basic-values/typesyn01.out
@@ -2,7 +2,9 @@
 'MyUnit = _rhs ('HList Nil)
 main is not found
 ------------ trace
-'MyUnit :: Type
+'MyUnit :: Type
 ------------ tooltips
-testdata/language-features/basic-values/typesyn01.lc 1:6-1:12  Type
-testdata/language-features/basic-values/typesyn01.lc 1:15-1:17  Type
+testdata/language-features/basic-values/typesyn01.lc 1:6-1:12
+    Type
+testdata/language-features/basic-values/typesyn01.lc 1:15-1:17
+    Type
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/typesyn02.out b/testdata/language-features/basic-values/typesyn02.out
index 615d97eb..86f91ada 100644
--- a/testdata/language-features/basic-values/typesyn02.out
+++ b/testdata/language-features/basic-values/typesyn02.out
@@ -5,15 +5,24 @@ fun
     :: forall (b :: _) . b -> MyUnit -> MyUnit
 main is not found
 ------------ trace
-'MyUnit :: Type
-fun :: forall a . a -> () -> ()
+'MyUnit :: Type
+fun :: forall a . a -> () -> ()
 ------------ tooltips
-testdata/language-features/basic-values/typesyn02.lc 1:6-1:12  Type
-testdata/language-features/basic-values/typesyn02.lc 1:15-1:17  Type
-testdata/language-features/basic-values/typesyn02.lc 3:8-3:9  _b
-testdata/language-features/basic-values/typesyn02.lc 3:8-3:29  Type
-testdata/language-features/basic-values/typesyn02.lc 3:13-3:19  Type
-testdata/language-features/basic-values/typesyn02.lc 3:13-3:29  Type
-testdata/language-features/basic-values/typesyn02.lc 3:23-3:29  Type
-testdata/language-features/basic-values/typesyn02.lc 4:1-4:4  forall a . a -> () -> ()
-testdata/language-features/basic-values/typesyn02.lc 4:12-4:14  () | () -> () | _a -> () -> ()
+testdata/language-features/basic-values/typesyn02.lc 1:6-1:12
+    Type
+testdata/language-features/basic-values/typesyn02.lc 1:15-1:17
+    Type
+testdata/language-features/basic-values/typesyn02.lc 3:8-3:9
+    _b
+testdata/language-features/basic-values/typesyn02.lc 3:8-3:29
+    Type
+testdata/language-features/basic-values/typesyn02.lc 3:13-3:19
+    Type
+testdata/language-features/basic-values/typesyn02.lc 3:13-3:29
+    Type
+testdata/language-features/basic-values/typesyn02.lc 3:23-3:29
+    Type | Type
+testdata/language-features/basic-values/typesyn02.lc 4:1-4:4
+    forall a . a -> () -> ()
+testdata/language-features/basic-values/typesyn02.lc 4:12-4:14
+    () | ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/typesyn03.reject.out b/testdata/language-features/basic-values/typesyn03.reject.out
index cf08db7a..2b77d0c1 100644
--- a/testdata/language-features/basic-values/typesyn03.reject.out
+++ b/testdata/language-features/basic-values/typesyn03.reject.out
@@ -5,8 +5,8 @@ and at testdata/language-features/basic-values/typesyn03.reject.lc:1:6:
 type MyUnit = ()
      ^^^^^^
 ------------ trace
-'MyUnit :: Type
-'MyUnit :: Type
+'MyUnit :: Type
+'MyUnit :: Type
 !already defined 'MyUnit at testdata/language-features/basic-values/typesyn03.reject.lc:2:6:
 type MyUnit = ()
      ^^^^^^
@@ -14,7 +14,11 @@ and at testdata/language-features/basic-values/typesyn03.reject.lc:1:6:
 type MyUnit = ()
      ^^^^^^
 ------------ tooltips
-testdata/language-features/basic-values/typesyn03.reject.lc 1:6-1:12  Type
-testdata/language-features/basic-values/typesyn03.reject.lc 1:15-1:17  Type
-testdata/language-features/basic-values/typesyn03.reject.lc 2:6-2:12  Type
-testdata/language-features/basic-values/typesyn03.reject.lc 2:15-2:17  Type
+testdata/language-features/basic-values/typesyn03.reject.lc 1:6-1:12
+    Type
+testdata/language-features/basic-values/typesyn03.reject.lc 1:15-1:17
+    Type
+testdata/language-features/basic-values/typesyn03.reject.lc 2:6-2:12
+    Type
+testdata/language-features/basic-values/typesyn03.reject.lc 2:15-2:17
+    Type
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/typesyn04.reject.out b/testdata/language-features/basic-values/typesyn04.reject.out
index 94fc1e8c..bb35b41e 100644
--- a/testdata/language-features/basic-values/typesyn04.reject.out
+++ b/testdata/language-features/basic-values/typesyn04.reject.out
@@ -5,8 +5,8 @@ and at testdata/language-features/basic-values/typesyn04.reject.lc:1:6:
 type MyUnit = ()
      ^^^^^^
 ------------ trace
-'MyUnit :: Type
-'MyUnit :: Type
+'MyUnit :: Type
+'MyUnit :: Type
 !already defined 'MyUnit at testdata/language-features/basic-values/typesyn04.reject.lc:2:6:
 type MyUnit = ()
      ^^^^^^
@@ -14,7 +14,11 @@ and at testdata/language-features/basic-values/typesyn04.reject.lc:1:6:
 type MyUnit = ()
      ^^^^^^
 ------------ tooltips
-testdata/language-features/basic-values/typesyn04.reject.lc 1:6-1:12  Type
-testdata/language-features/basic-values/typesyn04.reject.lc 1:15-1:17  Type
-testdata/language-features/basic-values/typesyn04.reject.lc 2:6-2:12  Type
-testdata/language-features/basic-values/typesyn04.reject.lc 2:15-2:17  Type
+testdata/language-features/basic-values/typesyn04.reject.lc 1:6-1:12
+    Type
+testdata/language-features/basic-values/typesyn04.reject.lc 1:15-1:17
+    Type
+testdata/language-features/basic-values/typesyn04.reject.lc 2:6-2:12
+    Type
+testdata/language-features/basic-values/typesyn04.reject.lc 2:15-2:17
+    Type
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/where01.out b/testdata/language-features/basic-values/where01.out
index 0008aa6a..9ff7eb28 100644
--- a/testdata/language-features/basic-values/where01.out
+++ b/testdata/language-features/basic-values/where01.out
@@ -12,51 +12,87 @@ value10 = _rhs \(a := _rhs HNil) (b := _rhs HNil) -> a
 value11 = _rhs \(a := _rhs HNil) (b := _rhs HNil) -> a
 main is not found
 ------------ trace
-value1 :: ()
-value2 :: ()
-value3 :: ()
-value4 :: ()
-value5 :: ()
-value6 :: ()
-value7 :: ()
-value8 :: ()
-value9 :: ()
-value10 :: ()
-value11 :: ()
+value1 :: ()
+value2 :: ()
+value3 :: ()
+value4 :: ()
+value5 :: ()
+value6 :: ()
+value7 :: ()
+value8 :: ()
+value9 :: ()
+value10 :: ()
+value11 :: ()
 ------------ tooltips
-testdata/language-features/basic-values/where01.lc 1:1-1:7  ()
-testdata/language-features/basic-values/where01.lc 1:10-1:12  ()
-testdata/language-features/basic-values/where01.lc 1:23-1:25  ()
-testdata/language-features/basic-values/where01.lc 3:1-3:7  ()
-testdata/language-features/basic-values/where01.lc 3:10-3:11  ()
-testdata/language-features/basic-values/where01.lc 4:12-4:14  ()
-testdata/language-features/basic-values/where01.lc 6:1-6:7  ()
-testdata/language-features/basic-values/where01.lc 6:10-6:11  ()
-testdata/language-features/basic-values/where01.lc 7:12-7:14  ()
-testdata/language-features/basic-values/where01.lc 8:12-8:14  ()
-testdata/language-features/basic-values/where01.lc 10:1-10:7  ()
-testdata/language-features/basic-values/where01.lc 10:10-10:11  ()
-testdata/language-features/basic-values/where01.lc 12:6-12:8  ()
-testdata/language-features/basic-values/where01.lc 13:6-13:8  ()
-testdata/language-features/basic-values/where01.lc 15:1-15:7  ()
-testdata/language-features/basic-values/where01.lc 15:10-15:11  ()
-testdata/language-features/basic-values/where01.lc 17:7-17:9  ()
-testdata/language-features/basic-values/where01.lc 18:7-18:9  ()
-testdata/language-features/basic-values/where01.lc 20:1-20:7  ()
-testdata/language-features/basic-values/where01.lc 20:10-20:12  ()
-testdata/language-features/basic-values/where01.lc 22:1-22:7  ()
-testdata/language-features/basic-values/where01.lc 22:10-22:12  ()
-testdata/language-features/basic-values/where01.lc 25:1-25:7  ()
-testdata/language-features/basic-values/where01.lc 25:10-25:12  ()
-testdata/language-features/basic-values/where01.lc 30:1-30:7  ()
-testdata/language-features/basic-values/where01.lc 30:10-30:11  ()
-testdata/language-features/basic-values/where01.lc 34:7-34:9  ()
-testdata/language-features/basic-values/where01.lc 35:7-35:9  ()
-testdata/language-features/basic-values/where01.lc 37:1-37:8  ()
-testdata/language-features/basic-values/where01.lc 37:11-37:12  ()
-testdata/language-features/basic-values/where01.lc 39:6-39:8  ()
-testdata/language-features/basic-values/where01.lc 40:6-40:8  ()
-testdata/language-features/basic-values/where01.lc 42:1-42:8  ()
-testdata/language-features/basic-values/where01.lc 42:11-42:12  ()
-testdata/language-features/basic-values/where01.lc 43:6-43:8  ()
-testdata/language-features/basic-values/where01.lc 44:6-44:8  ()
+testdata/language-features/basic-values/where01.lc 1:1-1:7
+    ()
+testdata/language-features/basic-values/where01.lc 1:10-1:12
+    ()
+testdata/language-features/basic-values/where01.lc 1:23-1:25
+    ()
+testdata/language-features/basic-values/where01.lc 3:1-3:7
+    ()
+testdata/language-features/basic-values/where01.lc 3:10-3:11
+    ()
+testdata/language-features/basic-values/where01.lc 4:12-4:14
+    ()
+testdata/language-features/basic-values/where01.lc 6:1-6:7
+    ()
+testdata/language-features/basic-values/where01.lc 6:10-6:11
+    ()
+testdata/language-features/basic-values/where01.lc 7:12-7:14
+    ()
+testdata/language-features/basic-values/where01.lc 8:12-8:14
+    ()
+testdata/language-features/basic-values/where01.lc 10:1-10:7
+    ()
+testdata/language-features/basic-values/where01.lc 10:10-10:11
+    ()
+testdata/language-features/basic-values/where01.lc 12:6-12:8
+    ()
+testdata/language-features/basic-values/where01.lc 13:6-13:8
+    ()
+testdata/language-features/basic-values/where01.lc 15:1-15:7
+    ()
+testdata/language-features/basic-values/where01.lc 15:10-15:11
+    ()
+testdata/language-features/basic-values/where01.lc 17:7-17:9
+    ()
+testdata/language-features/basic-values/where01.lc 18:7-18:9
+    ()
+testdata/language-features/basic-values/where01.lc 20:1-20:7
+    ()
+testdata/language-features/basic-values/where01.lc 20:10-20:12
+    ()
+testdata/language-features/basic-values/where01.lc 22:1-22:7
+    ()
+testdata/language-features/basic-values/where01.lc 22:10-22:12
+    ()
+testdata/language-features/basic-values/where01.lc 25:1-25:7
+    ()
+testdata/language-features/basic-values/where01.lc 25:10-25:12
+    ()
+testdata/language-features/basic-values/where01.lc 30:1-30:7
+    ()
+testdata/language-features/basic-values/where01.lc 30:10-30:11
+    ()
+testdata/language-features/basic-values/where01.lc 34:7-34:9
+    ()
+testdata/language-features/basic-values/where01.lc 35:7-35:9
+    ()
+testdata/language-features/basic-values/where01.lc 37:1-37:8
+    ()
+testdata/language-features/basic-values/where01.lc 37:11-37:12
+    ()
+testdata/language-features/basic-values/where01.lc 39:6-39:8
+    ()
+testdata/language-features/basic-values/where01.lc 40:6-40:8
+    ()
+testdata/language-features/basic-values/where01.lc 42:1-42:8
+    ()
+testdata/language-features/basic-values/where01.lc 42:11-42:12
+    ()
+testdata/language-features/basic-values/where01.lc 43:6-43:8
+    ()
+testdata/language-features/basic-values/where01.lc 44:6-44:8
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/where04.out b/testdata/language-features/basic-values/where04.out
index 36bc3969..f5e16747 100644
--- a/testdata/language-features/basic-values/where04.out
+++ b/testdata/language-features/basic-values/where04.out
@@ -4,19 +4,31 @@ value2 = _rhs \(a := _rhs \(b := _rhs HNil) -> b) -> a
 value3 = _rhs \(a := _rhs \(b := _rhs HNil) -> b) -> a
 main is not found
 ------------ trace
-value1 :: ()
-value2 :: ()
-value3 :: ()
+value1 :: ()
+value2 :: ()
+value3 :: ()
 ------------ tooltips
-testdata/language-features/basic-values/where04.lc 1:1-1:7  ()
-testdata/language-features/basic-values/where04.lc 1:18-1:19  ()
-testdata/language-features/basic-values/where04.lc 1:30-1:32  ()
-testdata/language-features/basic-values/where04.lc 1:36-1:37  ()
-testdata/language-features/basic-values/where04.lc 3:1-3:7  ()
-testdata/language-features/basic-values/where04.lc 3:18-3:19  ()
-testdata/language-features/basic-values/where04.lc 4:25-4:27  ()
-testdata/language-features/basic-values/where04.lc 5:13-5:14  ()
-testdata/language-features/basic-values/where04.lc 7:1-7:7  ()
-testdata/language-features/basic-values/where04.lc 7:18-7:19  ()
-testdata/language-features/basic-values/where04.lc 9:19-9:21  ()
-testdata/language-features/basic-values/where04.lc 10:13-10:14  ()
+testdata/language-features/basic-values/where04.lc 1:1-1:7
+    ()
+testdata/language-features/basic-values/where04.lc 1:18-1:19
+    ()
+testdata/language-features/basic-values/where04.lc 1:30-1:32
+    ()
+testdata/language-features/basic-values/where04.lc 1:36-1:37
+    ()
+testdata/language-features/basic-values/where04.lc 3:1-3:7
+    ()
+testdata/language-features/basic-values/where04.lc 3:18-3:19
+    ()
+testdata/language-features/basic-values/where04.lc 4:25-4:27
+    ()
+testdata/language-features/basic-values/where04.lc 5:13-5:14
+    ()
+testdata/language-features/basic-values/where04.lc 7:1-7:7
+    ()
+testdata/language-features/basic-values/where04.lc 7:18-7:19
+    ()
+testdata/language-features/basic-values/where04.lc 9:19-9:21
+    ()
+testdata/language-features/basic-values/where04.lc 10:13-10:14
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/where05.out b/testdata/language-features/basic-values/where05.out
index ee42956d..a16b9c91 100644
--- a/testdata/language-features/basic-values/where05.out
+++ b/testdata/language-features/basic-values/where05.out
@@ -33,36 +33,64 @@ value4
       (fromInt 1)
 main is not found
 ------------ trace
-value1 :: forall a . (Eq a, Num a) => ()
-value2 :: forall a . (Eq a, Num a) => ()
-value3 :: forall a . (Eq a, Num a) => ()
-value4 :: forall a . (Eq a, Num a) => ()
+value1 :: forall a . (Eq a, Num a) => ()
+value2 :: forall a . (Eq a, Num a) => ()
+value3 :: forall a . (Eq a, Num a) => ()
+value4 :: forall a . (Eq a, Num a) => ()
 ------------ tooltips
-testdata/language-features/basic-values/where05.lc 1:1-1:7  forall a . (Eq a, Num a) => ()
-testdata/language-features/basic-values/where05.lc 1:10-3:10  ()
-testdata/language-features/basic-values/where05.lc 1:15-1:16  _b
-testdata/language-features/basic-values/where05.lc 2:8-2:9  ()
-testdata/language-features/basic-values/where05.lc 2:8-3:10  Bool -> ()
-testdata/language-features/basic-values/where05.lc 2:20-2:22  ()
-testdata/language-features/basic-values/where05.lc 3:8-3:10  ()
-testdata/language-features/basic-values/where05.lc 5:1-5:7  forall a . (Eq a, Num a) => ()
-testdata/language-features/basic-values/where05.lc 5:10-8:10  ()
-testdata/language-features/basic-values/where05.lc 5:15-5:16  _b
-testdata/language-features/basic-values/where05.lc 6:8-6:9  ()
-testdata/language-features/basic-values/where05.lc 6:8-8:10  Bool -> ()
-testdata/language-features/basic-values/where05.lc 7:14-7:16  ()
-testdata/language-features/basic-values/where05.lc 8:8-8:10  ()
-testdata/language-features/basic-values/where05.lc 10:1-10:7  forall a . (Eq a, Num a) => ()
-testdata/language-features/basic-values/where05.lc 10:10-14:10  ()
-testdata/language-features/basic-values/where05.lc 10:15-10:16  _b
-testdata/language-features/basic-values/where05.lc 11:8-11:9  ()
-testdata/language-features/basic-values/where05.lc 11:8-14:10  Bool -> ()
-testdata/language-features/basic-values/where05.lc 13:8-13:10  ()
-testdata/language-features/basic-values/where05.lc 14:8-14:10  ()
-testdata/language-features/basic-values/where05.lc 16:1-16:7  forall a . (Eq a, Num a) => ()
-testdata/language-features/basic-values/where05.lc 16:10-18:10  ()
-testdata/language-features/basic-values/where05.lc 16:15-16:16  _b
-testdata/language-features/basic-values/where05.lc 17:8-17:9  ()
-testdata/language-features/basic-values/where05.lc 17:8-18:10  Bool -> ()
-testdata/language-features/basic-values/where05.lc 18:8-18:10  ()
-testdata/language-features/basic-values/where05.lc 21:6-21:8  ()
+testdata/language-features/basic-values/where05.lc 1:1-1:7
+    forall a . (Eq a, Num a) => ()
+testdata/language-features/basic-values/where05.lc 1:10-3:10
+    ()
+testdata/language-features/basic-values/where05.lc 1:15-1:16
+    _b
+testdata/language-features/basic-values/where05.lc 2:8-2:9
+    ()
+testdata/language-features/basic-values/where05.lc 2:8-3:10
+    Bool -> ()
+testdata/language-features/basic-values/where05.lc 2:20-2:22
+    ()
+testdata/language-features/basic-values/where05.lc 3:8-3:10
+    ()
+testdata/language-features/basic-values/where05.lc 5:1-5:7
+    forall a . (Eq a, Num a) => ()
+testdata/language-features/basic-values/where05.lc 5:10-8:10
+    ()
+testdata/language-features/basic-values/where05.lc 5:15-5:16
+    _b
+testdata/language-features/basic-values/where05.lc 6:8-6:9
+    ()
+testdata/language-features/basic-values/where05.lc 6:8-8:10
+    Bool -> ()
+testdata/language-features/basic-values/where05.lc 7:14-7:16
+    ()
+testdata/language-features/basic-values/where05.lc 8:8-8:10
+    ()
+testdata/language-features/basic-values/where05.lc 10:1-10:7
+    forall a . (Eq a, Num a) => ()
+testdata/language-features/basic-values/where05.lc 10:10-14:10
+    ()
+testdata/language-features/basic-values/where05.lc 10:15-10:16
+    _b
+testdata/language-features/basic-values/where05.lc 11:8-11:9
+    ()
+testdata/language-features/basic-values/where05.lc 11:8-14:10
+    Bool -> ()
+testdata/language-features/basic-values/where05.lc 13:8-13:10
+    ()
+testdata/language-features/basic-values/where05.lc 14:8-14:10
+    ()
+testdata/language-features/basic-values/where05.lc 16:1-16:7
+    forall a . (Eq a, Num a) => ()
+testdata/language-features/basic-values/where05.lc 16:10-18:10
+    ()
+testdata/language-features/basic-values/where05.lc 16:15-16:16
+    _b
+testdata/language-features/basic-values/where05.lc 17:8-17:9
+    ()
+testdata/language-features/basic-values/where05.lc 17:8-18:10
+    Bool -> ()
+testdata/language-features/basic-values/where05.lc 18:8-18:10
+    ()
+testdata/language-features/basic-values/where05.lc 21:6-21:8
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/wildcard01.out b/testdata/language-features/basic-values/wildcard01.out
index 86b6cae7..61b6a8c4 100644
--- a/testdata/language-features/basic-values/wildcard01.out
+++ b/testdata/language-features/basic-values/wildcard01.out
@@ -2,7 +2,9 @@
 funUnit = \_ -> _rhs HNil
 main is not found
 ------------ trace
-funUnit :: forall a . a -> ()
+funUnit :: forall a . a -> ()
 ------------ tooltips
-testdata/language-features/basic-values/wildcard01.lc 1:1-1:8  forall a . a -> ()
-testdata/language-features/basic-values/wildcard01.lc 1:13-1:15  ()
+testdata/language-features/basic-values/wildcard01.lc 1:1-1:8
+    forall a . a -> ()
+testdata/language-features/basic-values/wildcard01.lc 1:13-1:15
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/guard/guard01.out b/testdata/language-features/guard/guard01.out
index 6fde06b1..2024e439 100644
--- a/testdata/language-features/guard/guard01.out
+++ b/testdata/language-features/guard/guard01.out
@@ -2,9 +2,13 @@
 value = 'BoolCase \_ -> _ :: _ (_rhs undefined) (_rhs HNil) True
 main is not found
 ------------ trace
-value :: ()
+value :: ()
 ------------ tooltips
-testdata/language-features/guard/guard01.lc 1:1-1:6  ()
-testdata/language-features/guard/guard01.lc 1:9-1:13  Bool
-testdata/language-features/guard/guard01.lc 1:9-1:18  ()
-testdata/language-features/guard/guard01.lc 1:16-1:18  ()
+testdata/language-features/guard/guard01.lc 1:1-1:6
+    ()
+testdata/language-features/guard/guard01.lc 1:9-1:13
+    Bool
+testdata/language-features/guard/guard01.lc 1:9-1:18
+    ()
+testdata/language-features/guard/guard01.lc 1:16-1:18
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/guard/guard02.reject.out b/testdata/language-features/guard/guard02.reject.out
index cd5b17c1..c46ac690 100644
--- a/testdata/language-features/guard/guard02.reject.out
+++ b/testdata/language-features/guard/guard02.reject.out
@@ -16,7 +16,11 @@ in testdata/language-features/guard/guard02.reject.lc:2:12:
   | True = ()
            ^^
 ------------ tooltips
-testdata/language-features/guard/guard02.reject.lc 2:12-2:14  ()
-testdata/language-features/guard/guard02.reject.lc 3:5-3:10  Bool
-testdata/language-features/guard/guard02.reject.lc 3:5-3:15  String
-testdata/language-features/guard/guard02.reject.lc 3:13-3:15  String
+testdata/language-features/guard/guard02.reject.lc 2:12-2:14
+    ()
+testdata/language-features/guard/guard02.reject.lc 3:5-3:10
+    Bool
+testdata/language-features/guard/guard02.reject.lc 3:5-3:15
+    String
+testdata/language-features/guard/guard02.reject.lc 3:13-3:15
+    String
\ No newline at end of file
diff --git a/testdata/language-features/guard/guard03.out b/testdata/language-features/guard/guard03.out
index 7b176d9b..f6d6fde2 100644
--- a/testdata/language-features/guard/guard03.out
+++ b/testdata/language-features/guard/guard03.out
@@ -7,13 +7,21 @@ value
     True
 main is not found
 ------------ trace
-value :: String
+value :: String
 ------------ tooltips
-testdata/language-features/guard/guard03.lc 1:1-1:6  String
-testdata/language-features/guard/guard03.lc 2:5-2:9  Bool
-testdata/language-features/guard/guard03.lc 2:5-3:20  String
-testdata/language-features/guard/guard03.lc 2:12-2:18  String
-testdata/language-features/guard/guard03.lc 2:12-3:20  Bool -> String
-testdata/language-features/guard/guard03.lc 3:5-3:10  Bool
-testdata/language-features/guard/guard03.lc 3:5-3:20  String
-testdata/language-features/guard/guard03.lc 3:13-3:20  String
+testdata/language-features/guard/guard03.lc 1:1-1:6
+    String
+testdata/language-features/guard/guard03.lc 2:5-2:9
+    Bool
+testdata/language-features/guard/guard03.lc 2:5-3:20
+    String
+testdata/language-features/guard/guard03.lc 2:12-2:18
+    String
+testdata/language-features/guard/guard03.lc 2:12-3:20
+    Bool -> String
+testdata/language-features/guard/guard03.lc 3:5-3:10
+    Bool
+testdata/language-features/guard/guard03.lc 3:5-3:20
+    String
+testdata/language-features/guard/guard03.lc 3:13-3:20
+    String
\ No newline at end of file
diff --git a/testdata/language-features/guard/guard04.out b/testdata/language-features/guard/guard04.out
index 54ca2fb7..71c66618 100644
--- a/testdata/language-features/guard/guard04.out
+++ b/testdata/language-features/guard/guard04.out
@@ -2,11 +2,17 @@
 value = 'BoolCase \_ -> _ :: _ (_rhs "False") (_rhs "True") True
 main is not found
 ------------ trace
-value :: String
+value :: String
 ------------ tooltips
-testdata/language-features/guard/guard04.lc 1:1-1:6  String
-testdata/language-features/guard/guard04.lc 2:5-2:9  Bool
-testdata/language-features/guard/guard04.lc 2:5-3:24  String
-testdata/language-features/guard/guard04.lc 2:12-2:18  String
-testdata/language-features/guard/guard04.lc 2:12-3:24  Bool -> String
-testdata/language-features/guard/guard04.lc 3:17-3:24  String
+testdata/language-features/guard/guard04.lc 1:1-1:6
+    String
+testdata/language-features/guard/guard04.lc 2:5-2:9
+    Bool
+testdata/language-features/guard/guard04.lc 2:5-3:24
+    String
+testdata/language-features/guard/guard04.lc 2:12-2:18
+    String
+testdata/language-features/guard/guard04.lc 2:12-3:24
+    Bool -> String
+testdata/language-features/guard/guard04.lc 3:17-3:24
+    String
\ No newline at end of file
diff --git a/testdata/language-features/guard/guard05.reject.out b/testdata/language-features/guard/guard05.reject.out
index 23bf1739..fa30af80 100644
--- a/testdata/language-features/guard/guard05.reject.out
+++ b/testdata/language-features/guard/guard05.reject.out
@@ -16,5 +16,7 @@ in testdata/language-features/guard/guard05.reject.lc:1:9:
 value | () = "wrong"
         ^^
 ------------ tooltips
-testdata/language-features/guard/guard05.reject.lc 1:9-1:11  ()
-testdata/language-features/guard/guard05.reject.lc 1:14-1:21  String
+testdata/language-features/guard/guard05.reject.lc 1:9-1:11
+    ()
+testdata/language-features/guard/guard05.reject.lc 1:14-1:21
+    String
\ No newline at end of file
diff --git a/testdata/language-features/guard/guard06.out b/testdata/language-features/guard/guard06.out
index 9e4d40a5..a62258cc 100644
--- a/testdata/language-features/guard/guard06.out
+++ b/testdata/language-features/guard/guard06.out
@@ -2,7 +2,9 @@
 value = _rhs HNil
 main is not found
 ------------ trace
-value :: ()
+value :: ()
 ------------ tooltips
-testdata/language-features/guard/guard06.lc 1:1-1:6  ()
-testdata/language-features/guard/guard06.lc 1:21-1:23  ()
+testdata/language-features/guard/guard06.lc 1:1-1:6
+    ()
+testdata/language-features/guard/guard06.lc 1:21-1:23
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/guard/guard07.out b/testdata/language-features/guard/guard07.out
index 461efa43..f138742f 100644
--- a/testdata/language-features/guard/guard07.out
+++ b/testdata/language-features/guard/guard07.out
@@ -7,13 +7,21 @@ value
     True
 main is not found
 ------------ trace
-value :: String
+value :: String
 ------------ tooltips
-testdata/language-features/guard/guard07.lc 1:1-1:6  String
-testdata/language-features/guard/guard07.lc 1:7-1:11  Bool
-testdata/language-features/guard/guard07.lc 1:7-2:20  String
-testdata/language-features/guard/guard07.lc 1:12-1:18  String
-testdata/language-features/guard/guard07.lc 1:12-2:20  Bool -> String
-testdata/language-features/guard/guard07.lc 2:7-2:12  Bool
-testdata/language-features/guard/guard07.lc 2:7-2:20  String
-testdata/language-features/guard/guard07.lc 2:13-2:20  String
+testdata/language-features/guard/guard07.lc 1:1-1:6
+    String
+testdata/language-features/guard/guard07.lc 1:7-1:11
+    Bool
+testdata/language-features/guard/guard07.lc 1:7-2:20
+    String
+testdata/language-features/guard/guard07.lc 1:12-1:18
+    String
+testdata/language-features/guard/guard07.lc 1:12-2:20
+    Bool -> String
+testdata/language-features/guard/guard07.lc 2:7-2:12
+    Bool
+testdata/language-features/guard/guard07.lc 2:7-2:20
+    String
+testdata/language-features/guard/guard07.lc 2:13-2:20
+    String
\ No newline at end of file
diff --git a/testdata/language-features/guard/guard08.out b/testdata/language-features/guard/guard08.out
index 4f273b1d..c963ddf3 100644
--- a/testdata/language-features/guard/guard08.out
+++ b/testdata/language-features/guard/guard08.out
@@ -7,13 +7,21 @@ value
     True
 main is not found
 ------------ trace
-value :: String
+value :: String
 ------------ tooltips
-testdata/language-features/guard/guard08.lc 1:1-1:6  String
-testdata/language-features/guard/guard08.lc 1:7-1:11  Bool
-testdata/language-features/guard/guard08.lc 1:7-1:32  String
-testdata/language-features/guard/guard08.lc 1:12-1:18  String
-testdata/language-features/guard/guard08.lc 1:12-1:32  Bool -> String
-testdata/language-features/guard/guard08.lc 1:19-1:24  Bool
-testdata/language-features/guard/guard08.lc 1:19-1:32  String
-testdata/language-features/guard/guard08.lc 1:25-1:32  String
+testdata/language-features/guard/guard08.lc 1:1-1:6
+    String
+testdata/language-features/guard/guard08.lc 1:7-1:11
+    Bool
+testdata/language-features/guard/guard08.lc 1:7-1:32
+    String
+testdata/language-features/guard/guard08.lc 1:12-1:18
+    String
+testdata/language-features/guard/guard08.lc 1:12-1:32
+    Bool -> String
+testdata/language-features/guard/guard08.lc 1:19-1:24
+    Bool
+testdata/language-features/guard/guard08.lc 1:19-1:32
+    String
+testdata/language-features/guard/guard08.lc 1:25-1:32
+    String
\ No newline at end of file
diff --git a/testdata/language-features/guard/guard09.out b/testdata/language-features/guard/guard09.out
index f7fe0f27..4519075e 100644
--- a/testdata/language-features/guard/guard09.out
+++ b/testdata/language-features/guard/guard09.out
@@ -7,13 +7,21 @@ value
     True
 main is not found
 ------------ trace
-value :: String
+value :: String
 ------------ tooltips
-testdata/language-features/guard/guard09.lc 1:1-1:6  String
-testdata/language-features/guard/guard09.lc 1:7-1:11  Bool
-testdata/language-features/guard/guard09.lc 1:7-2:16  String
-testdata/language-features/guard/guard09.lc 1:12-1:18  String
-testdata/language-features/guard/guard09.lc 1:12-2:16  Bool -> String
-testdata/language-features/guard/guard09.lc 2:3-2:8  Bool
-testdata/language-features/guard/guard09.lc 2:3-2:16  String
-testdata/language-features/guard/guard09.lc 2:9-2:16  String
+testdata/language-features/guard/guard09.lc 1:1-1:6
+    String
+testdata/language-features/guard/guard09.lc 1:7-1:11
+    Bool
+testdata/language-features/guard/guard09.lc 1:7-2:16
+    String
+testdata/language-features/guard/guard09.lc 1:12-1:18
+    String
+testdata/language-features/guard/guard09.lc 1:12-2:16
+    Bool -> String
+testdata/language-features/guard/guard09.lc 2:3-2:8
+    Bool
+testdata/language-features/guard/guard09.lc 2:3-2:16
+    String
+testdata/language-features/guard/guard09.lc 2:9-2:16
+    String
\ No newline at end of file
diff --git a/testdata/language-features/guard/guard11.out b/testdata/language-features/guard/guard11.out
index ab4e408f..de87d5ea 100644
--- a/testdata/language-features/guard/guard11.out
+++ b/testdata/language-features/guard/guard11.out
@@ -2,11 +2,17 @@
 fun = \(a :: _) -> 'BoolCase \_ -> _ :: _ (_rhs "False") (_rhs "True") a
 main is not found
 ------------ trace
-fun :: Bool -> String
+fun :: Bool -> String
 ------------ tooltips
-testdata/language-features/guard/guard11.lc 1:1-1:4  Bool -> String
-testdata/language-features/guard/guard11.lc 2:5-2:6  _b
-testdata/language-features/guard/guard11.lc 2:5-3:24  String
-testdata/language-features/guard/guard11.lc 2:9-2:15  String
-testdata/language-features/guard/guard11.lc 2:9-3:24  Bool -> String
-testdata/language-features/guard/guard11.lc 3:17-3:24  String
+testdata/language-features/guard/guard11.lc 1:1-1:4
+    Bool -> String
+testdata/language-features/guard/guard11.lc 2:5-2:6
+    _b
+testdata/language-features/guard/guard11.lc 2:5-3:24
+    String
+testdata/language-features/guard/guard11.lc 2:9-2:15
+    String
+testdata/language-features/guard/guard11.lc 2:9-3:24
+    Bool -> String
+testdata/language-features/guard/guard11.lc 3:17-3:24
+    String
\ No newline at end of file
diff --git a/testdata/language-features/guard/guard12.reject.out b/testdata/language-features/guard/guard12.reject.out
index f1f024d7..7ac38fa8 100644
--- a/testdata/language-features/guard/guard12.reject.out
+++ b/testdata/language-features/guard/guard12.reject.out
@@ -16,5 +16,7 @@ in testdata/language-features/guard/guard12.reject.lc:1:13:
 fun x | x = () | otherwise = 'a'
             ^^
 ------------ tooltips
-testdata/language-features/guard/guard12.reject.lc 1:13-1:15  ()
-testdata/language-features/guard/guard12.reject.lc 1:30-1:33  Char
+testdata/language-features/guard/guard12.reject.lc 1:13-1:15
+    ()
+testdata/language-features/guard/guard12.reject.lc 1:30-1:33
+    Char
\ No newline at end of file
diff --git a/testdata/language-features/guard/guard13.out b/testdata/language-features/guard/guard13.out
index a39476bd..47d31f9a 100644
--- a/testdata/language-features/guard/guard13.out
+++ b/testdata/language-features/guard/guard13.out
@@ -2,11 +2,17 @@
 fun = \(a :: _) -> 'BoolCase \_ -> _ :: _ (_rhs HNil) (_rhs HNil) a
 main is not found
 ------------ trace
-fun :: Bool -> ()
+fun :: Bool -> ()
 ------------ tooltips
-testdata/language-features/guard/guard13.lc 1:1-1:4  Bool -> ()
-testdata/language-features/guard/guard13.lc 1:7-1:8  _b
-testdata/language-features/guard/guard13.lc 1:7-1:24  ()
-testdata/language-features/guard/guard13.lc 1:9-1:11  ()
-testdata/language-features/guard/guard13.lc 1:9-1:24  Bool -> ()
-testdata/language-features/guard/guard13.lc 1:22-1:24  ()
+testdata/language-features/guard/guard13.lc 1:1-1:4
+    Bool -> ()
+testdata/language-features/guard/guard13.lc 1:7-1:8
+    _b
+testdata/language-features/guard/guard13.lc 1:7-1:24
+    ()
+testdata/language-features/guard/guard13.lc 1:9-1:11
+    ()
+testdata/language-features/guard/guard13.lc 1:9-1:24
+    Bool -> ()
+testdata/language-features/guard/guard13.lc 1:22-1:24
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/guard/guard14.out b/testdata/language-features/guard/guard14.out
index 67a9c499..901fe596 100644
--- a/testdata/language-features/guard/guard14.out
+++ b/testdata/language-features/guard/guard14.out
@@ -2,12 +2,19 @@
 value = _rhs \(a := 'BoolCase \_ -> _ :: _ (_rhs HNil) (_rhs HNil) True) -> HNil
 main is not found
 ------------ trace
-value :: ()
+value :: ()
 ------------ tooltips
-testdata/language-features/guard/guard14.lc 1:1-1:6  ()
-testdata/language-features/guard/guard14.lc 1:17-1:21  Bool
-testdata/language-features/guard/guard14.lc 1:17-2:31  ()
-testdata/language-features/guard/guard14.lc 1:24-1:26  ()
-testdata/language-features/guard/guard14.lc 1:24-2:31  Bool -> ()
-testdata/language-features/guard/guard14.lc 2:29-2:31  ()
-testdata/language-features/guard/guard14.lc 3:12-3:14  ()
+testdata/language-features/guard/guard14.lc 1:1-1:6
+    ()
+testdata/language-features/guard/guard14.lc 1:17-1:21
+    Bool
+testdata/language-features/guard/guard14.lc 1:17-2:31
+    ()
+testdata/language-features/guard/guard14.lc 1:24-1:26
+    ()
+testdata/language-features/guard/guard14.lc 1:24-2:31
+    Bool -> ()
+testdata/language-features/guard/guard14.lc 2:29-2:31
+    ()
+testdata/language-features/guard/guard14.lc 3:12-3:14
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/guard/guard15.out b/testdata/language-features/guard/guard15.out
index 4293221c..5938370b 100644
--- a/testdata/language-features/guard/guard15.out
+++ b/testdata/language-features/guard/guard15.out
@@ -2,12 +2,19 @@
 value = _rhs \(a := 'BoolCase \_ -> _ :: _ (_rhs HNil) (_rhs HNil) True) -> HNil
 main is not found
 ------------ trace
-value :: ()
+value :: ()
 ------------ tooltips
-testdata/language-features/guard/guard15.lc 1:1-1:6  ()
-testdata/language-features/guard/guard15.lc 1:9-1:11  ()
-testdata/language-features/guard/guard15.lc 2:13-2:17  Bool
-testdata/language-features/guard/guard15.lc 2:13-3:27  ()
-testdata/language-features/guard/guard15.lc 2:20-2:22  ()
-testdata/language-features/guard/guard15.lc 2:20-3:27  Bool -> ()
-testdata/language-features/guard/guard15.lc 3:25-3:27  ()
+testdata/language-features/guard/guard15.lc 1:1-1:6
+    ()
+testdata/language-features/guard/guard15.lc 1:9-1:11
+    ()
+testdata/language-features/guard/guard15.lc 2:13-2:17
+    Bool
+testdata/language-features/guard/guard15.lc 2:13-3:27
+    ()
+testdata/language-features/guard/guard15.lc 2:20-2:22
+    ()
+testdata/language-features/guard/guard15.lc 2:20-3:27
+    Bool -> ()
+testdata/language-features/guard/guard15.lc 3:25-3:27
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/guard/guard16.out b/testdata/language-features/guard/guard16.out
index 9886821b..f90d684f 100644
--- a/testdata/language-features/guard/guard16.out
+++ b/testdata/language-features/guard/guard16.out
@@ -9,13 +9,21 @@ value
       (fromInt 1))
 main is not found
 ------------ trace
-value :: forall a . (Eq a, Num a) => ()
+value :: forall a . (Eq a, Num a) => ()
 ------------ tooltips
-testdata/language-features/guard/guard16.lc 1:1-1:6  forall a . (Eq a, Num a) => ()
-testdata/language-features/guard/guard16.lc 1:9-3:10  ()
-testdata/language-features/guard/guard16.lc 1:14-1:15  _b
-testdata/language-features/guard/guard16.lc 2:7-2:11  Bool
-testdata/language-features/guard/guard16.lc 2:7-3:10  ()
-testdata/language-features/guard/guard16.lc 2:15-2:17  ()
-testdata/language-features/guard/guard16.lc 2:15-3:10  Bool -> ()
-testdata/language-features/guard/guard16.lc 3:8-3:10  ()
+testdata/language-features/guard/guard16.lc 1:1-1:6
+    forall a . (Eq a, Num a) => ()
+testdata/language-features/guard/guard16.lc 1:9-3:10
+    ()
+testdata/language-features/guard/guard16.lc 1:14-1:15
+    _b
+testdata/language-features/guard/guard16.lc 2:7-2:11
+    Bool
+testdata/language-features/guard/guard16.lc 2:7-3:10
+    ()
+testdata/language-features/guard/guard16.lc 2:15-2:17
+    ()
+testdata/language-features/guard/guard16.lc 2:15-3:10
+    Bool -> ()
+testdata/language-features/guard/guard16.lc 3:8-3:10
+    () | ()
\ No newline at end of file
diff --git a/testdata/language-features/module/Hello01.out b/testdata/language-features/module/Hello01.out
index d7ab37a3..aee194f1 100644
--- a/testdata/language-features/module/Hello01.out
+++ b/testdata/language-features/module/Hello01.out
@@ -3,10 +3,14 @@ hello = _rhs "hello"
 world = _rhs "world"
 main is not found
 ------------ trace
-hello :: String
-world :: String
+hello :: String
+world :: String
 ------------ tooltips
-testdata/language-features/module/Hello01.lc 3:1-3:6  String
-testdata/language-features/module/Hello01.lc 3:9-3:16  String
-testdata/language-features/module/Hello01.lc 4:1-4:6  String
-testdata/language-features/module/Hello01.lc 4:9-4:16  String
+testdata/language-features/module/Hello01.lc 3:1-3:6
+    String
+testdata/language-features/module/Hello01.lc 3:9-3:16
+    String
+testdata/language-features/module/Hello01.lc 4:1-4:6
+    String
+testdata/language-features/module/Hello01.lc 4:9-4:16
+    String
\ No newline at end of file
diff --git a/testdata/language-features/module/Hello02.out b/testdata/language-features/module/Hello02.out
index 40a09950..9d582484 100644
--- a/testdata/language-features/module/Hello02.out
+++ b/testdata/language-features/module/Hello02.out
@@ -3,10 +3,14 @@ hello = _rhs "hello"
 world = _rhs "world"
 main is not found
 ------------ trace
-hello :: String
-world :: String
+hello :: String
+world :: String
 ------------ tooltips
-testdata/language-features/module/Hello02.lc 3:1-3:6  String
-testdata/language-features/module/Hello02.lc 3:9-3:16  String
-testdata/language-features/module/Hello02.lc 4:1-4:6  String
-testdata/language-features/module/Hello02.lc 4:9-4:16  String
+testdata/language-features/module/Hello02.lc 3:1-3:6
+    String
+testdata/language-features/module/Hello02.lc 3:9-3:16
+    String
+testdata/language-features/module/Hello02.lc 4:1-4:6
+    String
+testdata/language-features/module/Hello02.lc 4:9-4:16
+    String
\ No newline at end of file
diff --git a/testdata/language-features/module/Hello03.out b/testdata/language-features/module/Hello03.out
index f926b872..98956c8a 100644
--- a/testdata/language-features/module/Hello03.out
+++ b/testdata/language-features/module/Hello03.out
@@ -3,10 +3,14 @@ greeting = _rhs 'G'
 value = _rhs 12.2
 main is not found
 ------------ trace
-greeting :: Char
-value :: Float
+greeting :: Char
+value :: Float
 ------------ tooltips
-testdata/language-features/module/Hello03.lc 7:1-7:9  Char
-testdata/language-features/module/Hello03.lc 7:12-7:15  Char
-testdata/language-features/module/Hello03.lc 9:1-9:6  Float
-testdata/language-features/module/Hello03.lc 9:9-9:13  Float
+testdata/language-features/module/Hello03.lc 7:1-7:9
+    Char
+testdata/language-features/module/Hello03.lc 7:12-7:15
+    Char
+testdata/language-features/module/Hello03.lc 9:1-9:6
+    Float
+testdata/language-features/module/Hello03.lc 9:9-9:13
+    Float
\ No newline at end of file
diff --git a/testdata/language-features/module/ModulePackage/SubModule01.out b/testdata/language-features/module/ModulePackage/SubModule01.out
index 88780f22..44457c17 100644
--- a/testdata/language-features/module/ModulePackage/SubModule01.out
+++ b/testdata/language-features/module/ModulePackage/SubModule01.out
@@ -2,7 +2,9 @@
 hello = _rhs "Hello"
 main is not found
 ------------ trace
-hello :: String
+hello :: String
 ------------ tooltips
-testdata/language-features/module/ModulePackage/SubModule01.lc 3:1-3:6  String
-testdata/language-features/module/ModulePackage/SubModule01.lc 3:9-3:16  String
+testdata/language-features/module/ModulePackage/SubModule01.lc 3:1-3:6
+    String
+testdata/language-features/module/ModulePackage/SubModule01.lc 3:9-3:16
+    String
\ No newline at end of file
diff --git a/testdata/language-features/module/Moduledef06.out b/testdata/language-features/module/Moduledef06.out
index 72cb3a01..95f989ee 100644
--- a/testdata/language-features/module/Moduledef06.out
+++ b/testdata/language-features/module/Moduledef06.out
@@ -2,7 +2,9 @@
 hello = _rhs "hello"
 main is not found
 ------------ trace
-hello :: String
+hello :: String
 ------------ tooltips
-testdata/language-features/module/Moduledef06.lc 3:1-3:6  String
-testdata/language-features/module/Moduledef06.lc 3:9-3:16  String
+testdata/language-features/module/Moduledef06.lc 3:1-3:6
+    String
+testdata/language-features/module/Moduledef06.lc 3:9-3:16
+    String
\ No newline at end of file
diff --git a/testdata/language-features/module/Moduledef07.out b/testdata/language-features/module/Moduledef07.out
index ddd44c2e..0dafaaa8 100644
--- a/testdata/language-features/module/Moduledef07.out
+++ b/testdata/language-features/module/Moduledef07.out
@@ -2,7 +2,9 @@
 hello = _rhs "hello"
 main is not found
 ------------ trace
-hello :: String
+hello :: String
 ------------ tooltips
-testdata/language-features/module/Moduledef07.lc 5:1-5:6  String
-testdata/language-features/module/Moduledef07.lc 5:9-5:16  String
+testdata/language-features/module/Moduledef07.lc 5:1-5:6
+    String
+testdata/language-features/module/Moduledef07.lc 5:9-5:16
+    String
\ No newline at end of file
diff --git a/testdata/language-features/module/Moduledef08.out b/testdata/language-features/module/Moduledef08.out
index 8c446393..d7add14b 100644
--- a/testdata/language-features/module/Moduledef08.out
+++ b/testdata/language-features/module/Moduledef08.out
@@ -2,7 +2,9 @@
 hello = _rhs "hello"
 main is not found
 ------------ trace
-hello :: String
+hello :: String
 ------------ tooltips
-testdata/language-features/module/Moduledef08.lc 5:1-5:6  String
-testdata/language-features/module/Moduledef08.lc 5:9-5:16  String
+testdata/language-features/module/Moduledef08.lc 5:1-5:6
+    String
+testdata/language-features/module/Moduledef08.lc 5:9-5:16
+    String
\ No newline at end of file
diff --git a/testdata/language-features/module/Moduledef09.out b/testdata/language-features/module/Moduledef09.out
index 6a8ec166..f90be0b2 100644
--- a/testdata/language-features/module/Moduledef09.out
+++ b/testdata/language-features/module/Moduledef09.out
@@ -3,10 +3,14 @@ hello = _rhs "hello"
 world = _rhs "world"
 main is not found
 ------------ trace
-hello :: String
-world :: String
+hello :: String
+world :: String
 ------------ tooltips
-testdata/language-features/module/Moduledef09.lc 5:1-5:6  String
-testdata/language-features/module/Moduledef09.lc 5:9-5:16  String
-testdata/language-features/module/Moduledef09.lc 6:1-6:6  String
-testdata/language-features/module/Moduledef09.lc 6:9-6:16  String
+testdata/language-features/module/Moduledef09.lc 5:1-5:6
+    String
+testdata/language-features/module/Moduledef09.lc 5:9-5:16
+    String
+testdata/language-features/module/Moduledef09.lc 6:1-6:6
+    String
+testdata/language-features/module/Moduledef09.lc 6:9-6:16
+    String
\ No newline at end of file
diff --git a/testdata/language-features/module/Moduledef10.out b/testdata/language-features/module/Moduledef10.out
index 2cec647d..2928a534 100644
--- a/testdata/language-features/module/Moduledef10.out
+++ b/testdata/language-features/module/Moduledef10.out
@@ -4,13 +4,19 @@ world = _rhs "world"
 value = _rhs HNil
 main is not found
 ------------ trace
-hello :: String
-world :: String
-value :: ()
+hello :: String
+world :: String
+value :: ()
 ------------ tooltips
-testdata/language-features/module/Moduledef10.lc 6:1-6:6  String
-testdata/language-features/module/Moduledef10.lc 6:9-6:16  String
-testdata/language-features/module/Moduledef10.lc 7:1-7:6  String
-testdata/language-features/module/Moduledef10.lc 7:9-7:16  String
-testdata/language-features/module/Moduledef10.lc 9:1-9:6  ()
-testdata/language-features/module/Moduledef10.lc 9:9-9:11  ()
+testdata/language-features/module/Moduledef10.lc 6:1-6:6
+    String
+testdata/language-features/module/Moduledef10.lc 6:9-6:16
+    String
+testdata/language-features/module/Moduledef10.lc 7:1-7:6
+    String
+testdata/language-features/module/Moduledef10.lc 7:9-7:16
+    String
+testdata/language-features/module/Moduledef10.lc 9:1-9:6
+    ()
+testdata/language-features/module/Moduledef10.lc 9:9-9:11
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/module/Moduledef13.out b/testdata/language-features/module/Moduledef13.out
index 08922d6a..7b6fb91d 100644
--- a/testdata/language-features/module/Moduledef13.out
+++ b/testdata/language-features/module/Moduledef13.out
@@ -2,7 +2,9 @@
 hello = _rhs "hello"
 main is not found
 ------------ trace
-hello :: String
+hello :: String
 ------------ tooltips
-testdata/language-features/module/Moduledef13.lc 3:1-3:6  String
-testdata/language-features/module/Moduledef13.lc 3:9-3:16  String
+testdata/language-features/module/Moduledef13.lc 3:1-3:6
+    String
+testdata/language-features/module/Moduledef13.lc 3:9-3:16
+    String
\ No newline at end of file
diff --git a/testdata/language-features/module/TypeSyn01Mod.out b/testdata/language-features/module/TypeSyn01Mod.out
index 61a3438b..0c1a7083 100644
--- a/testdata/language-features/module/TypeSyn01Mod.out
+++ b/testdata/language-features/module/TypeSyn01Mod.out
@@ -2,7 +2,9 @@
 'MyUnit = _rhs ('HList Nil)
 main is not found
 ------------ trace
-'MyUnit :: Type
+'MyUnit :: Type
 ------------ tooltips
-testdata/language-features/module/TypeSyn01Mod.lc 2:6-2:12  Type
-testdata/language-features/module/TypeSyn01Mod.lc 2:15-2:17  Type
+testdata/language-features/module/TypeSyn01Mod.lc 2:6-2:12
+    Type
+testdata/language-features/module/TypeSyn01Mod.lc 2:15-2:17
+    Type
\ No newline at end of file
diff --git a/testdata/language-features/module/import01.out b/testdata/language-features/module/import01.out
index 92e24184..0c9e505e 100644
--- a/testdata/language-features/module/import01.out
+++ b/testdata/language-features/module/import01.out
@@ -2,7 +2,9 @@
 x = _rhs hello
 main is not found
 ------------ trace
-x :: String
+x :: String
 ------------ tooltips
-testdata/language-features/module/import01.lc 3:1-3:2  String
-testdata/language-features/module/import01.lc 3:5-3:10  String
+testdata/language-features/module/import01.lc 3:1-3:2
+    String
+testdata/language-features/module/import01.lc 3:5-3:10
+    String
\ No newline at end of file
diff --git a/testdata/language-features/module/import04.reject.out b/testdata/language-features/module/import04.reject.out
index da33fb8b..a04a3790 100644
--- a/testdata/language-features/module/import04.reject.out
+++ b/testdata/language-features/module/import04.reject.out
@@ -5,7 +5,7 @@ and at testdata/language-features/module/Hello01.lc:3:1:
 hello = "hello"
 ^^^^^
 ------------ trace
-hello :: String
+hello :: String
 !already defined hello at testdata/language-features/module/import04.reject.lc:4:1:
 hello = "hello"
 ^^^^^
@@ -13,5 +13,7 @@ and at testdata/language-features/module/Hello01.lc:3:1:
 hello = "hello"
 ^^^^^
 ------------ tooltips
-testdata/language-features/module/import04.reject.lc 4:1-4:6  String
-testdata/language-features/module/import04.reject.lc 4:9-4:16  String
+testdata/language-features/module/import04.reject.lc 4:1-4:6
+    String
+testdata/language-features/module/import04.reject.lc 4:9-4:16
+    String
\ No newline at end of file
diff --git a/testdata/language-features/module/import05.out b/testdata/language-features/module/import05.out
index 1074387f..96f021c2 100644
--- a/testdata/language-features/module/import05.out
+++ b/testdata/language-features/module/import05.out
@@ -2,8 +2,11 @@
 x = _rhs hello :: String
 main is not found
 ------------ trace
-x :: String
+x :: String
 ------------ tooltips
-testdata/language-features/module/import05.lc 3:6-3:12  Type
-testdata/language-features/module/import05.lc 4:1-4:2  String
-testdata/language-features/module/import05.lc 4:5-4:10  String
+testdata/language-features/module/import05.lc 3:6-3:12
+    Type
+testdata/language-features/module/import05.lc 4:1-4:2
+    String
+testdata/language-features/module/import05.lc 4:5-4:10
+    String
\ No newline at end of file
diff --git a/testdata/language-features/module/import06.out b/testdata/language-features/module/import06.out
index 7709e076..a8852987 100644
--- a/testdata/language-features/module/import06.out
+++ b/testdata/language-features/module/import06.out
@@ -3,10 +3,14 @@ hello = _rhs HNil
 x = _rhs world
 main is not found
 ------------ trace
-hello :: ()
-x :: String
+hello :: ()
+x :: String
 ------------ tooltips
-testdata/language-features/module/import06.lc 3:1-3:6  ()
-testdata/language-features/module/import06.lc 3:9-3:11  ()
-testdata/language-features/module/import06.lc 4:1-4:2  String
-testdata/language-features/module/import06.lc 4:5-4:10  String
+testdata/language-features/module/import06.lc 3:1-3:6
+    ()
+testdata/language-features/module/import06.lc 3:9-3:11
+    ()
+testdata/language-features/module/import06.lc 4:1-4:2
+    String
+testdata/language-features/module/import06.lc 4:5-4:10
+    String
\ No newline at end of file
diff --git a/testdata/language-features/module/import07.out b/testdata/language-features/module/import07.out
index d4246086..c9285662 100644
--- a/testdata/language-features/module/import07.out
+++ b/testdata/language-features/module/import07.out
@@ -3,10 +3,14 @@ hello = _rhs HNil
 x = _rhs world
 main is not found
 ------------ trace
-hello :: ()
-x :: String
+hello :: ()
+x :: String
 ------------ tooltips
-testdata/language-features/module/import07.lc 3:1-3:6  ()
-testdata/language-features/module/import07.lc 3:9-3:11  ()
-testdata/language-features/module/import07.lc 4:1-4:2  String
-testdata/language-features/module/import07.lc 4:5-4:10  String
+testdata/language-features/module/import07.lc 3:1-3:6
+    ()
+testdata/language-features/module/import07.lc 3:9-3:11
+    ()
+testdata/language-features/module/import07.lc 4:1-4:2
+    String
+testdata/language-features/module/import07.lc 4:5-4:10
+    String
\ No newline at end of file
diff --git a/testdata/language-features/module/import08.out b/testdata/language-features/module/import08.out
index 75c34115..24006b18 100644
--- a/testdata/language-features/module/import08.out
+++ b/testdata/language-features/module/import08.out
@@ -5,19 +5,30 @@ h = _rhs hello :: String
 w = _rhs world :: String
 main is not found
 ------------ trace
-value :: ()
-g :: Char
-h :: String
-w :: String
+value :: ()
+g :: Char
+h :: String
+w :: String
 ------------ tooltips
-testdata/language-features/module/import08.lc 3:1-3:6  ()
-testdata/language-features/module/import08.lc 3:9-3:11  ()
-testdata/language-features/module/import08.lc 5:6-5:10  Type
-testdata/language-features/module/import08.lc 6:1-6:2  Char
-testdata/language-features/module/import08.lc 6:5-6:13  Char
-testdata/language-features/module/import08.lc 8:6-8:12  Type
-testdata/language-features/module/import08.lc 9:1-9:2  String
-testdata/language-features/module/import08.lc 9:5-9:10  String
-testdata/language-features/module/import08.lc 11:6-11:12  Type
-testdata/language-features/module/import08.lc 12:1-12:2  String
-testdata/language-features/module/import08.lc 12:5-12:10  String
+testdata/language-features/module/import08.lc 3:1-3:6
+    ()
+testdata/language-features/module/import08.lc 3:9-3:11
+    ()
+testdata/language-features/module/import08.lc 5:6-5:10
+    Type
+testdata/language-features/module/import08.lc 6:1-6:2
+    Char
+testdata/language-features/module/import08.lc 6:5-6:13
+    Char
+testdata/language-features/module/import08.lc 8:6-8:12
+    Type
+testdata/language-features/module/import08.lc 9:1-9:2
+    String
+testdata/language-features/module/import08.lc 9:5-9:10
+    String
+testdata/language-features/module/import08.lc 11:6-11:12
+    Type
+testdata/language-features/module/import08.lc 12:1-12:2
+    String
+testdata/language-features/module/import08.lc 12:5-12:10
+    String
\ No newline at end of file
diff --git a/testdata/language-features/module/import09.out b/testdata/language-features/module/import09.out
index c8edeca8..790fbf72 100644
--- a/testdata/language-features/module/import09.out
+++ b/testdata/language-features/module/import09.out
@@ -4,12 +4,19 @@ fun
     :: forall (b :: _) . b -> MyUnit -> MyUnit
 main is not found
 ------------ trace
-fun :: forall a . a -> () -> ()
+fun :: forall a . a -> () -> ()
 ------------ tooltips
-testdata/language-features/module/import09.lc 3:8-3:9  _b
-testdata/language-features/module/import09.lc 3:8-3:29  Type
-testdata/language-features/module/import09.lc 3:13-3:19  Type
-testdata/language-features/module/import09.lc 3:13-3:29  Type
-testdata/language-features/module/import09.lc 3:23-3:29  Type
-testdata/language-features/module/import09.lc 4:1-4:4  forall a . a -> () -> ()
-testdata/language-features/module/import09.lc 4:12-4:14  () | () -> () | _a -> () -> ()
+testdata/language-features/module/import09.lc 3:8-3:9
+    _b
+testdata/language-features/module/import09.lc 3:8-3:29
+    Type
+testdata/language-features/module/import09.lc 3:13-3:19
+    Type
+testdata/language-features/module/import09.lc 3:13-3:29
+    Type
+testdata/language-features/module/import09.lc 3:23-3:29
+    Type | Type
+testdata/language-features/module/import09.lc 4:1-4:4
+    forall a . a -> () -> ()
+testdata/language-features/module/import09.lc 4:12-4:14
+    () | ()
\ No newline at end of file
diff --git a/testdata/language-features/module/import10.reject.out b/testdata/language-features/module/import10.reject.out
index 5a61239c..32e5619b 100644
--- a/testdata/language-features/module/import10.reject.out
+++ b/testdata/language-features/module/import10.reject.out
@@ -5,7 +5,7 @@ and at testdata/language-features/module/TypeSyn01Mod.lc:2:6:
 type MyUnit = ()
      ^^^^^^
 ------------ trace
-'MyUnit :: Type
+'MyUnit :: Type
 !already defined 'MyUnit at testdata/language-features/module/import10.reject.lc:3:6:
 type MyUnit = ()
      ^^^^^^
@@ -13,5 +13,7 @@ and at testdata/language-features/module/TypeSyn01Mod.lc:2:6:
 type MyUnit = ()
      ^^^^^^
 ------------ tooltips
-testdata/language-features/module/import10.reject.lc 3:6-3:12  Type
-testdata/language-features/module/import10.reject.lc 3:15-3:17  Type
+testdata/language-features/module/import10.reject.lc 3:6-3:12
+    Type
+testdata/language-features/module/import10.reject.lc 3:15-3:17
+    Type
\ No newline at end of file
diff --git a/testdata/language-features/module/import11.reject.out b/testdata/language-features/module/import11.reject.out
index f686f7e8..93bcee00 100644
--- a/testdata/language-features/module/import11.reject.out
+++ b/testdata/language-features/module/import11.reject.out
@@ -5,7 +5,7 @@ and at testdata/language-features/module/TypeSyn01Mod.lc:2:6:
 type MyUnit = ()
      ^^^^^^
 ------------ trace
-'MyUnit :: Type
+'MyUnit :: Type
 !already defined 'MyUnit at testdata/language-features/module/import11.reject.lc:3:6:
 type MyUnit = ()
      ^^^^^^
@@ -13,5 +13,7 @@ and at testdata/language-features/module/TypeSyn01Mod.lc:2:6:
 type MyUnit = ()
      ^^^^^^
 ------------ tooltips
-testdata/language-features/module/import11.reject.lc 3:6-3:12  Type
-testdata/language-features/module/import11.reject.lc 3:15-3:17  Type
+testdata/language-features/module/import11.reject.lc 3:6-3:12
+    Type
+testdata/language-features/module/import11.reject.lc 3:15-3:17
+    Type
\ No newline at end of file
diff --git a/testdata/language-features/module/import12.out b/testdata/language-features/module/import12.out
index da5cbbc0..32b7bdd8 100644
--- a/testdata/language-features/module/import12.out
+++ b/testdata/language-features/module/import12.out
@@ -2,7 +2,9 @@
 fun = _rhs hello
 main is not found
 ------------ trace
-fun :: String
+fun :: String
 ------------ tooltips
-testdata/language-features/module/import12.lc 4:1-4:4  String
-testdata/language-features/module/import12.lc 4:7-4:12  String
+testdata/language-features/module/import12.lc 4:1-4:4
+    String
+testdata/language-features/module/import12.lc 4:7-4:12
+    String
\ No newline at end of file
diff --git a/testdata/language-features/module/import13.out b/testdata/language-features/module/import13.out
index 509460bf..7167ad27 100644
--- a/testdata/language-features/module/import13.out
+++ b/testdata/language-features/module/import13.out
@@ -2,7 +2,9 @@
 fun = _rhs hello
 main is not found
 ------------ trace
-fun :: String
+fun :: String
 ------------ tooltips
-testdata/language-features/module/import13.lc 4:1-4:4  String
-testdata/language-features/module/import13.lc 4:7-4:12  String
+testdata/language-features/module/import13.lc 4:1-4:4
+    String
+testdata/language-features/module/import13.lc 4:7-4:12
+    String
\ No newline at end of file
diff --git a/testdata/language-features/module/import14.out b/testdata/language-features/module/import14.out
index 73df8f0a..19d18b88 100644
--- a/testdata/language-features/module/import14.out
+++ b/testdata/language-features/module/import14.out
@@ -2,7 +2,9 @@
 fun = _rhs hello
 main is not found
 ------------ trace
-fun :: String
+fun :: String
 ------------ tooltips
-testdata/language-features/module/import14.lc 4:1-4:4  String
-testdata/language-features/module/import14.lc 4:7-4:12  String
+testdata/language-features/module/import14.lc 4:1-4:4
+    String
+testdata/language-features/module/import14.lc 4:7-4:12
+    String
\ No newline at end of file
diff --git a/testdata/language-features/module/import15.out b/testdata/language-features/module/import15.out
index 92df1171..bb60b565 100644
--- a/testdata/language-features/module/import15.out
+++ b/testdata/language-features/module/import15.out
@@ -2,7 +2,9 @@
 fun = _rhs hello
 main is not found
 ------------ trace
-fun :: String
+fun :: String
 ------------ tooltips
-testdata/language-features/module/import15.lc 3:1-3:4  String
-testdata/language-features/module/import15.lc 3:7-3:12  String
+testdata/language-features/module/import15.lc 3:1-3:4
+    String
+testdata/language-features/module/import15.lc 3:7-3:12
+    String
\ No newline at end of file
diff --git a/testdata/language-features/pattern/pattern01.out b/testdata/language-features/pattern/pattern01.out
index f5b7944c..82bc15bb 100644
--- a/testdata/language-features/pattern/pattern01.out
+++ b/testdata/language-features/pattern/pattern01.out
@@ -6,26 +6,40 @@ fun3 = \(a :: _) -> 'BoolCase \_ -> _ :: _ (_rhs '_') (_rhs '0') ('0' == a)
 fun4 = \(a :: _) -> hlistNilCase (_ :: _) (_rhs '0') a
 main is not found
 ------------ trace
-fun1 :: forall a . (Eq a, Num a) => a -> Char
-fun2 :: String -> Char
-fun3 :: Char -> Char
-fun4 :: () -> Char
+fun1 :: forall a . (Eq a, Num a) => a -> Char
+fun2 :: String -> Char
+fun3 :: Char -> Char
+fun4 :: () -> Char
 ------------ tooltips
-testdata/language-features/pattern/pattern01.lc 1:1-1:5  forall a . (Eq a, Num a) => a -> Char
-testdata/language-features/pattern/pattern01.lc 1:10-1:13  Char
-testdata/language-features/pattern/pattern01.lc 1:10-2:13  Bool -> Char
-testdata/language-features/pattern/pattern01.lc 2:10-2:13  Char
-testdata/language-features/pattern/pattern01.lc 4:1-4:5  String -> Char
-testdata/language-features/pattern/pattern01.lc 4:12-4:15  Char
-testdata/language-features/pattern/pattern01.lc 4:12-5:13  Bool -> Char
-testdata/language-features/pattern/pattern01.lc 5:10-5:13  Char
-testdata/language-features/pattern/pattern01.lc 7:1-7:5  Char -> Char
-testdata/language-features/pattern/pattern01.lc 7:12-7:15  Char
-testdata/language-features/pattern/pattern01.lc 7:12-8:13  Bool -> Char
-testdata/language-features/pattern/pattern01.lc 8:10-8:13  Char
-testdata/language-features/pattern/pattern01.lc 10:1-10:5  () -> Char
-testdata/language-features/pattern/pattern01.lc 10:11-10:14  Char
+testdata/language-features/pattern/pattern01.lc 1:1-1:5
+    forall a . (Eq a, Num a) => a -> Char
+testdata/language-features/pattern/pattern01.lc 1:10-1:13
+    Char
+testdata/language-features/pattern/pattern01.lc 1:10-2:13
+    Bool -> Char
+testdata/language-features/pattern/pattern01.lc 2:10-2:13
+    Char
+testdata/language-features/pattern/pattern01.lc 4:1-4:5
+    String -> Char
+testdata/language-features/pattern/pattern01.lc 4:12-4:15
+    Char
+testdata/language-features/pattern/pattern01.lc 4:12-5:13
+    Bool -> Char
+testdata/language-features/pattern/pattern01.lc 5:10-5:13
+    Char
+testdata/language-features/pattern/pattern01.lc 7:1-7:5
+    Char -> Char
+testdata/language-features/pattern/pattern01.lc 7:12-7:15
+    Char
+testdata/language-features/pattern/pattern01.lc 7:12-8:13
+    Bool -> Char
+testdata/language-features/pattern/pattern01.lc 8:10-8:13
+    Char
+testdata/language-features/pattern/pattern01.lc 10:1-10:5
+    () -> Char
+testdata/language-features/pattern/pattern01.lc 10:11-10:14
+    Char
 ------------ warnings
 Source code is not reachable: testdata/language-features/pattern/pattern01.lc:11:10:
 fun4 _ = '_'
-         ^^^
+         ^^^
\ No newline at end of file
diff --git a/testdata/language-features/pattern/uncovered.out b/testdata/language-features/pattern/uncovered.out
index 79e060a1..eba2edde 100644
--- a/testdata/language-features/pattern/uncovered.out
+++ b/testdata/language-features/pattern/uncovered.out
@@ -15,15 +15,22 @@ f
     b
 main is not found
 ------------ trace
-f :: forall a . Num a => Bool -> Bool -> Bool -> a
+f :: forall a . Num a => Bool -> Bool -> Bool -> a
 ------------ tooltips
-testdata/language-features/pattern/uncovered.lc 4:1-4:2  forall a . Num a => Bool -> Bool -> Bool -> a
-testdata/language-features/pattern/uncovered.lc 4:18-4:19  _b
-testdata/language-features/pattern/uncovered.lc 4:18-5:19  Bool -> _c | _c
-testdata/language-features/pattern/uncovered.lc 4:18-6:19  Bool -> _c
-testdata/language-features/pattern/uncovered.lc 5:18-5:19  _b | _c
-testdata/language-features/pattern/uncovered.lc 5:18-6:19  Bool -> _c | _b
-testdata/language-features/pattern/uncovered.lc 6:18-6:19  _b
+testdata/language-features/pattern/uncovered.lc 4:1-4:2
+    forall a . Num a => Bool -> Bool -> Bool -> a
+testdata/language-features/pattern/uncovered.lc 4:18-4:19
+    _b
+testdata/language-features/pattern/uncovered.lc 4:18-5:19
+    Bool -> _c | _c
+testdata/language-features/pattern/uncovered.lc 4:18-6:19
+    Bool -> _c
+testdata/language-features/pattern/uncovered.lc 5:18-5:19
+    _b | _b | _b | _c
+testdata/language-features/pattern/uncovered.lc 5:18-6:19
+    Bool -> _c | _b
+testdata/language-features/pattern/uncovered.lc 6:18-6:19
+    _b
 ------------ warnings
 Uncovered pattern(s) at testdata/language-features/pattern/uncovered.lc:4:1:
 f _ True False = 0
@@ -31,4 +38,4 @@ f False _ True = 1
 f True False _ = 2
 Missing case(s):
   False False False 
-  True True True 
+  True True True 
\ No newline at end of file
diff --git a/testdata/language-features/pattern/unreachable.out b/testdata/language-features/pattern/unreachable.out
index f9e362fc..06c9ca43 100644
--- a/testdata/language-features/pattern/unreachable.out
+++ b/testdata/language-features/pattern/unreachable.out
@@ -2,11 +2,13 @@
 f = \_ -> _rhs "hello"
 main is not found
 ------------ trace
-f :: forall a . a -> String
+f :: forall a . a -> String
 ------------ tooltips
-testdata/language-features/pattern/unreachable.lc 4:1-4:2  forall a . a -> String
-testdata/language-features/pattern/unreachable.lc 4:7-4:14  String
+testdata/language-features/pattern/unreachable.lc 4:1-4:2
+    forall a . a -> String
+testdata/language-features/pattern/unreachable.lc 4:7-4:14
+    String
 ------------ warnings
 Source code is not reachable: testdata/language-features/pattern/unreachable.lc:5:7:
 f _ = "world"
-      ^^^^^^^
+      ^^^^^^^
\ No newline at end of file
diff --git a/testdata/language-features/recursion/simplerec01.out b/testdata/language-features/recursion/simplerec01.out
index b6bde121..f46727b7 100644
--- a/testdata/language-features/recursion/simplerec01.out
+++ b/testdata/language-features/recursion/simplerec01.out
@@ -7,10 +7,15 @@ fun
     (fromInt 0 == a)
 main is not found
 ------------ trace
-fun :: forall a . (Num a, Eq a, Num a) => a -> Char
+fun :: forall a . (Num a, Eq a, Num a) => a -> Char
 ------------ tooltips
-testdata/language-features/recursion/simplerec01.lc 1:1-1:4  forall a . (Num a, Eq a, Num a) => a -> Char
-testdata/language-features/recursion/simplerec01.lc 1:9-1:12  Char
-testdata/language-features/recursion/simplerec01.lc 1:9-2:14  Bool -> Char | _a -> _a
-testdata/language-features/recursion/simplerec01.lc 2:9-2:12  _e
-testdata/language-features/recursion/simplerec01.lc 2:13-2:14  _b
+testdata/language-features/recursion/simplerec01.lc 1:1-1:4
+    forall a . (Num a, Eq a, Num a) => a -> Char
+testdata/language-features/recursion/simplerec01.lc 1:9-1:12
+    Char
+testdata/language-features/recursion/simplerec01.lc 1:9-2:14
+    Bool -> Char
+testdata/language-features/recursion/simplerec01.lc 2:9-2:12
+    _e
+testdata/language-features/recursion/simplerec01.lc 2:13-2:14
+    _b
\ No newline at end of file
diff --git a/testdata/language-features/recursion/simplerec02.out b/testdata/language-features/recursion/simplerec02.out
index 74b2298a..becc3390 100644
--- a/testdata/language-features/recursion/simplerec02.out
+++ b/testdata/language-features/recursion/simplerec02.out
@@ -10,11 +10,17 @@ value
           (fromInt 0 == c)) -> HNil
 main is not found
 ------------ trace
-value :: ()
+value :: ()
 ------------ tooltips
-testdata/language-features/recursion/simplerec02.lc 1:1-1:6  ()
-testdata/language-features/recursion/simplerec02.lc 1:21-1:24  Char
-testdata/language-features/recursion/simplerec02.lc 1:21-2:26  Bool -> Char | _a -> _a
-testdata/language-features/recursion/simplerec02.lc 2:21-2:24  _e
-testdata/language-features/recursion/simplerec02.lc 2:25-2:26  _b
-testdata/language-features/recursion/simplerec02.lc 3:12-3:14  ()
+testdata/language-features/recursion/simplerec02.lc 1:1-1:6
+    ()
+testdata/language-features/recursion/simplerec02.lc 1:21-1:24
+    Char
+testdata/language-features/recursion/simplerec02.lc 1:21-2:26
+    Bool -> Char
+testdata/language-features/recursion/simplerec02.lc 2:21-2:24
+    _e
+testdata/language-features/recursion/simplerec02.lc 2:25-2:26
+    _b
+testdata/language-features/recursion/simplerec02.lc 3:12-3:14
+    ()
\ No newline at end of file
diff --git a/testdata/language-features/recursion/simplerec03.out b/testdata/language-features/recursion/simplerec03.out
index 62da7f5a..51fac6c9 100644
--- a/testdata/language-features/recursion/simplerec03.out
+++ b/testdata/language-features/recursion/simplerec03.out
@@ -10,11 +10,17 @@ value
           (fromInt 0 == c)) -> HNil
 main is not found
 ------------ trace
-value :: ()
+value :: ()
 ------------ tooltips
-testdata/language-features/recursion/simplerec03.lc 1:1-1:6  ()
-testdata/language-features/recursion/simplerec03.lc 1:9-1:11  ()
-testdata/language-features/recursion/simplerec03.lc 3:13-3:16  Char
-testdata/language-features/recursion/simplerec03.lc 3:13-4:18  Bool -> Char | _a -> _a
-testdata/language-features/recursion/simplerec03.lc 4:13-4:16  _e
-testdata/language-features/recursion/simplerec03.lc 4:17-4:18  _b
+testdata/language-features/recursion/simplerec03.lc 1:1-1:6
+    ()
+testdata/language-features/recursion/simplerec03.lc 1:9-1:11
+    ()
+testdata/language-features/recursion/simplerec03.lc 3:13-3:16
+    Char
+testdata/language-features/recursion/simplerec03.lc 3:13-4:18
+    Bool -> Char
+testdata/language-features/recursion/simplerec03.lc 4:13-4:16
+    _e
+testdata/language-features/recursion/simplerec03.lc 4:17-4:18
+    _b
\ No newline at end of file
diff --git a/testdata/language-features/section/section01.out b/testdata/language-features/section/section01.out
index 86a78f54..0c51e14e 100644
--- a/testdata/language-features/section/section01.out
+++ b/testdata/language-features/section/section01.out
@@ -4,17 +4,27 @@ value1 = \(a :: _) -> _rhs \(b :: _) -> a !@! b
 value2 = \(a :: _) -> _rhs \(b :: _) -> b !@! a
 main is not found
 ------------ trace
-!@! :: forall a b . a -> b -> ()
-value1 :: forall a b . a -> b -> ()
-value2 :: forall a b . a -> b -> ()
+!@! :: forall a b . a -> b -> ()
+value1 :: forall a b . a -> b -> ()
+value2 :: forall a b . a -> b -> ()
 ------------ tooltips
-testdata/language-features/section/section01.lc 1:3-1:6  forall a b . a -> b -> ()
-testdata/language-features/section/section01.lc 1:11-1:13  ()
-testdata/language-features/section/section01.lc 3:1-3:7  forall a b . a -> b -> ()
-testdata/language-features/section/section01.lc 3:13-3:14  _f
-testdata/language-features/section/section01.lc 3:13-3:18  _a -> ()
-testdata/language-features/section/section01.lc 3:15-3:18  forall a b . a -> b -> ()
-testdata/language-features/section/section01.lc 5:1-5:7  forall a b . a -> b -> ()
-testdata/language-features/section/section01.lc 5:13-5:16  forall a b . a -> b -> ()
-testdata/language-features/section/section01.lc 5:13-5:18  ()
-testdata/language-features/section/section01.lc 5:17-5:18  _e
+testdata/language-features/section/section01.lc 1:3-1:6
+    forall a b . a -> b -> ()
+testdata/language-features/section/section01.lc 1:11-1:13
+    ()
+testdata/language-features/section/section01.lc 3:1-3:7
+    forall a b . a -> b -> ()
+testdata/language-features/section/section01.lc 3:13-3:14
+    _f
+testdata/language-features/section/section01.lc 3:13-3:18
+    _a -> ()
+testdata/language-features/section/section01.lc 3:15-3:18
+    forall a b . a -> b -> ()
+testdata/language-features/section/section01.lc 5:1-5:7
+    forall a b . a -> b -> ()
+testdata/language-features/section/section01.lc 5:13-5:16
+    forall a b . a -> b -> ()
+testdata/language-features/section/section01.lc 5:13-5:18
+    ()
+testdata/language-features/section/section01.lc 5:17-5:18
+    _e
\ No newline at end of file