removing coloring from .out files

59 files changed, 1792 insertions, 990 deletions

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