83 files changed, 683 insertions, 683 deletions

diff --git a/testdata/language-features/basic-list/list01.out b/testdata/language-features/basic-list/list01.out
index 91b80943..882020d5 100644
--- a/testdata/language-features/basic-list/list01.out
+++ b/testdata/language-features/basic-list/list01.out
@@ -1,22 +1,22 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/list01.lc 1:1-1:7  {a} -> 'List a
-testdata/language-features/basic-list/list01.lc 1:10-1:12  {a} -> 'List a
-testdata/language-features/basic-list/list01.lc 2:1-2:7  {a} -> {b : 'Num a} -> 'List a
-testdata/language-features/basic-list/list01.lc 2:10-2:19  'List V2
+testdata/language-features/basic-list/list01.lc 1:1-1:7  {a} -> List a
+testdata/language-features/basic-list/list01.lc 1:10-1:12  {a} -> List a
+testdata/language-features/basic-list/list01.lc 2:1-2:7  {a} -> {b : Num a} -> List a
+testdata/language-features/basic-list/list01.lc 2:10-2:19  List V2
 testdata/language-features/basic-list/list01.lc 2:11-2:12  V1
 testdata/language-features/basic-list/list01.lc 2:13-2:14  V1
-testdata/language-features/basic-list/list01.lc 2:13-2:18  'List V3
+testdata/language-features/basic-list/list01.lc 2:13-2:18  List V3
 testdata/language-features/basic-list/list01.lc 2:15-2:16  V1
-testdata/language-features/basic-list/list01.lc 2:15-2:18  'List V4
-testdata/language-features/basic-list/list01.lc 2:17-2:18  'List V4 | V1
-testdata/language-features/basic-list/list01.lc 3:1-3:7  'List 'Char
-testdata/language-features/basic-list/list01.lc 3:10-3:31  'List 'Char
-testdata/language-features/basic-list/list01.lc 3:11-3:14  'Char
-testdata/language-features/basic-list/list01.lc 3:15-3:18  'Char
-testdata/language-features/basic-list/list01.lc 3:15-3:30  'List 'Char
-testdata/language-features/basic-list/list01.lc 3:19-3:22  'Char
-testdata/language-features/basic-list/list01.lc 3:19-3:30  'List 'Char
-testdata/language-features/basic-list/list01.lc 3:23-3:26  'Char
-testdata/language-features/basic-list/list01.lc 3:23-3:30  'List 'Char
-testdata/language-features/basic-list/list01.lc 3:27-3:30  'Char | 'List 'Char
+testdata/language-features/basic-list/list01.lc 2:15-2:18  List V4
+testdata/language-features/basic-list/list01.lc 2:17-2:18  List V4 | V1
+testdata/language-features/basic-list/list01.lc 3:1-3:7  List Char
+testdata/language-features/basic-list/list01.lc 3:10-3:31  List Char
+testdata/language-features/basic-list/list01.lc 3:11-3:14  Char
+testdata/language-features/basic-list/list01.lc 3:15-3:18  Char
+testdata/language-features/basic-list/list01.lc 3:15-3:30  List Char
+testdata/language-features/basic-list/list01.lc 3:19-3:22  Char
+testdata/language-features/basic-list/list01.lc 3:19-3:30  List Char
+testdata/language-features/basic-list/list01.lc 3:23-3:26  Char
+testdata/language-features/basic-list/list01.lc 3:23-3:30  List Char
+testdata/language-features/basic-list/list01.lc 3:27-3:30  Char | List Char
diff --git a/testdata/language-features/basic-list/list02.out b/testdata/language-features/basic-list/list02.out
index d49614fe..fcb82a6f 100644
--- a/testdata/language-features/basic-list/list02.out
+++ b/testdata/language-features/basic-list/list02.out
@@ -1,22 +1,22 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/list02.lc 1:1-1:7  {a} -> 'List a
-testdata/language-features/basic-list/list02.lc 1:10-2:4  {a} -> 'List a
-testdata/language-features/basic-list/list02.lc 4:1-4:7  {a} -> {b : 'Num a} -> 'List a
-testdata/language-features/basic-list/list02.lc 4:10-5:7  'List V2
+testdata/language-features/basic-list/list02.lc 1:1-1:7  {a} -> List a
+testdata/language-features/basic-list/list02.lc 1:10-2:4  {a} -> List a
+testdata/language-features/basic-list/list02.lc 4:1-4:7  {a} -> {b : Num a} -> List a
+testdata/language-features/basic-list/list02.lc 4:10-5:7  List V2
 testdata/language-features/basic-list/list02.lc 4:11-4:12  V1
 testdata/language-features/basic-list/list02.lc 4:13-4:14  V1
-testdata/language-features/basic-list/list02.lc 4:13-5:6  'List V3
+testdata/language-features/basic-list/list02.lc 4:13-5:6  List V3
 testdata/language-features/basic-list/list02.lc 5:3-5:4  V1
-testdata/language-features/basic-list/list02.lc 5:3-5:6  'List V4
-testdata/language-features/basic-list/list02.lc 5:5-5:6  'List V4 | V1
-testdata/language-features/basic-list/list02.lc 7:1-7:7  'List 'Char
-testdata/language-features/basic-list/list02.lc 8:3-13:4  'List 'Char
-testdata/language-features/basic-list/list02.lc 8:5-8:8  'Char
-testdata/language-features/basic-list/list02.lc 9:5-9:8  'Char
-testdata/language-features/basic-list/list02.lc 9:5-12:8  'List 'Char
-testdata/language-features/basic-list/list02.lc 10:5-10:8  'Char
-testdata/language-features/basic-list/list02.lc 10:5-12:8  'List 'Char
-testdata/language-features/basic-list/list02.lc 11:5-11:8  'Char
-testdata/language-features/basic-list/list02.lc 11:5-12:8  'List 'Char
-testdata/language-features/basic-list/list02.lc 12:5-12:8  'Char | 'List 'Char
+testdata/language-features/basic-list/list02.lc 5:3-5:6  List V4
+testdata/language-features/basic-list/list02.lc 5:5-5:6  List V4 | V1
+testdata/language-features/basic-list/list02.lc 7:1-7:7  List Char
+testdata/language-features/basic-list/list02.lc 8:3-13:4  List Char
+testdata/language-features/basic-list/list02.lc 8:5-8:8  Char
+testdata/language-features/basic-list/list02.lc 9:5-9:8  Char
+testdata/language-features/basic-list/list02.lc 9:5-12:8  List Char
+testdata/language-features/basic-list/list02.lc 10:5-10:8  Char
+testdata/language-features/basic-list/list02.lc 10:5-12:8  List Char
+testdata/language-features/basic-list/list02.lc 11:5-11:8  Char
+testdata/language-features/basic-list/list02.lc 11:5-12:8  List Char
+testdata/language-features/basic-list/list02.lc 12:5-12:8  Char | List Char
diff --git a/testdata/language-features/basic-list/list08.out b/testdata/language-features/basic-list/list08.out
index c51990a9..b78f93ed 100644
--- a/testdata/language-features/basic-list/list08.out
+++ b/testdata/language-features/basic-list/list08.out
@@ -1,6 +1,6 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/list08.lc 1:1-1:6  'List 'Float
-testdata/language-features/basic-list/list08.lc 1:9-1:16  'List 'Float
+testdata/language-features/basic-list/list08.lc 1:1-1:6  List Float
+testdata/language-features/basic-list/list08.lc 1:9-1:16  List Float
 testdata/language-features/basic-list/list08.lc 1:10-1:11  V1
-testdata/language-features/basic-list/list08.lc 1:12-1:15  'Float | 'List 'Float
+testdata/language-features/basic-list/list08.lc 1:12-1:15  Float | List Float
diff --git a/testdata/language-features/basic-list/list09.out b/testdata/language-features/basic-list/list09.out
index 9ef706b7..ebd7c983 100644
--- a/testdata/language-features/basic-list/list09.out
+++ b/testdata/language-features/basic-list/list09.out
@@ -1,8 +1,8 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/list09.lc 1:1-1:6  'List 'Float
-testdata/language-features/basic-list/list09.lc 1:9-1:16  'List 'Float
+testdata/language-features/basic-list/list09.lc 1:1-1:6  List Float
+testdata/language-features/basic-list/list09.lc 1:9-1:16  List Float
 testdata/language-features/basic-list/list09.lc 1:10-1:11  V1
-testdata/language-features/basic-list/list09.lc 1:12-1:15  'Float | 'List 'Float
+testdata/language-features/basic-list/list09.lc 1:12-1:15  Float | List Float
 testdata/language-features/basic-list/list09.lc 1:20-1:27  Type
 testdata/language-features/basic-list/list09.lc 1:21-1:26  Type
diff --git a/testdata/language-features/basic-list/list11.out b/testdata/language-features/basic-list/list11.out
index 8da3d8cf..a5d9f3fb 100644
--- a/testdata/language-features/basic-list/list11.out
+++ b/testdata/language-features/basic-list/list11.out
@@ -1,8 +1,8 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/list11.lc 1:1-1:6  {a} -> {b : 'Num a} -> 'List a
+testdata/language-features/basic-list/list11.lc 1:1-1:6  {a} -> {b : Num a} -> List a
 testdata/language-features/basic-list/list11.lc 1:9-1:10  V1
-testdata/language-features/basic-list/list11.lc 1:9-1:11  'List V1 -> 'List V2
-testdata/language-features/basic-list/list11.lc 1:9-1:13  'List V1
-testdata/language-features/basic-list/list11.lc 1:10-1:11  {a} -> a -> 'List a -> 'List a
-testdata/language-features/basic-list/list11.lc 1:11-1:13  {a} -> 'List a
+testdata/language-features/basic-list/list11.lc 1:9-1:11  List V1 -> List V2
+testdata/language-features/basic-list/list11.lc 1:9-1:13  List V1
+testdata/language-features/basic-list/list11.lc 1:10-1:11  {a} -> a -> List a -> List a
+testdata/language-features/basic-list/list11.lc 1:11-1:13  {a} -> List a
diff --git a/testdata/language-features/basic-list/list12.out b/testdata/language-features/basic-list/list12.out
index a866896d..1aa35643 100644
--- a/testdata/language-features/basic-list/list12.out
+++ b/testdata/language-features/basic-list/list12.out
@@ -1,24 +1,24 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/list12.lc 1:1-1:6  {a} -> {b : 'Num a} -> 'List a
+testdata/language-features/basic-list/list12.lc 1:1-1:6  {a} -> {b : Num a} -> List a
 testdata/language-features/basic-list/list12.lc 1:9-1:10  V1
-testdata/language-features/basic-list/list12.lc 1:9-1:11  'List V1 -> 'List V2
-testdata/language-features/basic-list/list12.lc 1:9-1:21  'List V2
-testdata/language-features/basic-list/list12.lc 1:10-1:11  {a} -> a -> 'List a -> 'List a
+testdata/language-features/basic-list/list12.lc 1:9-1:11  List V1 -> List V2
+testdata/language-features/basic-list/list12.lc 1:9-1:21  List V2
+testdata/language-features/basic-list/list12.lc 1:10-1:11  {a} -> a -> List a -> List a
 testdata/language-features/basic-list/list12.lc 1:11-1:12  V1
-testdata/language-features/basic-list/list12.lc 1:11-1:13  'List V1 -> 'List V2
-testdata/language-features/basic-list/list12.lc 1:11-1:21  'List V3
-testdata/language-features/basic-list/list12.lc 1:12-1:13  {a} -> a -> 'List a -> 'List a
+testdata/language-features/basic-list/list12.lc 1:11-1:13  List V1 -> List V2
+testdata/language-features/basic-list/list12.lc 1:11-1:21  List V3
+testdata/language-features/basic-list/list12.lc 1:12-1:13  {a} -> a -> List a -> List a
 testdata/language-features/basic-list/list12.lc 1:13-1:14  V1
-testdata/language-features/basic-list/list12.lc 1:13-1:15  'List V1 -> 'List V2
-testdata/language-features/basic-list/list12.lc 1:13-1:21  'List V4
-testdata/language-features/basic-list/list12.lc 1:14-1:15  {a} -> a -> 'List a -> 'List a
+testdata/language-features/basic-list/list12.lc 1:13-1:15  List V1 -> List V2
+testdata/language-features/basic-list/list12.lc 1:13-1:21  List V4
+testdata/language-features/basic-list/list12.lc 1:14-1:15  {a} -> a -> List a -> List a
 testdata/language-features/basic-list/list12.lc 1:15-1:16  V1
-testdata/language-features/basic-list/list12.lc 1:15-1:17  'List V1 -> 'List V2
-testdata/language-features/basic-list/list12.lc 1:15-1:21  'List V5
-testdata/language-features/basic-list/list12.lc 1:16-1:17  {a} -> a -> 'List a -> 'List a
+testdata/language-features/basic-list/list12.lc 1:15-1:17  List V1 -> List V2
+testdata/language-features/basic-list/list12.lc 1:15-1:21  List V5
+testdata/language-features/basic-list/list12.lc 1:16-1:17  {a} -> a -> List a -> List a
 testdata/language-features/basic-list/list12.lc 1:17-1:18  V1
-testdata/language-features/basic-list/list12.lc 1:17-1:19  'List V1 -> 'List V2
-testdata/language-features/basic-list/list12.lc 1:17-1:21  'List V5
-testdata/language-features/basic-list/list12.lc 1:18-1:19  {a} -> a -> 'List a -> 'List a
-testdata/language-features/basic-list/list12.lc 1:19-1:21  {a} -> 'List a
+testdata/language-features/basic-list/list12.lc 1:17-1:19  List V1 -> List V2
+testdata/language-features/basic-list/list12.lc 1:17-1:21  List V5
+testdata/language-features/basic-list/list12.lc 1:18-1:19  {a} -> a -> List a -> List a
+testdata/language-features/basic-list/list12.lc 1:19-1:21  {a} -> List a
diff --git a/testdata/language-features/basic-list/list13.out b/testdata/language-features/basic-list/list13.out
index 65c373ee..bc6bcd99 100644
--- a/testdata/language-features/basic-list/list13.out
+++ b/testdata/language-features/basic-list/list13.out
@@ -1,24 +1,24 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/list13.lc 1:1-1:6  'List 'Char
-testdata/language-features/basic-list/list13.lc 1:9-1:12  'Char
-testdata/language-features/basic-list/list13.lc 1:9-1:13  'List 'Char -> 'List 'Char
-testdata/language-features/basic-list/list13.lc 1:9-1:31  'List 'Char
-testdata/language-features/basic-list/list13.lc 1:12-1:13  {a} -> a -> 'List a -> 'List a
-testdata/language-features/basic-list/list13.lc 1:13-1:16  'Char
-testdata/language-features/basic-list/list13.lc 1:13-1:17  'List 'Char -> 'List 'Char
-testdata/language-features/basic-list/list13.lc 1:13-1:31  'List 'Char
-testdata/language-features/basic-list/list13.lc 1:16-1:17  {a} -> a -> 'List a -> 'List a
-testdata/language-features/basic-list/list13.lc 1:17-1:20  'Char
-testdata/language-features/basic-list/list13.lc 1:17-1:21  'List 'Char -> 'List 'Char
-testdata/language-features/basic-list/list13.lc 1:17-1:31  'List 'Char
-testdata/language-features/basic-list/list13.lc 1:20-1:21  {a} -> a -> 'List a -> 'List a
-testdata/language-features/basic-list/list13.lc 1:21-1:24  'Char
-testdata/language-features/basic-list/list13.lc 1:21-1:25  'List 'Char -> 'List 'Char
-testdata/language-features/basic-list/list13.lc 1:21-1:31  'List 'Char
-testdata/language-features/basic-list/list13.lc 1:24-1:25  {a} -> a -> 'List a -> 'List a
-testdata/language-features/basic-list/list13.lc 1:25-1:28  'Char
-testdata/language-features/basic-list/list13.lc 1:25-1:29  'List 'Char -> 'List 'Char
-testdata/language-features/basic-list/list13.lc 1:25-1:31  'List 'Char
-testdata/language-features/basic-list/list13.lc 1:28-1:29  {a} -> a -> 'List a -> 'List a
-testdata/language-features/basic-list/list13.lc 1:29-1:31  {a} -> 'List a
+testdata/language-features/basic-list/list13.lc 1:1-1:6  List Char
+testdata/language-features/basic-list/list13.lc 1:9-1:12  Char
+testdata/language-features/basic-list/list13.lc 1:9-1:13  List Char -> List Char
+testdata/language-features/basic-list/list13.lc 1:9-1:31  List Char
+testdata/language-features/basic-list/list13.lc 1:12-1:13  {a} -> a -> List a -> List a
+testdata/language-features/basic-list/list13.lc 1:13-1:16  Char
+testdata/language-features/basic-list/list13.lc 1:13-1:17  List Char -> List Char
+testdata/language-features/basic-list/list13.lc 1:13-1:31  List Char
+testdata/language-features/basic-list/list13.lc 1:16-1:17  {a} -> a -> List a -> List a
+testdata/language-features/basic-list/list13.lc 1:17-1:20  Char
+testdata/language-features/basic-list/list13.lc 1:17-1:21  List Char -> List Char
+testdata/language-features/basic-list/list13.lc 1:17-1:31  List Char
+testdata/language-features/basic-list/list13.lc 1:20-1:21  {a} -> a -> List a -> List a
+testdata/language-features/basic-list/list13.lc 1:21-1:24  Char
+testdata/language-features/basic-list/list13.lc 1:21-1:25  List Char -> List Char
+testdata/language-features/basic-list/list13.lc 1:21-1:31  List Char
+testdata/language-features/basic-list/list13.lc 1:24-1:25  {a} -> a -> List a -> List a
+testdata/language-features/basic-list/list13.lc 1:25-1:28  Char
+testdata/language-features/basic-list/list13.lc 1:25-1:29  List Char -> List Char
+testdata/language-features/basic-list/list13.lc 1:25-1:31  List Char
+testdata/language-features/basic-list/list13.lc 1:28-1:29  {a} -> a -> List a -> List a
+testdata/language-features/basic-list/list13.lc 1:29-1:31  {a} -> List a
diff --git a/testdata/language-features/basic-list/listcomp01.out b/testdata/language-features/basic-list/listcomp01.out
index 1aa3da93..157fbf88 100644
--- a/testdata/language-features/basic-list/listcomp01.out
+++ b/testdata/language-features/basic-list/listcomp01.out
@@ -1,12 +1,12 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/listcomp01.lc 1:1-1:6  'List 'Tuple0
-testdata/language-features/basic-list/listcomp01.lc 1:9-1:34  'List 'Tuple0
-testdata/language-features/basic-list/listcomp01.lc 1:10-1:12  'List 'Tuple0 | 'Tuple0 | V1 -> 'List V1
-testdata/language-features/basic-list/listcomp01.lc 1:20-1:33  'List 'Tuple0
-testdata/language-features/basic-list/listcomp01.lc 1:21-1:23  'Tuple0
-testdata/language-features/basic-list/listcomp01.lc 1:24-1:26  'Tuple0
-testdata/language-features/basic-list/listcomp01.lc 1:24-1:32  'List 'Tuple0
-testdata/language-features/basic-list/listcomp01.lc 1:27-1:29  'Tuple0
-testdata/language-features/basic-list/listcomp01.lc 1:27-1:32  'List 'Tuple0
-testdata/language-features/basic-list/listcomp01.lc 1:30-1:32  'List 'Tuple0 | 'Tuple0
+testdata/language-features/basic-list/listcomp01.lc 1:1-1:6  List Tuple0
+testdata/language-features/basic-list/listcomp01.lc 1:9-1:34  List Tuple0
+testdata/language-features/basic-list/listcomp01.lc 1:10-1:12  List Tuple0 | Tuple0 | V1 -> List V1
+testdata/language-features/basic-list/listcomp01.lc 1:20-1:33  List Tuple0
+testdata/language-features/basic-list/listcomp01.lc 1:21-1:23  Tuple0
+testdata/language-features/basic-list/listcomp01.lc 1:24-1:26  Tuple0
+testdata/language-features/basic-list/listcomp01.lc 1:24-1:32  List Tuple0
+testdata/language-features/basic-list/listcomp01.lc 1:27-1:29  Tuple0
+testdata/language-features/basic-list/listcomp01.lc 1:27-1:32  List Tuple0
+testdata/language-features/basic-list/listcomp01.lc 1:30-1:32  List Tuple0 | Tuple0
diff --git a/testdata/language-features/basic-list/listcomp02.out b/testdata/language-features/basic-list/listcomp02.out
index d4b84f05..45c67f4a 100644
--- a/testdata/language-features/basic-list/listcomp02.out
+++ b/testdata/language-features/basic-list/listcomp02.out
@@ -1,14 +1,14 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/listcomp02.lc 1:1-1:2  'List 'Tuple0
-testdata/language-features/basic-list/listcomp02.lc 1:5-1:18  'List 'Tuple0
-testdata/language-features/basic-list/listcomp02.lc 1:6-1:8  'Tuple0
-testdata/language-features/basic-list/listcomp02.lc 1:9-1:11  'Tuple0
-testdata/language-features/basic-list/listcomp02.lc 1:9-1:17  'List 'Tuple0
-testdata/language-features/basic-list/listcomp02.lc 1:12-1:14  'Tuple0
-testdata/language-features/basic-list/listcomp02.lc 1:12-1:17  'List 'Tuple0
-testdata/language-features/basic-list/listcomp02.lc 1:15-1:17  'List 'Tuple0 | 'Tuple0
-testdata/language-features/basic-list/listcomp02.lc 2:1-2:6  'List 'Tuple0
-testdata/language-features/basic-list/listcomp02.lc 2:9-2:21  'List 'Tuple0
-testdata/language-features/basic-list/listcomp02.lc 2:10-2:11  'List V2 | V1 -> 'List V1 | V3
-testdata/language-features/basic-list/listcomp02.lc 2:19-2:20  'List 'Tuple0
+testdata/language-features/basic-list/listcomp02.lc 1:1-1:2  List Tuple0
+testdata/language-features/basic-list/listcomp02.lc 1:5-1:18  List Tuple0
+testdata/language-features/basic-list/listcomp02.lc 1:6-1:8  Tuple0
+testdata/language-features/basic-list/listcomp02.lc 1:9-1:11  Tuple0
+testdata/language-features/basic-list/listcomp02.lc 1:9-1:17  List Tuple0
+testdata/language-features/basic-list/listcomp02.lc 1:12-1:14  Tuple0
+testdata/language-features/basic-list/listcomp02.lc 1:12-1:17  List Tuple0
+testdata/language-features/basic-list/listcomp02.lc 1:15-1:17  List Tuple0 | Tuple0
+testdata/language-features/basic-list/listcomp02.lc 2:1-2:6  List Tuple0
+testdata/language-features/basic-list/listcomp02.lc 2:9-2:21  List Tuple0
+testdata/language-features/basic-list/listcomp02.lc 2:10-2:11  List V2 | V1 -> List V1 | V3
+testdata/language-features/basic-list/listcomp02.lc 2:19-2:20  List Tuple0
diff --git a/testdata/language-features/basic-list/listcomp03.out b/testdata/language-features/basic-list/listcomp03.out
index 7f96d5d4..238bfaf9 100644
--- a/testdata/language-features/basic-list/listcomp03.out
+++ b/testdata/language-features/basic-list/listcomp03.out
@@ -1,14 +1,14 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/listcomp03.lc 1:1-1:6  'List 'Tuple0
-testdata/language-features/basic-list/listcomp03.lc 1:9-1:41  'List 'Tuple0
-testdata/language-features/basic-list/listcomp03.lc 1:10-1:12  'List 'Tuple0 | 'Tuple0
-testdata/language-features/basic-list/listcomp03.lc 1:10-1:40  'List 'Tuple0 | 'List 'Tuple0 -> 'List 'Tuple0 | V1 -> 'List V1
-testdata/language-features/basic-list/listcomp03.lc 1:20-1:33  'List 'Tuple0
-testdata/language-features/basic-list/listcomp03.lc 1:21-1:23  'Tuple0
-testdata/language-features/basic-list/listcomp03.lc 1:24-1:26  'Tuple0
-testdata/language-features/basic-list/listcomp03.lc 1:24-1:32  'List 'Tuple0
-testdata/language-features/basic-list/listcomp03.lc 1:27-1:29  'Tuple0
-testdata/language-features/basic-list/listcomp03.lc 1:27-1:32  'List 'Tuple0
-testdata/language-features/basic-list/listcomp03.lc 1:30-1:32  'List 'Tuple0 | 'Tuple0
-testdata/language-features/basic-list/listcomp03.lc 1:35-1:40  'Bool
+testdata/language-features/basic-list/listcomp03.lc 1:1-1:6  List Tuple0
+testdata/language-features/basic-list/listcomp03.lc 1:9-1:41  List Tuple0
+testdata/language-features/basic-list/listcomp03.lc 1:10-1:12  List Tuple0 | Tuple0
+testdata/language-features/basic-list/listcomp03.lc 1:10-1:40  List Tuple0 | List Tuple0 -> List Tuple0 | V1 -> List V1
+testdata/language-features/basic-list/listcomp03.lc 1:20-1:33  List Tuple0
+testdata/language-features/basic-list/listcomp03.lc 1:21-1:23  Tuple0
+testdata/language-features/basic-list/listcomp03.lc 1:24-1:26  Tuple0
+testdata/language-features/basic-list/listcomp03.lc 1:24-1:32  List Tuple0
+testdata/language-features/basic-list/listcomp03.lc 1:27-1:29  Tuple0
+testdata/language-features/basic-list/listcomp03.lc 1:27-1:32  List Tuple0
+testdata/language-features/basic-list/listcomp03.lc 1:30-1:32  List Tuple0 | Tuple0
+testdata/language-features/basic-list/listcomp03.lc 1:35-1:40  Bool
diff --git a/testdata/language-features/basic-list/listcomp04.out b/testdata/language-features/basic-list/listcomp04.out
index 1f65be16..08725820 100644
--- a/testdata/language-features/basic-list/listcomp04.out
+++ b/testdata/language-features/basic-list/listcomp04.out
@@ -1,16 +1,16 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/listcomp04.lc 1:1-1:2  'List 'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 1:5-1:18  'List 'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 1:6-1:8  'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 1:9-1:11  'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 1:9-1:17  'List 'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 1:12-1:14  'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 1:12-1:17  'List 'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 1:15-1:17  'List 'Tuple0 | 'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 2:1-2:6  'List 'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 2:9-2:30  'List 'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 2:10-2:12  'List 'Tuple0 | 'Tuple0 | V1 -> 'List V1
-testdata/language-features/basic-list/listcomp04.lc 2:10-2:29  'List 'Tuple0 | V1 -> 'List V1
-testdata/language-features/basic-list/listcomp04.lc 2:20-2:21  'List 'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 2:28-2:29  'List 'Tuple0
+testdata/language-features/basic-list/listcomp04.lc 1:1-1:2  List Tuple0
+testdata/language-features/basic-list/listcomp04.lc 1:5-1:18  List Tuple0
+testdata/language-features/basic-list/listcomp04.lc 1:6-1:8  Tuple0
+testdata/language-features/basic-list/listcomp04.lc 1:9-1:11  Tuple0
+testdata/language-features/basic-list/listcomp04.lc 1:9-1:17  List Tuple0
+testdata/language-features/basic-list/listcomp04.lc 1:12-1:14  Tuple0
+testdata/language-features/basic-list/listcomp04.lc 1:12-1:17  List Tuple0
+testdata/language-features/basic-list/listcomp04.lc 1:15-1:17  List Tuple0 | Tuple0
+testdata/language-features/basic-list/listcomp04.lc 2:1-2:6  List Tuple0
+testdata/language-features/basic-list/listcomp04.lc 2:9-2:30  List Tuple0
+testdata/language-features/basic-list/listcomp04.lc 2:10-2:12  List Tuple0 | Tuple0 | V1 -> List V1
+testdata/language-features/basic-list/listcomp04.lc 2:10-2:29  List Tuple0 | V1 -> List V1
+testdata/language-features/basic-list/listcomp04.lc 2:20-2:21  List Tuple0
+testdata/language-features/basic-list/listcomp04.lc 2:28-2:29  List Tuple0
diff --git a/testdata/language-features/basic-list/listcomp05.out b/testdata/language-features/basic-list/listcomp05.out
index fd9751a0..6b48a5e0 100644
--- a/testdata/language-features/basic-list/listcomp05.out
+++ b/testdata/language-features/basic-list/listcomp05.out
@@ -1,10 +1,10 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/listcomp05.lc 1:1-1:6  'List 'Tuple0
-testdata/language-features/basic-list/listcomp05.lc 1:9-1:39  'List 'Tuple0
+testdata/language-features/basic-list/listcomp05.lc 1:1-1:6  List Tuple0
+testdata/language-features/basic-list/listcomp05.lc 1:9-1:39  List Tuple0
 testdata/language-features/basic-list/listcomp05.lc 1:10-1:11  V2
-testdata/language-features/basic-list/listcomp05.lc 1:10-1:38  'List 'Tuple0 | V1 -> 'List V1
-testdata/language-features/basic-list/listcomp05.lc 1:19-1:26  'List 'Tuple0
-testdata/language-features/basic-list/listcomp05.lc 1:20-1:22  'Tuple0
-testdata/language-features/basic-list/listcomp05.lc 1:23-1:25  'List 'Tuple0 | 'Tuple0
-testdata/language-features/basic-list/listcomp05.lc 1:36-1:38  'Tuple0
+testdata/language-features/basic-list/listcomp05.lc 1:10-1:38  List Tuple0 | V1 -> List V1
+testdata/language-features/basic-list/listcomp05.lc 1:19-1:26  List Tuple0
+testdata/language-features/basic-list/listcomp05.lc 1:20-1:22  Tuple0
+testdata/language-features/basic-list/listcomp05.lc 1:23-1:25  List Tuple0 | Tuple0
+testdata/language-features/basic-list/listcomp05.lc 1:36-1:38  Tuple0
diff --git a/testdata/language-features/basic-list/listcomp06.out b/testdata/language-features/basic-list/listcomp06.out
index 4eeb6035..69ad18bc 100644
--- a/testdata/language-features/basic-list/listcomp06.out
+++ b/testdata/language-features/basic-list/listcomp06.out
@@ -1,20 +1,20 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/listcomp06.lc 1:1-1:7  'List 'Tuple0
-testdata/language-features/basic-list/listcomp06.lc 1:10-1:46  'List 'Tuple0
-testdata/language-features/basic-list/listcomp06.lc 1:11-1:12  'List V2 | V3
-testdata/language-features/basic-list/listcomp06.lc 1:11-1:45  'List 'Tuple0 | 'List V1 -> 'List V2 | V1 -> 'List V1
-testdata/language-features/basic-list/listcomp06.lc 1:20-1:27  'List 'Tuple0
-testdata/language-features/basic-list/listcomp06.lc 1:21-1:23  'Tuple0
-testdata/language-features/basic-list/listcomp06.lc 1:24-1:26  'List 'Tuple0 | 'Tuple0
-testdata/language-features/basic-list/listcomp06.lc 1:37-1:39  'Tuple0
-testdata/language-features/basic-list/listcomp06.lc 1:41-1:45  'Bool
-testdata/language-features/basic-list/listcomp06.lc 3:1-3:7  'List 'Tuple0
-testdata/language-features/basic-list/listcomp06.lc 3:10-3:46  'List 'Tuple0
+testdata/language-features/basic-list/listcomp06.lc 1:1-1:7  List Tuple0
+testdata/language-features/basic-list/listcomp06.lc 1:10-1:46  List Tuple0
+testdata/language-features/basic-list/listcomp06.lc 1:11-1:12  List V2 | V3
+testdata/language-features/basic-list/listcomp06.lc 1:11-1:45  List Tuple0 | List V1 -> List V2 | V1 -> List V1
+testdata/language-features/basic-list/listcomp06.lc 1:20-1:27  List Tuple0
+testdata/language-features/basic-list/listcomp06.lc 1:21-1:23  Tuple0
+testdata/language-features/basic-list/listcomp06.lc 1:24-1:26  List Tuple0 | Tuple0
+testdata/language-features/basic-list/listcomp06.lc 1:37-1:39  Tuple0
+testdata/language-features/basic-list/listcomp06.lc 1:41-1:45  Bool
+testdata/language-features/basic-list/listcomp06.lc 3:1-3:7  List Tuple0
+testdata/language-features/basic-list/listcomp06.lc 3:10-3:46  List Tuple0
 testdata/language-features/basic-list/listcomp06.lc 3:11-3:12  V2
-testdata/language-features/basic-list/listcomp06.lc 3:11-3:45  'List 'Tuple0 | V1 -> 'List V1
-testdata/language-features/basic-list/listcomp06.lc 3:20-3:27  'List 'Tuple0
-testdata/language-features/basic-list/listcomp06.lc 3:21-3:23  'Tuple0
-testdata/language-features/basic-list/listcomp06.lc 3:24-3:26  'List 'Tuple0 | 'Tuple0
-testdata/language-features/basic-list/listcomp06.lc 3:29-3:33  'Bool
-testdata/language-features/basic-list/listcomp06.lc 3:43-3:45  'Tuple0
+testdata/language-features/basic-list/listcomp06.lc 3:11-3:45  List Tuple0 | V1 -> List V1
+testdata/language-features/basic-list/listcomp06.lc 3:20-3:27  List Tuple0
+testdata/language-features/basic-list/listcomp06.lc 3:21-3:23  Tuple0
+testdata/language-features/basic-list/listcomp06.lc 3:24-3:26  List Tuple0 | Tuple0
+testdata/language-features/basic-list/listcomp06.lc 3:29-3:33  Bool
+testdata/language-features/basic-list/listcomp06.lc 3:43-3:45  Tuple0
diff --git a/testdata/language-features/basic-list/listcomp07.out b/testdata/language-features/basic-list/listcomp07.out
index 2cdc8d07..47aae1f7 100644
--- a/testdata/language-features/basic-list/listcomp07.out
+++ b/testdata/language-features/basic-list/listcomp07.out
@@ -1,32 +1,32 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/listcomp07.lc 1:1-1:7  'List 'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 1:10-6:11  'List 'Tuple0
+testdata/language-features/basic-list/listcomp07.lc 1:1-1:7  List Tuple0
+testdata/language-features/basic-list/listcomp07.lc 1:10-6:11  List Tuple0
 testdata/language-features/basic-list/listcomp07.lc 1:12-1:13  V5
-testdata/language-features/basic-list/listcomp07.lc 1:12-5:21  'List 'Tuple0 | 'List V1 | V1 -> 'List V1
-testdata/language-features/basic-list/listcomp07.lc 2:17-2:24  'List 'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 2:18-2:20  'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 2:21-2:23  'List 'Tuple0 | 'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 3:20-3:22  'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 4:12-4:16  'Bool
+testdata/language-features/basic-list/listcomp07.lc 1:12-5:21  List Tuple0 | List V1 | V1 -> List V1
+testdata/language-features/basic-list/listcomp07.lc 2:17-2:24  List Tuple0
+testdata/language-features/basic-list/listcomp07.lc 2:18-2:20  Tuple0
+testdata/language-features/basic-list/listcomp07.lc 2:21-2:23  List Tuple0 | Tuple0
+testdata/language-features/basic-list/listcomp07.lc 3:20-3:22  Tuple0
+testdata/language-features/basic-list/listcomp07.lc 4:12-4:16  Bool
 testdata/language-features/basic-list/listcomp07.lc 5:20-5:21  V2
-testdata/language-features/basic-list/listcomp07.lc 8:1-8:7  'List 'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 8:10-12:11  'List 'Tuple0
+testdata/language-features/basic-list/listcomp07.lc 8:1-8:7  List Tuple0
+testdata/language-features/basic-list/listcomp07.lc 8:10-12:11  List Tuple0
 testdata/language-features/basic-list/listcomp07.lc 8:12-8:13  V5
-testdata/language-features/basic-list/listcomp07.lc 8:12-11:21  'List 'Tuple0 | 'List V1 | V1 -> 'List V1
-testdata/language-features/basic-list/listcomp07.lc 8:21-8:28  'List 'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 8:22-8:24  'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 8:25-8:27  'List 'Tuple0 | 'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 9:20-9:22  'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 10:12-10:16  'Bool
+testdata/language-features/basic-list/listcomp07.lc 8:12-11:21  List Tuple0 | List V1 | V1 -> List V1
+testdata/language-features/basic-list/listcomp07.lc 8:21-8:28  List Tuple0
+testdata/language-features/basic-list/listcomp07.lc 8:22-8:24  Tuple0
+testdata/language-features/basic-list/listcomp07.lc 8:25-8:27  List Tuple0 | Tuple0
+testdata/language-features/basic-list/listcomp07.lc 9:20-9:22  Tuple0
+testdata/language-features/basic-list/listcomp07.lc 10:12-10:16  Bool
 testdata/language-features/basic-list/listcomp07.lc 11:20-11:21  V2
-testdata/language-features/basic-list/listcomp07.lc 14:1-14:7  'List 'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 14:10-20:3  'List 'Tuple0
+testdata/language-features/basic-list/listcomp07.lc 14:1-14:7  List Tuple0
+testdata/language-features/basic-list/listcomp07.lc 14:10-20:3  List Tuple0
 testdata/language-features/basic-list/listcomp07.lc 14:12-14:13  V5
-testdata/language-features/basic-list/listcomp07.lc 14:12-19:15  'List 'Tuple0 | 'List V1 | V1 -> 'List V1
-testdata/language-features/basic-list/listcomp07.lc 15:15-15:22  'List 'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 15:16-15:18  'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 15:19-15:21  'List 'Tuple0 | 'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 17:6-17:8  'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 18:7-18:11  'Bool
+testdata/language-features/basic-list/listcomp07.lc 14:12-19:15  List Tuple0 | List V1 | V1 -> List V1
+testdata/language-features/basic-list/listcomp07.lc 15:15-15:22  List Tuple0
+testdata/language-features/basic-list/listcomp07.lc 15:16-15:18  Tuple0
+testdata/language-features/basic-list/listcomp07.lc 15:19-15:21  List Tuple0 | Tuple0
+testdata/language-features/basic-list/listcomp07.lc 17:6-17:8  Tuple0
+testdata/language-features/basic-list/listcomp07.lc 18:7-18:11  Bool
 testdata/language-features/basic-list/listcomp07.lc 19:14-19:15  V2
diff --git a/testdata/language-features/basic-values/bool01.out b/testdata/language-features/basic-values/bool01.out
index 789dfa43..2f1fc837 100644
--- a/testdata/language-features/basic-values/bool01.out
+++ b/testdata/language-features/basic-values/bool01.out
@@ -1,6 +1,6 @@
 main is not found
 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
diff --git a/testdata/language-features/basic-values/case01.out b/testdata/language-features/basic-values/case01.out
index 0ba8373e..445692dd 100644
--- a/testdata/language-features/basic-values/case01.out
+++ b/testdata/language-features/basic-values/case01.out
@@ -1,26 +1,26 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/case01.lc 1:1-1:7  'Tuple0
-testdata/language-features/basic-values/case01.lc 1:10-1:29  'Tuple0
-testdata/language-features/basic-values/case01.lc 1:15-1:17  'Tuple0
-testdata/language-features/basic-values/case01.lc 1:27-1:29  'Tuple0
-testdata/language-features/basic-values/case01.lc 3:1-3:7  'Tuple0
-testdata/language-features/basic-values/case01.lc 3:10-4:11  'Tuple0
-testdata/language-features/basic-values/case01.lc 3:15-3:17  'Tuple0
-testdata/language-features/basic-values/case01.lc 4:9-4:11  'Tuple0
-testdata/language-features/basic-values/case01.lc 6:1-6:7  'Tuple0
-testdata/language-features/basic-values/case01.lc 7:3-8:13  'Tuple0
-testdata/language-features/basic-values/case01.lc 7:8-7:10  'Tuple0
-testdata/language-features/basic-values/case01.lc 8:11-8:13  'Tuple0
-testdata/language-features/basic-values/case01.lc 10:1-10:7  'Tuple0
-testdata/language-features/basic-values/case01.lc 11:3-13:9  'Tuple0
-testdata/language-features/basic-values/case01.lc 11:8-11:10  'Tuple0
-testdata/language-features/basic-values/case01.lc 13:7-13:9  'Tuple0
-testdata/language-features/basic-values/case01.lc 15:1-15:7  'Tuple0
-testdata/language-features/basic-values/case01.lc 16:3-19:11  'Tuple0
-testdata/language-features/basic-values/case01.lc 16:8-16:10  'Tuple0
-testdata/language-features/basic-values/case01.lc 19:9-19:11  'Tuple0
-testdata/language-features/basic-values/case01.lc 21:1-21:7  'Tuple0
-testdata/language-features/basic-values/case01.lc 22:3-23:12  'Tuple0
-testdata/language-features/basic-values/case01.lc 22:8-22:10  'Tuple0
-testdata/language-features/basic-values/case01.lc 23:10-23:12  'Tuple0
+testdata/language-features/basic-values/case01.lc 1:1-1:7  Tuple0
+testdata/language-features/basic-values/case01.lc 1:10-1:29  Tuple0
+testdata/language-features/basic-values/case01.lc 1:15-1:17  Tuple0
+testdata/language-features/basic-values/case01.lc 1:27-1:29  Tuple0
+testdata/language-features/basic-values/case01.lc 3:1-3:7  Tuple0
+testdata/language-features/basic-values/case01.lc 3:10-4:11  Tuple0
+testdata/language-features/basic-values/case01.lc 3:15-3:17  Tuple0
+testdata/language-features/basic-values/case01.lc 4:9-4:11  Tuple0
+testdata/language-features/basic-values/case01.lc 6:1-6:7  Tuple0
+testdata/language-features/basic-values/case01.lc 7:3-8:13  Tuple0
+testdata/language-features/basic-values/case01.lc 7:8-7:10  Tuple0
+testdata/language-features/basic-values/case01.lc 8:11-8:13  Tuple0
+testdata/language-features/basic-values/case01.lc 10:1-10:7  Tuple0
+testdata/language-features/basic-values/case01.lc 11:3-13:9  Tuple0
+testdata/language-features/basic-values/case01.lc 11:8-11:10  Tuple0
+testdata/language-features/basic-values/case01.lc 13:7-13:9  Tuple0
+testdata/language-features/basic-values/case01.lc 15:1-15:7  Tuple0
+testdata/language-features/basic-values/case01.lc 16:3-19:11  Tuple0
+testdata/language-features/basic-values/case01.lc 16:8-16:10  Tuple0
+testdata/language-features/basic-values/case01.lc 19:9-19:11  Tuple0
+testdata/language-features/basic-values/case01.lc 21:1-21:7  Tuple0
+testdata/language-features/basic-values/case01.lc 22:3-23:12  Tuple0
+testdata/language-features/basic-values/case01.lc 22:8-22:10  Tuple0
+testdata/language-features/basic-values/case01.lc 23:10-23:12  Tuple0
diff --git a/testdata/language-features/basic-values/case02.out b/testdata/language-features/basic-values/case02.out
index cb4274a3..d57b19e5 100644
--- a/testdata/language-features/basic-values/case02.out
+++ b/testdata/language-features/basic-values/case02.out
@@ -1,16 +1,16 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/case02.lc 1:1-1:7  'Tuple0
-testdata/language-features/basic-values/case02.lc 1:10-3:10  'Tuple0
+testdata/language-features/basic-values/case02.lc 1:1-1:7  Tuple0
+testdata/language-features/basic-values/case02.lc 1:10-3:10  Tuple0
 testdata/language-features/basic-values/case02.lc 1:15-1:16  V1
-testdata/language-features/basic-values/case02.lc 2:8-2:10  'Tuple0
-testdata/language-features/basic-values/case02.lc 2:8-3:10  'Tuple0 -> 'Ordering->'Tuple0
-testdata/language-features/basic-values/case02.lc 3:8-3:10  'Tuple0
-testdata/language-features/basic-values/case02.lc 5:1-5:7  'String
-testdata/language-features/basic-values/case02.lc 5:10-8:11  'String
+testdata/language-features/basic-values/case02.lc 2:8-2:10  Tuple0
+testdata/language-features/basic-values/case02.lc 2:8-3:10  Tuple0 -> Ordering->Tuple0
+testdata/language-features/basic-values/case02.lc 3:8-3:10  Tuple0
+testdata/language-features/basic-values/case02.lc 5:1-5:7  String
+testdata/language-features/basic-values/case02.lc 5:10-8:11  String
 testdata/language-features/basic-values/case02.lc 5:15-5:16  V1
-testdata/language-features/basic-values/case02.lc 6:8-6:11  'String
-testdata/language-features/basic-values/case02.lc 6:8-8:11  'String -> 'Ordering->'String
-testdata/language-features/basic-values/case02.lc 7:8-7:11  'String
-testdata/language-features/basic-values/case02.lc 7:8-8:11  'String | 'String -> 'Ordering->'String
-testdata/language-features/basic-values/case02.lc 8:8-8:11  'String
+testdata/language-features/basic-values/case02.lc 6:8-6:11  String
+testdata/language-features/basic-values/case02.lc 6:8-8:11  String -> Ordering->String
+testdata/language-features/basic-values/case02.lc 7:8-7:11  String
+testdata/language-features/basic-values/case02.lc 7:8-8:11  String | String -> Ordering->String
+testdata/language-features/basic-values/case02.lc 8:8-8:11  String
diff --git a/testdata/language-features/basic-values/case05.out b/testdata/language-features/basic-values/case05.out
index 1f1adc26..3520939e 100644
--- a/testdata/language-features/basic-values/case05.out
+++ b/testdata/language-features/basic-values/case05.out
@@ -1,6 +1,6 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/case05.lc 1:1-1:6  'Int->'Char
-testdata/language-features/basic-values/case05.lc 1:11-2:11  'Char
+testdata/language-features/basic-values/case05.lc 1:1-1:6  Int->Char
+testdata/language-features/basic-values/case05.lc 1:11-2:11  Char
 testdata/language-features/basic-values/case05.lc 1:16-1:17  V1
-testdata/language-features/basic-values/case05.lc 2:8-2:11  'Char
+testdata/language-features/basic-values/case05.lc 2:8-2:11  Char
diff --git a/testdata/language-features/basic-values/case06.out b/testdata/language-features/basic-values/case06.out
index 07dedca5..0dfa2886 100644
--- a/testdata/language-features/basic-values/case06.out
+++ b/testdata/language-features/basic-values/case06.out
@@ -1,8 +1,8 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/case06.lc 1:1-1:6  'Int->'Char
-testdata/language-features/basic-values/case06.lc 1:11-3:11  'Char
+testdata/language-features/basic-values/case06.lc 1:1-1:6  Int->Char
+testdata/language-features/basic-values/case06.lc 1:11-3:11  Char
 testdata/language-features/basic-values/case06.lc 1:16-1:17  V1
-testdata/language-features/basic-values/case06.lc 2:8-2:11  'Char
-testdata/language-features/basic-values/case06.lc 2:8-3:11  'Char -> 'Ordering->'Char
-testdata/language-features/basic-values/case06.lc 3:8-3:11  'Char
+testdata/language-features/basic-values/case06.lc 2:8-2:11  Char
+testdata/language-features/basic-values/case06.lc 2:8-3:11  Char -> Ordering->Char
+testdata/language-features/basic-values/case06.lc 3:8-3:11  Char
diff --git a/testdata/language-features/basic-values/data01.out b/testdata/language-features/basic-values/data01.out
index 2687d8b0..1f818e02 100644
--- a/testdata/language-features/basic-values/data01.out
+++ b/testdata/language-features/basic-values/data01.out
@@ -2,18 +2,18 @@ main is not found
 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 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 | 'Tuple0->'E | 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 | Tuple0->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 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 | 'Tuple0->'D1 | 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 | Tuple0->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 6:11-6:13  D1
diff --git a/testdata/language-features/basic-values/def01.out b/testdata/language-features/basic-values/def01.out
index 7695fcac..9fd5bd4a 100644
--- a/testdata/language-features/basic-values/def01.out
+++ b/testdata/language-features/basic-values/def01.out
@@ -1,7 +1,7 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/def01.lc 1:1-1:5  'Tuple0
-testdata/language-features/basic-values/def01.lc 1:8-1:10  'Tuple0
-testdata/language-features/basic-values/def01.lc 3:1-3:5  {a} -> {b} -> {c : 'Num b} -> a->b
-testdata/language-features/basic-values/def01.lc 5:1-5:5  {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  Tuple0
+testdata/language-features/basic-values/def01.lc 1:8-1:10  Tuple0
+testdata/language-features/basic-values/def01.lc 3:1-3:5  {a} -> {b} -> {c : Num b} -> a->b
+testdata/language-features/basic-values/def01.lc 5:1-5:5  {a} -> {b} -> {c} -> {d} -> {e} -> a -> b -> c -> d -> e->Char
+testdata/language-features/basic-values/def01.lc 5:18-5:21  Char
diff --git a/testdata/language-features/basic-values/def03.out b/testdata/language-features/basic-values/def03.out
index 069963a9..ac7785b2 100644
--- a/testdata/language-features/basic-values/def03.out
+++ b/testdata/language-features/basic-values/def03.out
@@ -1,6 +1,6 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/def03.lc 1:1-1:4  'Int->'Char
-testdata/language-features/basic-values/def03.lc 1:9-1:12  'Char
-testdata/language-features/basic-values/def03.lc 1:9-2:12  'Char -> 'Ordering->'Char
-testdata/language-features/basic-values/def03.lc 2:9-2:12  'Char
+testdata/language-features/basic-values/def03.lc 1:1-1:4  Int->Char
+testdata/language-features/basic-values/def03.lc 1:9-1:12  Char
+testdata/language-features/basic-values/def03.lc 1:9-2:12  Char -> Ordering->Char
+testdata/language-features/basic-values/def03.lc 2:9-2:12  Char
diff --git a/testdata/language-features/basic-values/def04.out b/testdata/language-features/basic-values/def04.out
index daa480e6..9f922126 100644
--- a/testdata/language-features/basic-values/def04.out
+++ b/testdata/language-features/basic-values/def04.out
@@ -1,14 +1,14 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/def04.lc 1:1-1:4  'Int->'Char
-testdata/language-features/basic-values/def04.lc 1:9-1:12  'Char
-testdata/language-features/basic-values/def04.lc 1:9-3:12  'Char -> 'Ordering->'Char
-testdata/language-features/basic-values/def04.lc 2:9-2:12  'Char
-testdata/language-features/basic-values/def04.lc 2:9-3:12  'Char | 'Char -> 'Ordering->'Char
-testdata/language-features/basic-values/def04.lc 3:9-3:12  'Char
-testdata/language-features/basic-values/def04.lc 5:1-5:5  {a} -> 'Int -> a->'Char
-testdata/language-features/basic-values/def04.lc 5:12-5:15  'Char
-testdata/language-features/basic-values/def04.lc 5:12-7:15  'Char -> 'Ordering->'Char
-testdata/language-features/basic-values/def04.lc 6:12-6:15  'Char
-testdata/language-features/basic-values/def04.lc 6:12-7:15  'Char | 'Char -> 'Ordering->'Char
-testdata/language-features/basic-values/def04.lc 7:12-7:15  'Char
+testdata/language-features/basic-values/def04.lc 1:1-1:4  Int->Char
+testdata/language-features/basic-values/def04.lc 1:9-1:12  Char
+testdata/language-features/basic-values/def04.lc 1:9-3:12  Char -> Ordering->Char
+testdata/language-features/basic-values/def04.lc 2:9-2:12  Char
+testdata/language-features/basic-values/def04.lc 2:9-3:12  Char | Char -> Ordering->Char
+testdata/language-features/basic-values/def04.lc 3:9-3:12  Char
+testdata/language-features/basic-values/def04.lc 5:1-5:5  {a} -> Int -> a->Char
+testdata/language-features/basic-values/def04.lc 5:12-5:15  Char
+testdata/language-features/basic-values/def04.lc 5:12-7:15  Char -> Ordering->Char
+testdata/language-features/basic-values/def04.lc 6:12-6:15  Char
+testdata/language-features/basic-values/def04.lc 6:12-7:15  Char | Char -> Ordering->Char
+testdata/language-features/basic-values/def04.lc 7:12-7:15  Char
diff --git a/testdata/language-features/basic-values/deforder01.out b/testdata/language-features/basic-values/deforder01.out
index 73ff427f..f4b6c68c 100644
--- a/testdata/language-features/basic-values/deforder01.out
+++ b/testdata/language-features/basic-values/deforder01.out
@@ -1,6 +1,6 @@
 main is not found
 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
diff --git a/testdata/language-features/basic-values/deforder03.out b/testdata/language-features/basic-values/deforder03.out
index 53bf5d63..e1062b12 100644
--- a/testdata/language-features/basic-values/deforder03.out
+++ b/testdata/language-features/basic-values/deforder03.out
@@ -1,6 +1,6 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/deforder03.lc 1:1-1:6  'Char
-testdata/language-features/basic-values/deforder03.lc 1:17-1:19  'Tuple0
-testdata/language-features/basic-values/deforder03.lc 2:17-2:18  'Tuple0
-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  Tuple0
+testdata/language-features/basic-values/deforder03.lc 2:17-2:18  Tuple0
+testdata/language-features/basic-values/deforder03.lc 3:12-3:15  Char
diff --git a/testdata/language-features/basic-values/deforder06.out b/testdata/language-features/basic-values/deforder06.out
index 985be8ab..7548f42d 100644
--- a/testdata/language-features/basic-values/deforder06.out
+++ b/testdata/language-features/basic-values/deforder06.out
@@ -1,6 +1,6 @@
 main is not found
 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  'Tuple0
-testdata/language-features/basic-values/deforder06.lc 2:23-2:24  'Tuple0
+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  Tuple0
+testdata/language-features/basic-values/deforder06.lc 2:23-2:24  Tuple0
diff --git a/testdata/language-features/basic-values/if01.out b/testdata/language-features/basic-values/if01.out
index 89b5b73e..5ef499d4 100644
--- a/testdata/language-features/basic-values/if01.out
+++ b/testdata/language-features/basic-values/if01.out
@@ -1,14 +1,14 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/if01.lc 1:1-1:7  'Tuple0
-testdata/language-features/basic-values/if01.lc 1:10-1:33  'Tuple0
-testdata/language-features/basic-values/if01.lc 1:13-1:17  'Bool
-testdata/language-features/basic-values/if01.lc 1:13-1:25  'Tuple0->'Tuple0
-testdata/language-features/basic-values/if01.lc 1:23-1:25  'Tuple0
-testdata/language-features/basic-values/if01.lc 1:31-1:33  'Tuple0
-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  Tuple0
+testdata/language-features/basic-values/if01.lc 1:10-1:33  Tuple0
+testdata/language-features/basic-values/if01.lc 1:13-1:17  Bool
+testdata/language-features/basic-values/if01.lc 1:13-1:25  Tuple0->Tuple0
+testdata/language-features/basic-values/if01.lc 1:23-1:25  Tuple0
+testdata/language-features/basic-values/if01.lc 1:31-1:33  Tuple0
+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
diff --git a/testdata/language-features/basic-values/indentation01.out b/testdata/language-features/basic-values/indentation01.out
index fa18480f..789ca889 100644
--- a/testdata/language-features/basic-values/indentation01.out
+++ b/testdata/language-features/basic-values/indentation01.out
@@ -1,6 +1,6 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/indentation01.lc 1:1-1:7  'Tuple0
-testdata/language-features/basic-values/indentation01.lc 1:10-1:12  'Tuple0
-testdata/language-features/basic-values/indentation01.lc 2:1-2:7  'Tuple0
-testdata/language-features/basic-values/indentation01.lc 2:10-2:12  'Tuple0
+testdata/language-features/basic-values/indentation01.lc 1:1-1:7  Tuple0
+testdata/language-features/basic-values/indentation01.lc 1:10-1:12  Tuple0
+testdata/language-features/basic-values/indentation01.lc 2:1-2:7  Tuple0
+testdata/language-features/basic-values/indentation01.lc 2:10-2:12  Tuple0
diff --git a/testdata/language-features/basic-values/indentation02.out b/testdata/language-features/basic-values/indentation02.out
index afac20be..966e3f95 100644
--- a/testdata/language-features/basic-values/indentation02.out
+++ b/testdata/language-features/basic-values/indentation02.out
@@ -1,6 +1,6 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/indentation02.lc 1:3-1:9  'Tuple0
-testdata/language-features/basic-values/indentation02.lc 1:12-1:14  'Tuple0
-testdata/language-features/basic-values/indentation02.lc 2:3-2:9  'Tuple0
-testdata/language-features/basic-values/indentation02.lc 2:12-2:14  'Tuple0
+testdata/language-features/basic-values/indentation02.lc 1:3-1:9  Tuple0
+testdata/language-features/basic-values/indentation02.lc 1:12-1:14  Tuple0
+testdata/language-features/basic-values/indentation02.lc 2:3-2:9  Tuple0
+testdata/language-features/basic-values/indentation02.lc 2:12-2:14  Tuple0
diff --git a/testdata/language-features/basic-values/infix01.out b/testdata/language-features/basic-values/infix01.out
index 349c7401..227f093a 100644
--- a/testdata/language-features/basic-values/infix01.out
+++ b/testdata/language-features/basic-values/infix01.out
@@ -1,10 +1,10 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/infix01.lc 1:1-1:4  {a} -> {b} -> a -> b->'Tuple0
-testdata/language-features/basic-values/infix01.lc 1:11-1:13  'Tuple0
-testdata/language-features/basic-values/infix01.lc 3:1-3:6  {a} -> {b} -> a -> b->'Tuple0
+testdata/language-features/basic-values/infix01.lc 1:1-1:4  {a} -> {b} -> a -> b->Tuple0
+testdata/language-features/basic-values/infix01.lc 1:11-1:13  Tuple0
+testdata/language-features/basic-values/infix01.lc 3:1-3:6  {a} -> {b} -> a -> b->Tuple0
 testdata/language-features/basic-values/infix01.lc 3:13-3:14  V5
-testdata/language-features/basic-values/infix01.lc 3:13-3:20  V0->'Tuple0
-testdata/language-features/basic-values/infix01.lc 3:13-3:22  'Tuple0
-testdata/language-features/basic-values/infix01.lc 3:15-3:20  {a} -> {b} -> a -> b->'Tuple0
+testdata/language-features/basic-values/infix01.lc 3:13-3:20  V0->Tuple0
+testdata/language-features/basic-values/infix01.lc 3:13-3:22  Tuple0
+testdata/language-features/basic-values/infix01.lc 3:15-3:20  {a} -> {b} -> a -> b->Tuple0
 testdata/language-features/basic-values/infix01.lc 3:21-3:22  V2
diff --git a/testdata/language-features/basic-values/infix02.out b/testdata/language-features/basic-values/infix02.out
index 369824b8..cd078968 100644
--- a/testdata/language-features/basic-values/infix02.out
+++ b/testdata/language-features/basic-values/infix02.out
@@ -1,10 +1,10 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/infix02.lc 1:1-1:4  {a} -> {b} -> {c} -> a -> b -> c->'Tuple0
-testdata/language-features/basic-values/infix02.lc 1:13-1:15  'Tuple0
-testdata/language-features/basic-values/infix02.lc 3:1-3:6  {a} -> {b} -> {c} -> a -> b -> c->'Tuple0
+testdata/language-features/basic-values/infix02.lc 1:1-1:4  {a} -> {b} -> {c} -> a -> b -> c->Tuple0
+testdata/language-features/basic-values/infix02.lc 1:13-1:15  Tuple0
+testdata/language-features/basic-values/infix02.lc 3:1-3:6  {a} -> {b} -> {c} -> a -> b -> c->Tuple0
 testdata/language-features/basic-values/infix02.lc 3:13-3:14  V6
-testdata/language-features/basic-values/infix02.lc 3:13-3:20  V1 -> V1->'Tuple0
-testdata/language-features/basic-values/infix02.lc 3:13-3:22  V0->'Tuple0
-testdata/language-features/basic-values/infix02.lc 3:15-3:20  {a} -> {b} -> {c} -> a -> b -> c->'Tuple0
+testdata/language-features/basic-values/infix02.lc 3:13-3:20  V1 -> V1->Tuple0
+testdata/language-features/basic-values/infix02.lc 3:13-3:22  V0->Tuple0
+testdata/language-features/basic-values/infix02.lc 3:15-3:20  {a} -> {b} -> {c} -> a -> b -> c->Tuple0
 testdata/language-features/basic-values/infix02.lc 3:21-3:22  V3
diff --git a/testdata/language-features/basic-values/infix03.out b/testdata/language-features/basic-values/infix03.out
index 52825833..3ea98c13 100644
--- a/testdata/language-features/basic-values/infix03.out
+++ b/testdata/language-features/basic-values/infix03.out
@@ -4,22 +4,22 @@ 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 | 'Tuple0 -> 'Tuple0->'D | Type
+testdata/language-features/basic-values/infix03.lc 1:10-1:12  D | Tuple0 -> Tuple0->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 | 'Tuple0 -> 'Tuple0 -> 'Tuple0->'D | Type
+testdata/language-features/basic-values/infix03.lc 2:10-2:12  D | Tuple0 -> Tuple0 -> Tuple0->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  'Tuple0 -> 'Tuple0->'D
+testdata/language-features/basic-values/infix03.lc 4:1-4:3  Tuple0 -> Tuple0->D
 testdata/language-features/basic-values/infix03.lc 4:10-4:11  V3
-testdata/language-features/basic-values/infix03.lc 4:10-4:16  'Tuple0->'D
-testdata/language-features/basic-values/infix03.lc 4:10-4:18  'D
-testdata/language-features/basic-values/infix03.lc 4:12-4:16  'Tuple0 -> 'Tuple0->'D
+testdata/language-features/basic-values/infix03.lc 4:10-4:16  Tuple0->D
+testdata/language-features/basic-values/infix03.lc 4:10-4:18  D
+testdata/language-features/basic-values/infix03.lc 4:12-4:16  Tuple0 -> Tuple0->D
 testdata/language-features/basic-values/infix03.lc 4:17-4:18  V1
-testdata/language-features/basic-values/infix03.lc 6:1-6:3  'Tuple0 -> 'Tuple0 -> 'Tuple0->'D
+testdata/language-features/basic-values/infix03.lc 6:1-6:3  Tuple0 -> Tuple0 -> Tuple0->D
 testdata/language-features/basic-values/infix03.lc 6:10-6:11  V3
-testdata/language-features/basic-values/infix03.lc 6:10-6:16  'Tuple0 -> 'Tuple0->'D
-testdata/language-features/basic-values/infix03.lc 6:10-6:18  'Tuple0->'D
-testdata/language-features/basic-values/infix03.lc 6:12-6:16  'Tuple0 -> 'Tuple0 -> 'Tuple0->'D
+testdata/language-features/basic-values/infix03.lc 6:10-6:16  Tuple0 -> Tuple0->D
+testdata/language-features/basic-values/infix03.lc 6:10-6:18  Tuple0->D
+testdata/language-features/basic-values/infix03.lc 6:12-6:16  Tuple0 -> Tuple0 -> Tuple0->D
 testdata/language-features/basic-values/infix03.lc 6:17-6:18  V1
diff --git a/testdata/language-features/basic-values/lambda01.out b/testdata/language-features/basic-values/lambda01.out
index adc399ca..35a904e4 100644
--- a/testdata/language-features/basic-values/lambda01.out
+++ b/testdata/language-features/basic-values/lambda01.out
@@ -1,10 +1,10 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/lambda01.lc 1:1-1:5  {a} -> a->'Tuple0
-testdata/language-features/basic-values/lambda01.lc 1:14-1:16  'Tuple0
-testdata/language-features/basic-values/lambda01.lc 2:1-2:5  {a} -> a->'Tuple0
-testdata/language-features/basic-values/lambda01.lc 2:15-2:17  'Tuple0
-testdata/language-features/basic-values/lambda01.lc 3:1-3:5  {a} -> a->'Tuple0
-testdata/language-features/basic-values/lambda01.lc 3:13-3:15  'Tuple0
-testdata/language-features/basic-values/lambda01.lc 4:1-4:5  {a} -> {b} -> {c} -> {d} -> {e} -> {f} -> {g} -> {h} -> {i} -> a -> b -> c -> d -> e -> f -> g -> h -> i->'Tuple0
-testdata/language-features/basic-values/lambda01.lc 5:28-5:30  'Tuple0
+testdata/language-features/basic-values/lambda01.lc 1:1-1:5  {a} -> a->Tuple0
+testdata/language-features/basic-values/lambda01.lc 1:14-1:16  Tuple0
+testdata/language-features/basic-values/lambda01.lc 2:1-2:5  {a} -> a->Tuple0
+testdata/language-features/basic-values/lambda01.lc 2:15-2:17  Tuple0
+testdata/language-features/basic-values/lambda01.lc 3:1-3:5  {a} -> a->Tuple0
+testdata/language-features/basic-values/lambda01.lc 3:13-3:15  Tuple0
+testdata/language-features/basic-values/lambda01.lc 4:1-4:5  {a} -> {b} -> {c} -> {d} -> {e} -> {f} -> {g} -> {h} -> {i} -> a -> b -> c -> d -> e -> f -> g -> h -> i->Tuple0
+testdata/language-features/basic-values/lambda01.lc 5:28-5:30  Tuple0
diff --git a/testdata/language-features/basic-values/let01.out b/testdata/language-features/basic-values/let01.out
index c1839659..d3ac201f 100644
--- a/testdata/language-features/basic-values/let01.out
+++ b/testdata/language-features/basic-values/let01.out
@@ -1,8 +1,8 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/let01.lc 1:1-1:7  {a} -> {b : 'Num a}->a
-testdata/language-features/basic-values/let01.lc 3:1-3:7  {a} -> {b : 'Num a}->a
-testdata/language-features/basic-values/let01.lc 7:1-7:7  {a} -> {b : 'Num a}->a
-testdata/language-features/basic-values/let01.lc 9:11-9:14  'Char
-testdata/language-features/basic-values/let01.lc 12:1-12:7  {a} -> {b : 'Num a}->a
-testdata/language-features/basic-values/let01.lc 15:1-15:7  {a} -> {b : 'Num a}->a
+testdata/language-features/basic-values/let01.lc 1:1-1:7  {a} -> {b : Num a}->a
+testdata/language-features/basic-values/let01.lc 3:1-3:7  {a} -> {b : Num a}->a
+testdata/language-features/basic-values/let01.lc 7:1-7:7  {a} -> {b : Num a}->a
+testdata/language-features/basic-values/let01.lc 9:11-9:14  Char
+testdata/language-features/basic-values/let01.lc 12:1-12:7  {a} -> {b : Num a}->a
+testdata/language-features/basic-values/let01.lc 15:1-15:7  {a} -> {b : Num a}->a
diff --git a/testdata/language-features/basic-values/let02.out b/testdata/language-features/basic-values/let02.out
index cfb749f7..f2a1422b 100644
--- a/testdata/language-features/basic-values/let02.out
+++ b/testdata/language-features/basic-values/let02.out
@@ -1,10 +1,10 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/let02.lc 1:1-1:6  'Tuple0
-testdata/language-features/basic-values/let02.lc 2:11-2:13  'Tuple0
-testdata/language-features/basic-values/let02.lc 3:19-3:22  'Char
-testdata/language-features/basic-values/let02.lc 3:26-3:28  'Tuple0
-testdata/language-features/basic-values/let02.lc 5:17-5:19  'Tuple0
-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  'Tuple0
+testdata/language-features/basic-values/let02.lc 1:1-1:6  Tuple0
+testdata/language-features/basic-values/let02.lc 2:11-2:13  Tuple0
+testdata/language-features/basic-values/let02.lc 3:19-3:22  Char
+testdata/language-features/basic-values/let02.lc 3:26-3:28  Tuple0
+testdata/language-features/basic-values/let02.lc 5:17-5:19  Tuple0
+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  Tuple0
diff --git a/testdata/language-features/basic-values/literal01.out b/testdata/language-features/basic-values/literal01.out
index 59d11b0a..6e617798 100644
--- a/testdata/language-features/basic-values/literal01.out
+++ b/testdata/language-features/basic-values/literal01.out
@@ -1,17 +1,17 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/literal01.lc 1:1-1:10  {a} -> {b : 'Num a}->a
-testdata/language-features/basic-values/literal01.lc 2:1-2:10  {a} -> {b : 'Num a}->a
-testdata/language-features/basic-values/literal01.lc 3:1-3:10  {a} -> {b : 'Num a}->a
-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 13:1-13:9  'Int
-testdata/language-features/basic-values/literal01.lc 13:12-13:17  'Int
+testdata/language-features/basic-values/literal01.lc 1:1-1:10  {a} -> {b : Num a}->a
+testdata/language-features/basic-values/literal01.lc 2:1-2:10  {a} -> {b : Num a}->a
+testdata/language-features/basic-values/literal01.lc 3:1-3:10  {a} -> {b : Num a}->a
+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 13:1-13:9  Int
+testdata/language-features/basic-values/literal01.lc 13:12-13:17  Int
diff --git a/testdata/language-features/basic-values/operator01.out b/testdata/language-features/basic-values/operator01.out
index 42644849..5f3b4b37 100644
--- a/testdata/language-features/basic-values/operator01.out
+++ b/testdata/language-features/basic-values/operator01.out
@@ -1,10 +1,10 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/operator01.lc 1:3-1:6  {a} -> {b} -> a -> b->'Tuple0
-testdata/language-features/basic-values/operator01.lc 1:11-1:13  'Tuple0
-testdata/language-features/basic-values/operator01.lc 3:3-3:6  {a} -> {b} -> a -> b->'Tuple0
-testdata/language-features/basic-values/operator01.lc 3:8-3:10  'Tuple0
-testdata/language-features/basic-values/operator01.lc 5:3-5:7  {a} -> {b} -> a -> b->'Tuple0
-testdata/language-features/basic-values/operator01.lc 6:3-6:5  'Tuple0
-testdata/language-features/basic-values/operator01.lc 8:3-8:6  {a} -> {b} -> a -> b->'Tuple0
-testdata/language-features/basic-values/operator01.lc 8:11-8:13  'Tuple0
+testdata/language-features/basic-values/operator01.lc 1:3-1:6  {a} -> {b} -> a -> b->Tuple0
+testdata/language-features/basic-values/operator01.lc 1:11-1:13  Tuple0
+testdata/language-features/basic-values/operator01.lc 3:3-3:6  {a} -> {b} -> a -> b->Tuple0
+testdata/language-features/basic-values/operator01.lc 3:8-3:10  Tuple0
+testdata/language-features/basic-values/operator01.lc 5:3-5:7  {a} -> {b} -> a -> b->Tuple0
+testdata/language-features/basic-values/operator01.lc 6:3-6:5  Tuple0
+testdata/language-features/basic-values/operator01.lc 8:3-8:6  {a} -> {b} -> a -> b->Tuple0
+testdata/language-features/basic-values/operator01.lc 8:11-8:13  Tuple0
diff --git a/testdata/language-features/basic-values/operator05.out b/testdata/language-features/basic-values/operator05.out
index 8aca3631..6db1b531 100644
--- a/testdata/language-features/basic-values/operator05.out
+++ b/testdata/language-features/basic-values/operator05.out
@@ -1,9 +1,9 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/operator05.lc 1:1-1:7  'Tuple0
-testdata/language-features/basic-values/operator05.lc 1:24-1:26  'Tuple0
-testdata/language-features/basic-values/operator05.lc 2:13-2:15  'Tuple0
-testdata/language-features/basic-values/operator05.lc 2:13-2:19  V0->'Tuple0
-testdata/language-features/basic-values/operator05.lc 2:13-2:22  'Tuple0
-testdata/language-features/basic-values/operator05.lc 2:16-2:19  {a} -> {b} -> a -> b->'Tuple0
-testdata/language-features/basic-values/operator05.lc 2:20-2:22  'Tuple0
+testdata/language-features/basic-values/operator05.lc 1:1-1:7  Tuple0
+testdata/language-features/basic-values/operator05.lc 1:24-1:26  Tuple0
+testdata/language-features/basic-values/operator05.lc 2:13-2:15  Tuple0
+testdata/language-features/basic-values/operator05.lc 2:13-2:19  V0->Tuple0
+testdata/language-features/basic-values/operator05.lc 2:13-2:22  Tuple0
+testdata/language-features/basic-values/operator05.lc 2:16-2:19  {a} -> {b} -> a -> b->Tuple0
+testdata/language-features/basic-values/operator05.lc 2:20-2:22  Tuple0
diff --git a/testdata/language-features/basic-values/operator06.out b/testdata/language-features/basic-values/operator06.out
index 84809047..971fa41e 100644
--- a/testdata/language-features/basic-values/operator06.out
+++ b/testdata/language-features/basic-values/operator06.out
@@ -1,9 +1,9 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/operator06.lc 1:1-1:7  'Tuple0
-testdata/language-features/basic-values/operator06.lc 1:10-1:12  'Tuple0
-testdata/language-features/basic-values/operator06.lc 1:10-1:16  V0->'Tuple0
-testdata/language-features/basic-values/operator06.lc 1:10-1:19  'Tuple0
-testdata/language-features/basic-values/operator06.lc 1:13-1:16  {a} -> {b} -> a -> b->'Tuple0
-testdata/language-features/basic-values/operator06.lc 1:17-1:19  'Tuple0
-testdata/language-features/basic-values/operator06.lc 2:19-2:21  'Tuple0
+testdata/language-features/basic-values/operator06.lc 1:1-1:7  Tuple0
+testdata/language-features/basic-values/operator06.lc 1:10-1:12  Tuple0
+testdata/language-features/basic-values/operator06.lc 1:10-1:16  V0->Tuple0
+testdata/language-features/basic-values/operator06.lc 1:10-1:19  Tuple0
+testdata/language-features/basic-values/operator06.lc 1:13-1:16  {a} -> {b} -> a -> b->Tuple0
+testdata/language-features/basic-values/operator06.lc 1:17-1:19  Tuple0
+testdata/language-features/basic-values/operator06.lc 2:19-2:21  Tuple0
diff --git a/testdata/language-features/basic-values/shadowing01.out b/testdata/language-features/basic-values/shadowing01.out
index c353f840..cb1b5854 100644
--- a/testdata/language-features/basic-values/shadowing01.out
+++ b/testdata/language-features/basic-values/shadowing01.out
@@ -1,12 +1,12 @@
 main is not found
 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 6:17-6:21  'Float
-testdata/language-features/basic-values/shadowing01.lc 7:25-7:27  'Tuple0
-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  'Tuple0
-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 6:17-6:21  Float
+testdata/language-features/basic-values/shadowing01.lc 7:25-7:27  Tuple0
+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  Tuple0
+testdata/language-features/basic-values/shadowing01.lc 12:6-12:9  Char
diff --git a/testdata/language-features/basic-values/shadowing02.out b/testdata/language-features/basic-values/shadowing02.out
index fbd7086d..331be727 100644
--- a/testdata/language-features/basic-values/shadowing02.out
+++ b/testdata/language-features/basic-values/shadowing02.out
@@ -1,16 +1,16 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/shadowing02.lc 1:1-1:2  {a} -> {b : 'Num a}->a
-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 9:17-9:21  'Float
-testdata/language-features/basic-values/shadowing02.lc 10:25-10:27  'Tuple0
-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  {a} -> {b : '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  'Tuple0
-testdata/language-features/basic-values/shadowing02.lc 16:6-16:9  'Char
+testdata/language-features/basic-values/shadowing02.lc 1:1-1:2  {a} -> {b : Num a}->a
+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 9:17-9:21  Float
+testdata/language-features/basic-values/shadowing02.lc 10:25-10:27  Tuple0
+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  {a} -> {b : 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  Tuple0
+testdata/language-features/basic-values/shadowing02.lc 16:6-16:9  Char
diff --git a/testdata/language-features/basic-values/shadowing03.out b/testdata/language-features/basic-values/shadowing03.out
index ce575dd0..7c9acac3 100644
--- a/testdata/language-features/basic-values/shadowing03.out
+++ b/testdata/language-features/basic-values/shadowing03.out
@@ -1,4 +1,4 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/shadowing03.lc 1:1-1:2  {a} -> {b} -> a -> b->'Tuple0
-testdata/language-features/basic-values/shadowing03.lc 1:9-1:11  'Tuple0
+testdata/language-features/basic-values/shadowing03.lc 1:1-1:2  {a} -> {b} -> a -> b->Tuple0
+testdata/language-features/basic-values/shadowing03.lc 1:9-1:11  Tuple0
diff --git a/testdata/language-features/basic-values/shadowing04.out b/testdata/language-features/basic-values/shadowing04.out
index 578c2df0..78a51c1c 100644
--- a/testdata/language-features/basic-values/shadowing04.out
+++ b/testdata/language-features/basic-values/shadowing04.out
@@ -1,4 +1,4 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/shadowing04.lc 1:1-1:3  {a} -> {b} -> a -> b->'Tuple0
-testdata/language-features/basic-values/shadowing04.lc 1:11-1:13  'Tuple0
+testdata/language-features/basic-values/shadowing04.lc 1:1-1:3  {a} -> {b} -> a -> b->Tuple0
+testdata/language-features/basic-values/shadowing04.lc 1:11-1:13  Tuple0
diff --git a/testdata/language-features/basic-values/tuple01.out b/testdata/language-features/basic-values/tuple01.out
index b903c9f1..3730ce32 100644
--- a/testdata/language-features/basic-values/tuple01.out
+++ b/testdata/language-features/basic-values/tuple01.out
@@ -1,4 +1,4 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/tuple01.lc 1:1-1:5  'Tuple0
-testdata/language-features/basic-values/tuple01.lc 1:8-1:10  'Tuple0
+testdata/language-features/basic-values/tuple01.lc 1:1-1:5  Tuple0
+testdata/language-features/basic-values/tuple01.lc 1:8-1:10  Tuple0
diff --git a/testdata/language-features/basic-values/tuple02.out b/testdata/language-features/basic-values/tuple02.out
index 16196efc..a2c89771 100644
--- a/testdata/language-features/basic-values/tuple02.out
+++ b/testdata/language-features/basic-values/tuple02.out
@@ -1,22 +1,22 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/tuple02.lc 1:1-1:7  {a} -> {b : 'Num a} -> 'Tuple5 a 'Float 'Char 'String 'Tuple0
-testdata/language-features/basic-values/tuple02.lc 1:10-1:33  'Tuple5 V1 'Float 'Char 'String 'Tuple0
+testdata/language-features/basic-values/tuple02.lc 1:1-1:7  {a} -> {b : Num a} -> Tuple5 a Float Char String Tuple0
+testdata/language-features/basic-values/tuple02.lc 1:10-1:33  Tuple5 V1 Float Char String Tuple0
 testdata/language-features/basic-values/tuple02.lc 1:11-1:12  V1
-testdata/language-features/basic-values/tuple02.lc 1:11-1:16  V3 -> V3 -> V3 -> 'Tuple5 V7 'Float V6 V5 V4
-testdata/language-features/basic-values/tuple02.lc 1:11-1:20  V2 -> V2 -> 'Tuple5 V5 'Float 'Char V4 V3
-testdata/language-features/basic-values/tuple02.lc 1:11-1:29  V1 -> 'Tuple5 V3 'Float 'Char 'String V2
-testdata/language-features/basic-values/tuple02.lc 1:13-1:16  'Float
-testdata/language-features/basic-values/tuple02.lc 1:17-1:20  'Char
-testdata/language-features/basic-values/tuple02.lc 1:21-1:29  'String
-testdata/language-features/basic-values/tuple02.lc 1:30-1:32  'Tuple0
-testdata/language-features/basic-values/tuple02.lc 3:1-3:7  'Tuple2 'Tuple0 'Tuple0
-testdata/language-features/basic-values/tuple02.lc 3:10-3:17  'Tuple2 'Tuple0 'Tuple0
-testdata/language-features/basic-values/tuple02.lc 3:11-3:13  'Tuple0
-testdata/language-features/basic-values/tuple02.lc 3:14-3:16  'Tuple0
-testdata/language-features/basic-values/tuple02.lc 5:1-5:7  'Tuple2 ('Tuple2 'String 'Char) 'Tuple0
-testdata/language-features/basic-values/tuple02.lc 5:10-5:27  'Tuple2 ('Tuple2 'String 'Char) 'Tuple0
-testdata/language-features/basic-values/tuple02.lc 5:11-5:23  'Tuple2 '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
-testdata/language-features/basic-values/tuple02.lc 5:24-5:26  'Tuple0
+testdata/language-features/basic-values/tuple02.lc 1:11-1:16  V3 -> V3 -> V3 -> Tuple5 V7 Float V6 V5 V4
+testdata/language-features/basic-values/tuple02.lc 1:11-1:20  V2 -> V2 -> Tuple5 V5 Float Char V4 V3
+testdata/language-features/basic-values/tuple02.lc 1:11-1:29  V1 -> Tuple5 V3 Float Char String V2
+testdata/language-features/basic-values/tuple02.lc 1:13-1:16  Float
+testdata/language-features/basic-values/tuple02.lc 1:17-1:20  Char
+testdata/language-features/basic-values/tuple02.lc 1:21-1:29  String
+testdata/language-features/basic-values/tuple02.lc 1:30-1:32  Tuple0
+testdata/language-features/basic-values/tuple02.lc 3:1-3:7  Tuple2 Tuple0 Tuple0
+testdata/language-features/basic-values/tuple02.lc 3:10-3:17  Tuple2 Tuple0 Tuple0
+testdata/language-features/basic-values/tuple02.lc 3:11-3:13  Tuple0
+testdata/language-features/basic-values/tuple02.lc 3:14-3:16  Tuple0
+testdata/language-features/basic-values/tuple02.lc 5:1-5:7  Tuple2 (Tuple2 String Char) Tuple0
+testdata/language-features/basic-values/tuple02.lc 5:10-5:27  Tuple2 (Tuple2 String Char) Tuple0
+testdata/language-features/basic-values/tuple02.lc 5:11-5:23  Tuple2 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
+testdata/language-features/basic-values/tuple02.lc 5:24-5:26  Tuple0
diff --git a/testdata/language-features/basic-values/typesig01.out b/testdata/language-features/basic-values/typesig01.out
index d3ed98c8..4bc341af 100644
--- a/testdata/language-features/basic-values/typesig01.out
+++ b/testdata/language-features/basic-values/typesig01.out
@@ -1,8 +1,8 @@
 main is not found
 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 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 5:1-5:7  Char
+testdata/language-features/basic-values/typesig01.lc 5:8-5:11  Char
diff --git a/testdata/language-features/basic-values/typesig02.out b/testdata/language-features/basic-values/typesig02.out
index 1acc798b..0696e2c4 100644
--- a/testdata/language-features/basic-values/typesig02.out
+++ b/testdata/language-features/basic-values/typesig02.out
@@ -1,8 +1,8 @@
 main is not found
 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: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: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
diff --git a/testdata/language-features/basic-values/typesig03.out b/testdata/language-features/basic-values/typesig03.out
index f276a8af..83bb29ed 100644
--- a/testdata/language-features/basic-values/typesig03.out
+++ b/testdata/language-features/basic-values/typesig03.out
@@ -7,8 +7,8 @@ testdata/language-features/basic-values/typesig03.lc 1:14-1:26  Type
 testdata/language-features/basic-values/typesig03.lc 1:19-1:20  V3
 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  {a} -> {b} -> {c} -> a -> b -> c->'Tuple0
-testdata/language-features/basic-values/typesig03.lc 2:14-2:16  'Tuple0 | V2 -> V2 -> V2->'Tuple0 | V2 -> V2->'Tuple0 | V2->'Tuple0
+testdata/language-features/basic-values/typesig03.lc 2:1-2:5  {a} -> {b} -> {c} -> a -> b -> c->Tuple0
+testdata/language-features/basic-values/typesig03.lc 2:14-2:16  Tuple0 | V2 -> V2 -> V2->Tuple0 | V2 -> V2->Tuple0 | V2->Tuple0
 testdata/language-features/basic-values/typesig03.lc 4:7-4:8  V5
 testdata/language-features/basic-values/typesig03.lc 4:7-4:18  Type
 testdata/language-features/basic-values/typesig03.lc 4:10-4:11  V4
@@ -16,5 +16,5 @@ testdata/language-features/basic-values/typesig03.lc 4:10-4:18  Type
 testdata/language-features/basic-values/typesig03.lc 4:13-4:14  V3
 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  {a} -> {b} -> {c} -> a -> b -> c->'Tuple0
-testdata/language-features/basic-values/typesig03.lc 5:14-5:16  'Tuple0 | V2 -> V2 -> V2->'Tuple0 | V2 -> V2->'Tuple0 | V2->'Tuple0
+testdata/language-features/basic-values/typesig03.lc 5:1-5:5  {a} -> {b} -> {c} -> a -> b -> c->Tuple0
+testdata/language-features/basic-values/typesig03.lc 5:14-5:16  Tuple0 | V2 -> V2 -> V2->Tuple0 | V2 -> V2->Tuple0 | V2->Tuple0
diff --git a/testdata/language-features/basic-values/typesig04.out b/testdata/language-features/basic-values/typesig04.out
index 05c6883b..67b6024c 100644
--- a/testdata/language-features/basic-values/typesig04.out
+++ b/testdata/language-features/basic-values/typesig04.out
@@ -6,13 +6,13 @@ testdata/language-features/basic-values/typesig04.lc 1:14-1:28  Type
 testdata/language-features/basic-values/typesig04.lc 1:15-1:16  V4
 testdata/language-features/basic-values/typesig04.lc 1:20-1:21  Type | V3
 testdata/language-features/basic-values/typesig04.lc 1:26-1:28  Type
-testdata/language-features/basic-values/typesig04.lc 2:1-2:5  {a} -> {b} -> {c} -> a -> b->c -> 'Tuple0
-testdata/language-features/basic-values/typesig04.lc 2:12-2:14  'Tuple0 | V2 -> V2->V2 -> 'Tuple0 | V2->V2 -> 'Tuple0
+testdata/language-features/basic-values/typesig04.lc 2:1-2:5  {a} -> {b} -> {c} -> a -> b->c -> Tuple0
+testdata/language-features/basic-values/typesig04.lc 2:12-2:14  Tuple0 | V2 -> V2->V2 -> Tuple0 | V2->V2 -> Tuple0
 testdata/language-features/basic-values/typesig04.lc 4:7-4:8  V5
 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  V4
 testdata/language-features/basic-values/typesig04.lc 4:14-4:15  Type | V3
 testdata/language-features/basic-values/typesig04.lc 4:18-4:20  Type
-testdata/language-features/basic-values/typesig04.lc 5:1-5:5  {a} -> {b} -> {c} -> a -> b->c -> 'Tuple0
-testdata/language-features/basic-values/typesig04.lc 5:12-5:14  'Tuple0 | V2 -> V2->V2 -> 'Tuple0 | V2->V2 -> 'Tuple0
+testdata/language-features/basic-values/typesig04.lc 5:1-5:5  {a} -> {b} -> {c} -> a -> b->c -> Tuple0
+testdata/language-features/basic-values/typesig04.lc 5:12-5:14  Tuple0 | V2 -> V2->V2 -> Tuple0 | V2->V2 -> Tuple0
diff --git a/testdata/language-features/basic-values/typesig05.out b/testdata/language-features/basic-values/typesig05.out
index 811f5b04..ed87531d 100644
--- a/testdata/language-features/basic-values/typesig05.out
+++ b/testdata/language-features/basic-values/typesig05.out
@@ -4,31 +4,31 @@ testdata/language-features/basic-values/typesig05.lc 1:1-1:5  {a} -> {b} -> a ->
 testdata/language-features/basic-values/typesig05.lc 1:12-1:13  V3
 testdata/language-features/basic-values/typesig05.lc 2:1-2:5  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/typesig05.lc 2:12-2:13  V1
-testdata/language-features/basic-values/typesig05.lc 4:1-4:7  'Char
+testdata/language-features/basic-values/typesig05.lc 4:1-4:7  Char
 testdata/language-features/basic-values/typesig05.lc 4:10-4:14  {a} -> {b} -> a -> b->a
-testdata/language-features/basic-values/typesig05.lc 4:10-4:18  V0->'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:10-4:18  V0->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:1-5:7  String
 testdata/language-features/basic-values/typesig05.lc 5:10-5:14  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/typesig05.lc 5:10-5:18  V0->V1
-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: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:1-8:7  Char
 testdata/language-features/basic-values/typesig05.lc 8:10-8:14  {a} -> {b} -> a -> b->a
-testdata/language-features/basic-values/typesig05.lc 8:10-8:18  V0->'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 8:10-8:18  V0->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:1-11:7  String
 testdata/language-features/basic-values/typesig05.lc 11:10-11:14  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/typesig05.lc 11:10-11:18  V0->V1
-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 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
diff --git a/testdata/language-features/basic-values/typesig07.out b/testdata/language-features/basic-values/typesig07.out
index 018cbdae..be3b738a 100644
--- a/testdata/language-features/basic-values/typesig07.out
+++ b/testdata/language-features/basic-values/typesig07.out
@@ -1,19 +1,19 @@
 main is not found
 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:1-3:7  Int
 testdata/language-features/basic-values/typesig07.lc 3:10-3:11  V1
-testdata/language-features/basic-values/typesig07.lc 4:1-4:7  'Int
+testdata/language-features/basic-values/typesig07.lc 4:1-4:7  Int
 testdata/language-features/basic-values/typesig07.lc 4:10-4:11  V1
-testdata/language-features/basic-values/typesig07.lc 5:1-5:7  'Int
+testdata/language-features/basic-values/typesig07.lc 5:1-5:7  Int
 testdata/language-features/basic-values/typesig07.lc 5:10-5:11  V1
 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  'Tuple0 -> 'Tuple0->'Tuple0
-testdata/language-features/basic-values/typesig07.lc 10:14-10:16  'Tuple0 | 'Tuple0 -> 'Tuple0->'Tuple0 | 'Tuple0->'Tuple0
-testdata/language-features/basic-values/typesig07.lc 11:3-11:6  'Tuple0 -> 'Tuple0->'Tuple0
-testdata/language-features/basic-values/typesig07.lc 11:11-11:13  'Tuple0 | 'Tuple0 -> 'Tuple0->'Tuple0 | 'Tuple0->'Tuple0
-testdata/language-features/basic-values/typesig07.lc 12:1-12:7  'Tuple0 -> 'Tuple0->'Tuple0
-testdata/language-features/basic-values/typesig07.lc 12:14-12:16  'Tuple0 | 'Tuple0 -> 'Tuple0->'Tuple0 | 'Tuple0->'Tuple0
+testdata/language-features/basic-values/typesig07.lc 10:1-10:7  Tuple0 -> Tuple0->Tuple0
+testdata/language-features/basic-values/typesig07.lc 10:14-10:16  Tuple0 | Tuple0 -> Tuple0->Tuple0 | Tuple0->Tuple0
+testdata/language-features/basic-values/typesig07.lc 11:3-11:6  Tuple0 -> Tuple0->Tuple0
+testdata/language-features/basic-values/typesig07.lc 11:11-11:13  Tuple0 | Tuple0 -> Tuple0->Tuple0 | Tuple0->Tuple0
+testdata/language-features/basic-values/typesig07.lc 12:1-12:7  Tuple0 -> Tuple0->Tuple0
+testdata/language-features/basic-values/typesig07.lc 12:14-12:16  Tuple0 | Tuple0 -> Tuple0->Tuple0 | Tuple0->Tuple0
diff --git a/testdata/language-features/basic-values/typesyn02.out b/testdata/language-features/basic-values/typesyn02.out
index 8850167f..1244784d 100644
--- a/testdata/language-features/basic-values/typesyn02.out
+++ b/testdata/language-features/basic-values/typesyn02.out
@@ -7,5 +7,5 @@ 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  {a} -> a -> 'Tuple0->'Tuple0
-testdata/language-features/basic-values/typesyn02.lc 4:12-4:14  'Tuple0 | 'Tuple0->'Tuple0 | V0 -> 'Tuple0->'Tuple0
+testdata/language-features/basic-values/typesyn02.lc 4:1-4:4  {a} -> a -> Tuple0->Tuple0
+testdata/language-features/basic-values/typesyn02.lc 4:12-4:14  Tuple0 | Tuple0->Tuple0 | V0 -> Tuple0->Tuple0
diff --git a/testdata/language-features/basic-values/where01.out b/testdata/language-features/basic-values/where01.out
index 3ee28c13..e8ada47e 100644
--- a/testdata/language-features/basic-values/where01.out
+++ b/testdata/language-features/basic-values/where01.out
@@ -1,38 +1,38 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/where01.lc 1:1-1:7  'Tuple0
-testdata/language-features/basic-values/where01.lc 1:10-1:12  'Tuple0
-testdata/language-features/basic-values/where01.lc 1:23-1:25  'Tuple0
-testdata/language-features/basic-values/where01.lc 3:1-3:7  'Tuple0
-testdata/language-features/basic-values/where01.lc 3:10-3:11  'Tuple0
-testdata/language-features/basic-values/where01.lc 4:12-4:14  'Tuple0
-testdata/language-features/basic-values/where01.lc 6:1-6:7  'Tuple0
-testdata/language-features/basic-values/where01.lc 6:10-6:11  'Tuple0
-testdata/language-features/basic-values/where01.lc 7:12-7:14  'Tuple0
-testdata/language-features/basic-values/where01.lc 8:12-8:14  'Tuple0
-testdata/language-features/basic-values/where01.lc 10:1-10:7  'Tuple0
-testdata/language-features/basic-values/where01.lc 10:10-10:11  'Tuple0
-testdata/language-features/basic-values/where01.lc 12:6-12:8  'Tuple0
-testdata/language-features/basic-values/where01.lc 13:6-13:8  'Tuple0
-testdata/language-features/basic-values/where01.lc 15:1-15:7  'Tuple0
-testdata/language-features/basic-values/where01.lc 15:10-15:11  'Tuple0
-testdata/language-features/basic-values/where01.lc 17:7-17:9  'Tuple0
-testdata/language-features/basic-values/where01.lc 18:7-18:9  'Tuple0
-testdata/language-features/basic-values/where01.lc 20:1-20:7  'Tuple0
-testdata/language-features/basic-values/where01.lc 20:10-20:12  'Tuple0
-testdata/language-features/basic-values/where01.lc 22:1-22:7  'Tuple0
-testdata/language-features/basic-values/where01.lc 22:10-22:12  'Tuple0
-testdata/language-features/basic-values/where01.lc 25:1-25:7  'Tuple0
-testdata/language-features/basic-values/where01.lc 25:10-25:12  'Tuple0
-testdata/language-features/basic-values/where01.lc 30:1-30:7  'Tuple0
-testdata/language-features/basic-values/where01.lc 30:10-30:11  'Tuple0
-testdata/language-features/basic-values/where01.lc 34:7-34:9  'Tuple0
-testdata/language-features/basic-values/where01.lc 35:7-35:9  'Tuple0
-testdata/language-features/basic-values/where01.lc 37:1-37:8  'Tuple0
-testdata/language-features/basic-values/where01.lc 37:11-37:12  'Tuple0
-testdata/language-features/basic-values/where01.lc 39:6-39:8  'Tuple0
-testdata/language-features/basic-values/where01.lc 40:6-40:8  'Tuple0
-testdata/language-features/basic-values/where01.lc 42:1-42:8  'Tuple0
-testdata/language-features/basic-values/where01.lc 42:11-42:12  'Tuple0
-testdata/language-features/basic-values/where01.lc 43:6-43:8  'Tuple0
-testdata/language-features/basic-values/where01.lc 44:6-44:8  'Tuple0
+testdata/language-features/basic-values/where01.lc 1:1-1:7  Tuple0
+testdata/language-features/basic-values/where01.lc 1:10-1:12  Tuple0
+testdata/language-features/basic-values/where01.lc 1:23-1:25  Tuple0
+testdata/language-features/basic-values/where01.lc 3:1-3:7  Tuple0
+testdata/language-features/basic-values/where01.lc 3:10-3:11  Tuple0
+testdata/language-features/basic-values/where01.lc 4:12-4:14  Tuple0
+testdata/language-features/basic-values/where01.lc 6:1-6:7  Tuple0
+testdata/language-features/basic-values/where01.lc 6:10-6:11  Tuple0
+testdata/language-features/basic-values/where01.lc 7:12-7:14  Tuple0
+testdata/language-features/basic-values/where01.lc 8:12-8:14  Tuple0
+testdata/language-features/basic-values/where01.lc 10:1-10:7  Tuple0
+testdata/language-features/basic-values/where01.lc 10:10-10:11  Tuple0
+testdata/language-features/basic-values/where01.lc 12:6-12:8  Tuple0
+testdata/language-features/basic-values/where01.lc 13:6-13:8  Tuple0
+testdata/language-features/basic-values/where01.lc 15:1-15:7  Tuple0
+testdata/language-features/basic-values/where01.lc 15:10-15:11  Tuple0
+testdata/language-features/basic-values/where01.lc 17:7-17:9  Tuple0
+testdata/language-features/basic-values/where01.lc 18:7-18:9  Tuple0
+testdata/language-features/basic-values/where01.lc 20:1-20:7  Tuple0
+testdata/language-features/basic-values/where01.lc 20:10-20:12  Tuple0
+testdata/language-features/basic-values/where01.lc 22:1-22:7  Tuple0
+testdata/language-features/basic-values/where01.lc 22:10-22:12  Tuple0
+testdata/language-features/basic-values/where01.lc 25:1-25:7  Tuple0
+testdata/language-features/basic-values/where01.lc 25:10-25:12  Tuple0
+testdata/language-features/basic-values/where01.lc 30:1-30:7  Tuple0
+testdata/language-features/basic-values/where01.lc 30:10-30:11  Tuple0
+testdata/language-features/basic-values/where01.lc 34:7-34:9  Tuple0
+testdata/language-features/basic-values/where01.lc 35:7-35:9  Tuple0
+testdata/language-features/basic-values/where01.lc 37:1-37:8  Tuple0
+testdata/language-features/basic-values/where01.lc 37:11-37:12  Tuple0
+testdata/language-features/basic-values/where01.lc 39:6-39:8  Tuple0
+testdata/language-features/basic-values/where01.lc 40:6-40:8  Tuple0
+testdata/language-features/basic-values/where01.lc 42:1-42:8  Tuple0
+testdata/language-features/basic-values/where01.lc 42:11-42:12  Tuple0
+testdata/language-features/basic-values/where01.lc 43:6-43:8  Tuple0
+testdata/language-features/basic-values/where01.lc 44:6-44:8  Tuple0
diff --git a/testdata/language-features/basic-values/where04.out b/testdata/language-features/basic-values/where04.out
index 04b1eed3..0512e9a4 100644
--- a/testdata/language-features/basic-values/where04.out
+++ b/testdata/language-features/basic-values/where04.out
@@ -1,14 +1,14 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/where04.lc 1:1-1:7  'Tuple0
-testdata/language-features/basic-values/where04.lc 1:18-1:19  'Tuple0
-testdata/language-features/basic-values/where04.lc 1:30-1:32  'Tuple0
-testdata/language-features/basic-values/where04.lc 1:36-1:37  'Tuple0
-testdata/language-features/basic-values/where04.lc 3:1-3:7  'Tuple0
-testdata/language-features/basic-values/where04.lc 3:18-3:19  'Tuple0
-testdata/language-features/basic-values/where04.lc 4:25-4:27  'Tuple0
-testdata/language-features/basic-values/where04.lc 5:13-5:14  'Tuple0
-testdata/language-features/basic-values/where04.lc 7:1-7:7  'Tuple0
-testdata/language-features/basic-values/where04.lc 7:18-7:19  'Tuple0
-testdata/language-features/basic-values/where04.lc 9:19-9:21  'Tuple0
-testdata/language-features/basic-values/where04.lc 10:13-10:14  'Tuple0
+testdata/language-features/basic-values/where04.lc 1:1-1:7  Tuple0
+testdata/language-features/basic-values/where04.lc 1:18-1:19  Tuple0
+testdata/language-features/basic-values/where04.lc 1:30-1:32  Tuple0
+testdata/language-features/basic-values/where04.lc 1:36-1:37  Tuple0
+testdata/language-features/basic-values/where04.lc 3:1-3:7  Tuple0
+testdata/language-features/basic-values/where04.lc 3:18-3:19  Tuple0
+testdata/language-features/basic-values/where04.lc 4:25-4:27  Tuple0
+testdata/language-features/basic-values/where04.lc 5:13-5:14  Tuple0
+testdata/language-features/basic-values/where04.lc 7:1-7:7  Tuple0
+testdata/language-features/basic-values/where04.lc 7:18-7:19  Tuple0
+testdata/language-features/basic-values/where04.lc 9:19-9:21  Tuple0
+testdata/language-features/basic-values/where04.lc 10:13-10:14  Tuple0
diff --git a/testdata/language-features/basic-values/where05.out b/testdata/language-features/basic-values/where05.out
index 4fa9703b..e6b1a799 100644
--- a/testdata/language-features/basic-values/where05.out
+++ b/testdata/language-features/basic-values/where05.out
@@ -1,30 +1,30 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/where05.lc 1:1-1:7  'Tuple0
-testdata/language-features/basic-values/where05.lc 1:10-3:10  'Tuple0
+testdata/language-features/basic-values/where05.lc 1:1-1:7  Tuple0
+testdata/language-features/basic-values/where05.lc 1:10-3:10  Tuple0
 testdata/language-features/basic-values/where05.lc 1:15-1:16  V1
-testdata/language-features/basic-values/where05.lc 2:8-2:9  'Tuple0
-testdata/language-features/basic-values/where05.lc 2:8-3:10  'Tuple0 -> 'Ordering->'Tuple0
-testdata/language-features/basic-values/where05.lc 2:20-2:22  'Tuple0
-testdata/language-features/basic-values/where05.lc 3:8-3:10  'Tuple0
-testdata/language-features/basic-values/where05.lc 5:1-5:7  'Tuple0
-testdata/language-features/basic-values/where05.lc 5:10-8:10  'Tuple0
+testdata/language-features/basic-values/where05.lc 2:8-2:9  Tuple0
+testdata/language-features/basic-values/where05.lc 2:8-3:10  Tuple0 -> Ordering->Tuple0
+testdata/language-features/basic-values/where05.lc 2:20-2:22  Tuple0
+testdata/language-features/basic-values/where05.lc 3:8-3:10  Tuple0
+testdata/language-features/basic-values/where05.lc 5:1-5:7  Tuple0
+testdata/language-features/basic-values/where05.lc 5:10-8:10  Tuple0
 testdata/language-features/basic-values/where05.lc 5:15-5:16  V1
-testdata/language-features/basic-values/where05.lc 6:8-6:9  'Tuple0
-testdata/language-features/basic-values/where05.lc 6:8-8:10  'Tuple0 -> 'Ordering->'Tuple0
-testdata/language-features/basic-values/where05.lc 7:14-7:16  'Tuple0
-testdata/language-features/basic-values/where05.lc 8:8-8:10  'Tuple0
-testdata/language-features/basic-values/where05.lc 10:1-10:7  'Tuple0
-testdata/language-features/basic-values/where05.lc 10:10-14:10  'Tuple0
+testdata/language-features/basic-values/where05.lc 6:8-6:9  Tuple0
+testdata/language-features/basic-values/where05.lc 6:8-8:10  Tuple0 -> Ordering->Tuple0
+testdata/language-features/basic-values/where05.lc 7:14-7:16  Tuple0
+testdata/language-features/basic-values/where05.lc 8:8-8:10  Tuple0
+testdata/language-features/basic-values/where05.lc 10:1-10:7  Tuple0
+testdata/language-features/basic-values/where05.lc 10:10-14:10  Tuple0
 testdata/language-features/basic-values/where05.lc 10:15-10:16  V1
-testdata/language-features/basic-values/where05.lc 11:8-11:9  'Tuple0
-testdata/language-features/basic-values/where05.lc 11:8-14:10  'Tuple0 -> 'Ordering->'Tuple0
-testdata/language-features/basic-values/where05.lc 13:8-13:10  'Tuple0
-testdata/language-features/basic-values/where05.lc 14:8-14:10  'Tuple0
-testdata/language-features/basic-values/where05.lc 16:1-16:7  'Tuple0
-testdata/language-features/basic-values/where05.lc 16:10-18:10  'Tuple0
+testdata/language-features/basic-values/where05.lc 11:8-11:9  Tuple0
+testdata/language-features/basic-values/where05.lc 11:8-14:10  Tuple0 -> Ordering->Tuple0
+testdata/language-features/basic-values/where05.lc 13:8-13:10  Tuple0
+testdata/language-features/basic-values/where05.lc 14:8-14:10  Tuple0
+testdata/language-features/basic-values/where05.lc 16:1-16:7  Tuple0
+testdata/language-features/basic-values/where05.lc 16:10-18:10  Tuple0
 testdata/language-features/basic-values/where05.lc 16:15-16:16  V1
-testdata/language-features/basic-values/where05.lc 17:8-17:9  'Tuple0
-testdata/language-features/basic-values/where05.lc 17:8-18:10  'Tuple0 -> 'Ordering->'Tuple0
-testdata/language-features/basic-values/where05.lc 18:8-18:10  'Tuple0
-testdata/language-features/basic-values/where05.lc 21:6-21:8  'Tuple0
+testdata/language-features/basic-values/where05.lc 17:8-17:9  Tuple0
+testdata/language-features/basic-values/where05.lc 17:8-18:10  Tuple0 -> Ordering->Tuple0
+testdata/language-features/basic-values/where05.lc 18:8-18:10  Tuple0
+testdata/language-features/basic-values/where05.lc 21:6-21:8  Tuple0
diff --git a/testdata/language-features/basic-values/wildcard01.out b/testdata/language-features/basic-values/wildcard01.out
index de6d2368..495b9ed8 100644
--- a/testdata/language-features/basic-values/wildcard01.out
+++ b/testdata/language-features/basic-values/wildcard01.out
@@ -1,4 +1,4 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/wildcard01.lc 1:1-1:8  {a} -> a->'Tuple0
-testdata/language-features/basic-values/wildcard01.lc 1:13-1:15  'Tuple0
+testdata/language-features/basic-values/wildcard01.lc 1:1-1:8  {a} -> a->Tuple0
+testdata/language-features/basic-values/wildcard01.lc 1:13-1:15  Tuple0
diff --git a/testdata/language-features/guard/guard01.out b/testdata/language-features/guard/guard01.out
index 2f57a77e..6ce8e8a4 100644
--- a/testdata/language-features/guard/guard01.out
+++ b/testdata/language-features/guard/guard01.out
@@ -1,6 +1,6 @@
 main is not found
 tooltips:
-testdata/language-features/guard/guard01.lc 1:1-1:6  'Tuple0
-testdata/language-features/guard/guard01.lc 1:9-1:13  'Bool
-testdata/language-features/guard/guard01.lc 1:9-1:18  'Tuple0
-testdata/language-features/guard/guard01.lc 1:16-1:18  'Tuple0
+testdata/language-features/guard/guard01.lc 1:1-1:6  Tuple0
+testdata/language-features/guard/guard01.lc 1:9-1:13  Bool
+testdata/language-features/guard/guard01.lc 1:9-1:18  Tuple0
+testdata/language-features/guard/guard01.lc 1:16-1:18  Tuple0
diff --git a/testdata/language-features/guard/guard03.out b/testdata/language-features/guard/guard03.out
index b3a8b24f..c9d105da 100644
--- a/testdata/language-features/guard/guard03.out
+++ b/testdata/language-features/guard/guard03.out
@@ -1,10 +1,10 @@
 main is not found
 tooltips:
-testdata/language-features/guard/guard03.lc 1:1-1:6  'String
-testdata/language-features/guard/guard03.lc 2:5-2:9  'Bool
-testdata/language-features/guard/guard03.lc 2:5-3:20  'String
-testdata/language-features/guard/guard03.lc 2:12-2:18  'String
-testdata/language-features/guard/guard03.lc 2:12-3:20  'Bool->'String
-testdata/language-features/guard/guard03.lc 3:5-3:10  'Bool
-testdata/language-features/guard/guard03.lc 3:5-3:20  'String
-testdata/language-features/guard/guard03.lc 3:13-3:20  'String
+testdata/language-features/guard/guard03.lc 1:1-1:6  String
+testdata/language-features/guard/guard03.lc 2:5-2:9  Bool
+testdata/language-features/guard/guard03.lc 2:5-3:20  String
+testdata/language-features/guard/guard03.lc 2:12-2:18  String
+testdata/language-features/guard/guard03.lc 2:12-3:20  Bool->String
+testdata/language-features/guard/guard03.lc 3:5-3:10  Bool
+testdata/language-features/guard/guard03.lc 3:5-3:20  String
+testdata/language-features/guard/guard03.lc 3:13-3:20  String
diff --git a/testdata/language-features/guard/guard04.out b/testdata/language-features/guard/guard04.out
index 112776a1..414823fc 100644
--- a/testdata/language-features/guard/guard04.out
+++ b/testdata/language-features/guard/guard04.out
@@ -1,10 +1,10 @@
 main is not found
 tooltips:
-testdata/language-features/guard/guard04.lc 1:1-1:6  'String
-testdata/language-features/guard/guard04.lc 2:5-2:9  'Bool
-testdata/language-features/guard/guard04.lc 2:5-3:24  'String
-testdata/language-features/guard/guard04.lc 2:12-2:18  'String
-testdata/language-features/guard/guard04.lc 2:12-3:24  'Bool->'String
-testdata/language-features/guard/guard04.lc 3:5-3:14  'Bool
-testdata/language-features/guard/guard04.lc 3:5-3:24  'String
-testdata/language-features/guard/guard04.lc 3:17-3:24  'String
+testdata/language-features/guard/guard04.lc 1:1-1:6  String
+testdata/language-features/guard/guard04.lc 2:5-2:9  Bool
+testdata/language-features/guard/guard04.lc 2:5-3:24  String
+testdata/language-features/guard/guard04.lc 2:12-2:18  String
+testdata/language-features/guard/guard04.lc 2:12-3:24  Bool->String
+testdata/language-features/guard/guard04.lc 3:5-3:14  Bool
+testdata/language-features/guard/guard04.lc 3:5-3:24  String
+testdata/language-features/guard/guard04.lc 3:17-3:24  String
diff --git a/testdata/language-features/guard/guard06.out b/testdata/language-features/guard/guard06.out
index ab9d487e..0e2b806f 100644
--- a/testdata/language-features/guard/guard06.out
+++ b/testdata/language-features/guard/guard06.out
@@ -1,6 +1,6 @@
 main is not found
 tooltips:
-testdata/language-features/guard/guard06.lc 1:1-1:6  'Tuple0
-testdata/language-features/guard/guard06.lc 1:9-1:18  'Bool
-testdata/language-features/guard/guard06.lc 1:9-1:23  'Tuple0
-testdata/language-features/guard/guard06.lc 1:21-1:23  'Tuple0
+testdata/language-features/guard/guard06.lc 1:1-1:6  Tuple0
+testdata/language-features/guard/guard06.lc 1:9-1:18  Bool
+testdata/language-features/guard/guard06.lc 1:9-1:23  Tuple0
+testdata/language-features/guard/guard06.lc 1:21-1:23  Tuple0
diff --git a/testdata/language-features/guard/guard07.out b/testdata/language-features/guard/guard07.out
index 23142af5..b0a29580 100644
--- a/testdata/language-features/guard/guard07.out
+++ b/testdata/language-features/guard/guard07.out
@@ -1,10 +1,10 @@
 main is not found
 tooltips:
-testdata/language-features/guard/guard07.lc 1:1-1:6  'String
-testdata/language-features/guard/guard07.lc 1:7-1:11  'Bool
-testdata/language-features/guard/guard07.lc 1:7-2:20  'String
-testdata/language-features/guard/guard07.lc 1:12-1:18  'String
-testdata/language-features/guard/guard07.lc 1:12-2:20  'Bool->'String
-testdata/language-features/guard/guard07.lc 2:7-2:12  'Bool
-testdata/language-features/guard/guard07.lc 2:7-2:20  'String
-testdata/language-features/guard/guard07.lc 2:13-2:20  'String
+testdata/language-features/guard/guard07.lc 1:1-1:6  String
+testdata/language-features/guard/guard07.lc 1:7-1:11  Bool
+testdata/language-features/guard/guard07.lc 1:7-2:20  String
+testdata/language-features/guard/guard07.lc 1:12-1:18  String
+testdata/language-features/guard/guard07.lc 1:12-2:20  Bool->String
+testdata/language-features/guard/guard07.lc 2:7-2:12  Bool
+testdata/language-features/guard/guard07.lc 2:7-2:20  String
+testdata/language-features/guard/guard07.lc 2:13-2:20  String
diff --git a/testdata/language-features/guard/guard08.out b/testdata/language-features/guard/guard08.out
index 8b6be455..6bcf1ead 100644
--- a/testdata/language-features/guard/guard08.out
+++ b/testdata/language-features/guard/guard08.out
@@ -1,10 +1,10 @@
 main is not found
 tooltips:
-testdata/language-features/guard/guard08.lc 1:1-1:6  'String
-testdata/language-features/guard/guard08.lc 1:7-1:11  'Bool
-testdata/language-features/guard/guard08.lc 1:7-1:32  'String
-testdata/language-features/guard/guard08.lc 1:12-1:18  'String
-testdata/language-features/guard/guard08.lc 1:12-1:32  'Bool->'String
-testdata/language-features/guard/guard08.lc 1:19-1:24  'Bool
-testdata/language-features/guard/guard08.lc 1:19-1:32  'String
-testdata/language-features/guard/guard08.lc 1:25-1:32  'String
+testdata/language-features/guard/guard08.lc 1:1-1:6  String
+testdata/language-features/guard/guard08.lc 1:7-1:11  Bool
+testdata/language-features/guard/guard08.lc 1:7-1:32  String
+testdata/language-features/guard/guard08.lc 1:12-1:18  String
+testdata/language-features/guard/guard08.lc 1:12-1:32  Bool->String
+testdata/language-features/guard/guard08.lc 1:19-1:24  Bool
+testdata/language-features/guard/guard08.lc 1:19-1:32  String
+testdata/language-features/guard/guard08.lc 1:25-1:32  String
diff --git a/testdata/language-features/guard/guard09.out b/testdata/language-features/guard/guard09.out
index fbd377f4..806d264d 100644
--- a/testdata/language-features/guard/guard09.out
+++ b/testdata/language-features/guard/guard09.out
@@ -1,10 +1,10 @@
 main is not found
 tooltips:
-testdata/language-features/guard/guard09.lc 1:1-1:6  'String
-testdata/language-features/guard/guard09.lc 1:7-1:11  'Bool
-testdata/language-features/guard/guard09.lc 1:7-2:16  'String
-testdata/language-features/guard/guard09.lc 1:12-1:18  'String
-testdata/language-features/guard/guard09.lc 1:12-2:16  'Bool->'String
-testdata/language-features/guard/guard09.lc 2:3-2:8  'Bool
-testdata/language-features/guard/guard09.lc 2:3-2:16  'String
-testdata/language-features/guard/guard09.lc 2:9-2:16  'String
+testdata/language-features/guard/guard09.lc 1:1-1:6  String
+testdata/language-features/guard/guard09.lc 1:7-1:11  Bool
+testdata/language-features/guard/guard09.lc 1:7-2:16  String
+testdata/language-features/guard/guard09.lc 1:12-1:18  String
+testdata/language-features/guard/guard09.lc 1:12-2:16  Bool->String
+testdata/language-features/guard/guard09.lc 2:3-2:8  Bool
+testdata/language-features/guard/guard09.lc 2:3-2:16  String
+testdata/language-features/guard/guard09.lc 2:9-2:16  String
diff --git a/testdata/language-features/guard/guard11.out b/testdata/language-features/guard/guard11.out
index 28f82129..02e7807e 100644
--- a/testdata/language-features/guard/guard11.out
+++ b/testdata/language-features/guard/guard11.out
@@ -1,10 +1,10 @@
 main is not found
 tooltips:
-testdata/language-features/guard/guard11.lc 1:1-1:4  'Bool->'String
+testdata/language-features/guard/guard11.lc 1:1-1:4  Bool->String
 testdata/language-features/guard/guard11.lc 2:5-2:6  V1
-testdata/language-features/guard/guard11.lc 2:5-3:24  'String
-testdata/language-features/guard/guard11.lc 2:9-2:15  'String
-testdata/language-features/guard/guard11.lc 2:9-3:24  'Bool->'String
-testdata/language-features/guard/guard11.lc 3:5-3:14  'Bool
-testdata/language-features/guard/guard11.lc 3:5-3:24  'String
-testdata/language-features/guard/guard11.lc 3:17-3:24  'String
+testdata/language-features/guard/guard11.lc 2:5-3:24  String
+testdata/language-features/guard/guard11.lc 2:9-2:15  String
+testdata/language-features/guard/guard11.lc 2:9-3:24  Bool->String
+testdata/language-features/guard/guard11.lc 3:5-3:14  Bool
+testdata/language-features/guard/guard11.lc 3:5-3:24  String
+testdata/language-features/guard/guard11.lc 3:17-3:24  String
diff --git a/testdata/language-features/guard/guard13.out b/testdata/language-features/guard/guard13.out
index 08f5f725..c9f6cf48 100644
--- a/testdata/language-features/guard/guard13.out
+++ b/testdata/language-features/guard/guard13.out
@@ -1,10 +1,10 @@
 main is not found
 tooltips:
-testdata/language-features/guard/guard13.lc 1:1-1:4  'Bool->'Tuple0
+testdata/language-features/guard/guard13.lc 1:1-1:4  Bool->Tuple0
 testdata/language-features/guard/guard13.lc 1:7-1:8  V1
-testdata/language-features/guard/guard13.lc 1:7-1:24  'Tuple0
-testdata/language-features/guard/guard13.lc 1:9-1:11  'Tuple0
-testdata/language-features/guard/guard13.lc 1:9-1:24  'Bool->'Tuple0
-testdata/language-features/guard/guard13.lc 1:12-1:21  'Bool
-testdata/language-features/guard/guard13.lc 1:12-1:24  'Tuple0
-testdata/language-features/guard/guard13.lc 1:22-1:24  'Tuple0
+testdata/language-features/guard/guard13.lc 1:7-1:24  Tuple0
+testdata/language-features/guard/guard13.lc 1:9-1:11  Tuple0
+testdata/language-features/guard/guard13.lc 1:9-1:24  Bool->Tuple0
+testdata/language-features/guard/guard13.lc 1:12-1:21  Bool
+testdata/language-features/guard/guard13.lc 1:12-1:24  Tuple0
+testdata/language-features/guard/guard13.lc 1:22-1:24  Tuple0
diff --git a/testdata/language-features/guard/guard14.out b/testdata/language-features/guard/guard14.out
index 4ae93767..7f115381 100644
--- a/testdata/language-features/guard/guard14.out
+++ b/testdata/language-features/guard/guard14.out
@@ -1,11 +1,11 @@
 main is not found
 tooltips:
-testdata/language-features/guard/guard14.lc 1:1-1:6  'Tuple0
-testdata/language-features/guard/guard14.lc 1:17-1:21  'Bool
-testdata/language-features/guard/guard14.lc 1:17-2:31  'Tuple0
-testdata/language-features/guard/guard14.lc 1:24-1:26  'Tuple0
-testdata/language-features/guard/guard14.lc 1:24-2:31  'Bool->'Tuple0
-testdata/language-features/guard/guard14.lc 2:17-2:26  'Bool
-testdata/language-features/guard/guard14.lc 2:17-2:31  'Tuple0
-testdata/language-features/guard/guard14.lc 2:29-2:31  'Tuple0
-testdata/language-features/guard/guard14.lc 3:12-3:14  'Tuple0
+testdata/language-features/guard/guard14.lc 1:1-1:6  Tuple0
+testdata/language-features/guard/guard14.lc 1:17-1:21  Bool
+testdata/language-features/guard/guard14.lc 1:17-2:31  Tuple0
+testdata/language-features/guard/guard14.lc 1:24-1:26  Tuple0
+testdata/language-features/guard/guard14.lc 1:24-2:31  Bool->Tuple0
+testdata/language-features/guard/guard14.lc 2:17-2:26  Bool
+testdata/language-features/guard/guard14.lc 2:17-2:31  Tuple0
+testdata/language-features/guard/guard14.lc 2:29-2:31  Tuple0
+testdata/language-features/guard/guard14.lc 3:12-3:14  Tuple0
diff --git a/testdata/language-features/guard/guard15.out b/testdata/language-features/guard/guard15.out
index 44de42b7..21c9ea22 100644
--- a/testdata/language-features/guard/guard15.out
+++ b/testdata/language-features/guard/guard15.out
@@ -1,11 +1,11 @@
 main is not found
 tooltips:
-testdata/language-features/guard/guard15.lc 1:1-1:6  'Tuple0
-testdata/language-features/guard/guard15.lc 1:9-1:11  'Tuple0
-testdata/language-features/guard/guard15.lc 2:13-2:17  'Bool
-testdata/language-features/guard/guard15.lc 2:13-3:27  'Tuple0
-testdata/language-features/guard/guard15.lc 2:20-2:22  'Tuple0
-testdata/language-features/guard/guard15.lc 2:20-3:27  'Bool->'Tuple0
-testdata/language-features/guard/guard15.lc 3:13-3:22  'Bool
-testdata/language-features/guard/guard15.lc 3:13-3:27  'Tuple0
-testdata/language-features/guard/guard15.lc 3:25-3:27  'Tuple0
+testdata/language-features/guard/guard15.lc 1:1-1:6  Tuple0
+testdata/language-features/guard/guard15.lc 1:9-1:11  Tuple0
+testdata/language-features/guard/guard15.lc 2:13-2:17  Bool
+testdata/language-features/guard/guard15.lc 2:13-3:27  Tuple0
+testdata/language-features/guard/guard15.lc 2:20-2:22  Tuple0
+testdata/language-features/guard/guard15.lc 2:20-3:27  Bool->Tuple0
+testdata/language-features/guard/guard15.lc 3:13-3:22  Bool
+testdata/language-features/guard/guard15.lc 3:13-3:27  Tuple0
+testdata/language-features/guard/guard15.lc 3:25-3:27  Tuple0
diff --git a/testdata/language-features/guard/guard16.out b/testdata/language-features/guard/guard16.out
index 4143f681..ce8d0418 100644
--- a/testdata/language-features/guard/guard16.out
+++ b/testdata/language-features/guard/guard16.out
@@ -1,10 +1,10 @@
 main is not found
 tooltips:
-testdata/language-features/guard/guard16.lc 1:1-1:6  'Tuple0
-testdata/language-features/guard/guard16.lc 1:9-3:10  'Tuple0
+testdata/language-features/guard/guard16.lc 1:1-1:6  Tuple0
+testdata/language-features/guard/guard16.lc 1:9-3:10  Tuple0
 testdata/language-features/guard/guard16.lc 1:14-1:15  V1
-testdata/language-features/guard/guard16.lc 2:7-2:11  'Bool
-testdata/language-features/guard/guard16.lc 2:7-3:10  'Tuple0
-testdata/language-features/guard/guard16.lc 2:15-2:17  'Tuple0
-testdata/language-features/guard/guard16.lc 2:15-3:10  'Bool->'Tuple0
-testdata/language-features/guard/guard16.lc 3:8-3:10  'Tuple0
+testdata/language-features/guard/guard16.lc 2:7-2:11  Bool
+testdata/language-features/guard/guard16.lc 2:7-3:10  Tuple0
+testdata/language-features/guard/guard16.lc 2:15-2:17  Tuple0
+testdata/language-features/guard/guard16.lc 2:15-3:10  Bool->Tuple0
+testdata/language-features/guard/guard16.lc 3:8-3:10  Tuple0
diff --git a/testdata/language-features/module/Hello01.out b/testdata/language-features/module/Hello01.out
index 62f51add..f2b9ece4 100644
--- a/testdata/language-features/module/Hello01.out
+++ b/testdata/language-features/module/Hello01.out
@@ -1,6 +1,6 @@
 main is not found
 tooltips:
-testdata/language-features/module/Hello01.lc 3:1-3:6  'String
-testdata/language-features/module/Hello01.lc 3:9-3:16  'String
-testdata/language-features/module/Hello01.lc 4:1-4:6  'String
-testdata/language-features/module/Hello01.lc 4:9-4:16  'String
+testdata/language-features/module/Hello01.lc 3:1-3:6  String
+testdata/language-features/module/Hello01.lc 3:9-3:16  String
+testdata/language-features/module/Hello01.lc 4:1-4:6  String
+testdata/language-features/module/Hello01.lc 4:9-4:16  String
diff --git a/testdata/language-features/module/Moduledef06.out b/testdata/language-features/module/Moduledef06.out
index 07ab1091..fe66d8fc 100644
--- a/testdata/language-features/module/Moduledef06.out
+++ b/testdata/language-features/module/Moduledef06.out
@@ -1,4 +1,4 @@
 main is not found
 tooltips:
-testdata/language-features/module/Moduledef06.lc 3:1-3:6  'String
-testdata/language-features/module/Moduledef06.lc 3:9-3:16  'String
+testdata/language-features/module/Moduledef06.lc 3:1-3:6  String
+testdata/language-features/module/Moduledef06.lc 3:9-3:16  String
diff --git a/testdata/language-features/module/Moduledef07.out b/testdata/language-features/module/Moduledef07.out
index 9158ff13..af7a4f04 100644
--- a/testdata/language-features/module/Moduledef07.out
+++ b/testdata/language-features/module/Moduledef07.out
@@ -1,4 +1,4 @@
 main is not found
 tooltips:
-testdata/language-features/module/Moduledef07.lc 5:1-5:6  'String
-testdata/language-features/module/Moduledef07.lc 5:9-5:16  'String
+testdata/language-features/module/Moduledef07.lc 5:1-5:6  String
+testdata/language-features/module/Moduledef07.lc 5:9-5:16  String
diff --git a/testdata/language-features/module/Moduledef13.out b/testdata/language-features/module/Moduledef13.out
index af9cc9fe..5c60fc06 100644
--- a/testdata/language-features/module/Moduledef13.out
+++ b/testdata/language-features/module/Moduledef13.out
@@ -1,4 +1,4 @@
 main is not found
 tooltips:
-testdata/language-features/module/Moduledef13.lc 3:1-3:6  'String
-testdata/language-features/module/Moduledef13.lc 3:9-3:16  'String
+testdata/language-features/module/Moduledef13.lc 3:1-3:6  String
+testdata/language-features/module/Moduledef13.lc 3:9-3:16  String
diff --git a/testdata/language-features/module/import01.out b/testdata/language-features/module/import01.out
index 985599af..2a3afae0 100644
--- a/testdata/language-features/module/import01.out
+++ b/testdata/language-features/module/import01.out
@@ -1,4 +1,4 @@
 main is not found
 tooltips:
-testdata/language-features/module/import01.lc 3:1-3:2  'String
-testdata/language-features/module/import01.lc 3:5-3:10  'String
+testdata/language-features/module/import01.lc 3:1-3:2  String
+testdata/language-features/module/import01.lc 3:5-3:10  String
diff --git a/testdata/language-features/module/import05.out b/testdata/language-features/module/import05.out
index c713c1a8..76cdae0a 100644
--- a/testdata/language-features/module/import05.out
+++ b/testdata/language-features/module/import05.out
@@ -1,5 +1,5 @@
 main is not found
 tooltips:
 testdata/language-features/module/import05.lc 3:6-3:12  Type
-testdata/language-features/module/import05.lc 4:1-4:2  'String
-testdata/language-features/module/import05.lc 4:5-4:10  'String
+testdata/language-features/module/import05.lc 4:1-4:2  String
+testdata/language-features/module/import05.lc 4:5-4:10  String
diff --git a/testdata/language-features/module/import06.out b/testdata/language-features/module/import06.out
index 395a6e2f..f1eddfea 100644
--- a/testdata/language-features/module/import06.out
+++ b/testdata/language-features/module/import06.out
@@ -1,6 +1,6 @@
 main is not found
 tooltips:
-testdata/language-features/module/import06.lc 3:1-3:6  'Tuple0
-testdata/language-features/module/import06.lc 3:9-3:11  'Tuple0
-testdata/language-features/module/import06.lc 4:1-4:2  'String
-testdata/language-features/module/import06.lc 4:5-4:10  'String
+testdata/language-features/module/import06.lc 3:1-3:6  Tuple0
+testdata/language-features/module/import06.lc 3:9-3:11  Tuple0
+testdata/language-features/module/import06.lc 4:1-4:2  String
+testdata/language-features/module/import06.lc 4:5-4:10  String
diff --git a/testdata/language-features/module/import07.out b/testdata/language-features/module/import07.out
index 18c88e07..9147cffe 100644
--- a/testdata/language-features/module/import07.out
+++ b/testdata/language-features/module/import07.out
@@ -1,6 +1,6 @@
 main is not found
 tooltips:
-testdata/language-features/module/import07.lc 3:1-3:6  'Tuple0
-testdata/language-features/module/import07.lc 3:9-3:11  'Tuple0
-testdata/language-features/module/import07.lc 4:1-4:2  'String
-testdata/language-features/module/import07.lc 4:5-4:10  'String
+testdata/language-features/module/import07.lc 3:1-3:6  Tuple0
+testdata/language-features/module/import07.lc 3:9-3:11  Tuple0
+testdata/language-features/module/import07.lc 4:1-4:2  String
+testdata/language-features/module/import07.lc 4:5-4:10  String
diff --git a/testdata/language-features/module/import08.out b/testdata/language-features/module/import08.out
index acc3c259..187e0095 100644
--- a/testdata/language-features/module/import08.out
+++ b/testdata/language-features/module/import08.out
@@ -1,13 +1,13 @@
 main is not found
 tooltips:
-testdata/language-features/module/import08.lc 3:1-3:6  'Tuple0
-testdata/language-features/module/import08.lc 3:9-3:11  'Tuple0
+testdata/language-features/module/import08.lc 3:1-3:6  Tuple0
+testdata/language-features/module/import08.lc 3:9-3:11  Tuple0
 testdata/language-features/module/import08.lc 5:6-5:10  Type
-testdata/language-features/module/import08.lc 6:1-6:2  'Char
-testdata/language-features/module/import08.lc 6:5-6:13  'Char
+testdata/language-features/module/import08.lc 6:1-6:2  Char
+testdata/language-features/module/import08.lc 6:5-6:13  Char
 testdata/language-features/module/import08.lc 8:6-8:12  Type
-testdata/language-features/module/import08.lc 9:1-9:2  'String
-testdata/language-features/module/import08.lc 9:5-9:10  'String
+testdata/language-features/module/import08.lc 9:1-9:2  String
+testdata/language-features/module/import08.lc 9:5-9:10  String
 testdata/language-features/module/import08.lc 11:6-11:12  Type
-testdata/language-features/module/import08.lc 12:1-12:2  'String
-testdata/language-features/module/import08.lc 12:5-12:10  'String
+testdata/language-features/module/import08.lc 12:1-12:2  String
+testdata/language-features/module/import08.lc 12:5-12:10  String
diff --git a/testdata/language-features/module/import09.out b/testdata/language-features/module/import09.out
index a15ac80e..4b813dfc 100644
--- a/testdata/language-features/module/import09.out
+++ b/testdata/language-features/module/import09.out
@@ -5,5 +5,5 @@ testdata/language-features/module/import09.lc 3:8-3:29  Type
 testdata/language-features/module/import09.lc 3:13-3:19  Type
 testdata/language-features/module/import09.lc 3:13-3:29  Type
 testdata/language-features/module/import09.lc 3:23-3:29  Type
-testdata/language-features/module/import09.lc 4:1-4:4  {a} -> a -> 'Tuple0->'Tuple0
-testdata/language-features/module/import09.lc 4:12-4:14  'Tuple0 | 'Tuple0->'Tuple0 | V0 -> 'Tuple0->'Tuple0
+testdata/language-features/module/import09.lc 4:1-4:4  {a} -> a -> Tuple0->Tuple0
+testdata/language-features/module/import09.lc 4:12-4:14  Tuple0 | Tuple0->Tuple0 | V0 -> Tuple0->Tuple0
diff --git a/testdata/language-features/module/import12.out b/testdata/language-features/module/import12.out
index b8e6f5f0..688350f9 100644
--- a/testdata/language-features/module/import12.out
+++ b/testdata/language-features/module/import12.out
@@ -1,4 +1,4 @@
 main is not found
 tooltips:
-testdata/language-features/module/import12.lc 4:1-4:4  'String
-testdata/language-features/module/import12.lc 4:7-4:12  'String
+testdata/language-features/module/import12.lc 4:1-4:4  String
+testdata/language-features/module/import12.lc 4:7-4:12  String
diff --git a/testdata/language-features/module/import13.out b/testdata/language-features/module/import13.out
index abaf3ee4..a411f226 100644
--- a/testdata/language-features/module/import13.out
+++ b/testdata/language-features/module/import13.out
@@ -1,4 +1,4 @@
 main is not found
 tooltips:
-testdata/language-features/module/import13.lc 4:1-4:4  'String
-testdata/language-features/module/import13.lc 4:7-4:12  'String
+testdata/language-features/module/import13.lc 4:1-4:4  String
+testdata/language-features/module/import13.lc 4:7-4:12  String
diff --git a/testdata/language-features/module/import14.out b/testdata/language-features/module/import14.out
index 3a081b4d..bfa46377 100644
--- a/testdata/language-features/module/import14.out
+++ b/testdata/language-features/module/import14.out
@@ -1,4 +1,4 @@
 main is not found
 tooltips:
-testdata/language-features/module/import14.lc 4:1-4:4  'String
-testdata/language-features/module/import14.lc 4:7-4:12  'String
+testdata/language-features/module/import14.lc 4:1-4:4  String
+testdata/language-features/module/import14.lc 4:7-4:12  String
diff --git a/testdata/language-features/pattern/pattern01.out b/testdata/language-features/pattern/pattern01.out
index 94f1f0fa..de23e726 100644
--- a/testdata/language-features/pattern/pattern01.out
+++ b/testdata/language-features/pattern/pattern01.out
@@ -1,16 +1,16 @@
 main is not found
 tooltips:
-testdata/language-features/pattern/pattern01.lc 1:1-1:5  'Int->'Char
-testdata/language-features/pattern/pattern01.lc 1:10-1:13  'Char
-testdata/language-features/pattern/pattern01.lc 1:10-2:13  'Char -> 'Ordering->'Char
-testdata/language-features/pattern/pattern01.lc 2:10-2:13  'Char
-testdata/language-features/pattern/pattern01.lc 4:1-4:5  'String->'Char
-testdata/language-features/pattern/pattern01.lc 4:12-4:15  'Char
-testdata/language-features/pattern/pattern01.lc 4:12-5:13  'Char -> 'Ordering->'Char
-testdata/language-features/pattern/pattern01.lc 5:10-5:13  'Char
-testdata/language-features/pattern/pattern01.lc 7:1-7:5  'Char->'Char
-testdata/language-features/pattern/pattern01.lc 7:12-7:15  'Char
-testdata/language-features/pattern/pattern01.lc 7:12-8:13  'Char -> 'Ordering->'Char
-testdata/language-features/pattern/pattern01.lc 8:10-8:13  'Char
-testdata/language-features/pattern/pattern01.lc 10:1-10:5  'Tuple0->'Char
-testdata/language-features/pattern/pattern01.lc 10:11-10:14  'Char
+testdata/language-features/pattern/pattern01.lc 1:1-1:5  Int->Char
+testdata/language-features/pattern/pattern01.lc 1:10-1:13  Char
+testdata/language-features/pattern/pattern01.lc 1:10-2:13  Char -> Ordering->Char
+testdata/language-features/pattern/pattern01.lc 2:10-2:13  Char
+testdata/language-features/pattern/pattern01.lc 4:1-4:5  String->Char
+testdata/language-features/pattern/pattern01.lc 4:12-4:15  Char
+testdata/language-features/pattern/pattern01.lc 4:12-5:13  Char -> Ordering->Char
+testdata/language-features/pattern/pattern01.lc 5:10-5:13  Char
+testdata/language-features/pattern/pattern01.lc 7:1-7:5  Char->Char
+testdata/language-features/pattern/pattern01.lc 7:12-7:15  Char
+testdata/language-features/pattern/pattern01.lc 7:12-8:13  Char -> Ordering->Char
+testdata/language-features/pattern/pattern01.lc 8:10-8:13  Char
+testdata/language-features/pattern/pattern01.lc 10:1-10:5  Tuple0->Char
+testdata/language-features/pattern/pattern01.lc 10:11-10:14  Char
diff --git a/testdata/language-features/recursion/simplerec01.out b/testdata/language-features/recursion/simplerec01.out
index 11dbb5c5..93f90f16 100644
--- a/testdata/language-features/recursion/simplerec01.out
+++ b/testdata/language-features/recursion/simplerec01.out
@@ -1,8 +1,8 @@
 main is not found
 tooltips:
-testdata/language-features/recursion/simplerec01.lc 1:1-1:4  'Int->'Char
-testdata/language-features/recursion/simplerec01.lc 1:9-1:12  'Char
-testdata/language-features/recursion/simplerec01.lc 1:9-2:14  'Char -> 'Ordering->'Char | V0->V1
-testdata/language-features/recursion/simplerec01.lc 2:9-2:12  V1->'Char | V4
-testdata/language-features/recursion/simplerec01.lc 2:9-2:14  'Char
+testdata/language-features/recursion/simplerec01.lc 1:1-1:4  Int->Char
+testdata/language-features/recursion/simplerec01.lc 1:9-1:12  Char
+testdata/language-features/recursion/simplerec01.lc 1:9-2:14  Char -> Ordering->Char | V0->V1
+testdata/language-features/recursion/simplerec01.lc 2:9-2:12  V1->Char | V4
+testdata/language-features/recursion/simplerec01.lc 2:9-2:14  Char
 testdata/language-features/recursion/simplerec01.lc 2:13-2:14  V1