20 files changed, 56 insertions, 56 deletions

diff --git a/testdata/language-features/basic-list/list11.out b/testdata/language-features/basic-list/list11.out
index db160d1b..53a243cf 100644
--- a/testdata/language-features/basic-list/list11.out
+++ b/testdata/language-features/basic-list/list11.out
@@ -4,7 +4,7 @@ value :: {a} -> {_ : 'Num a[
 ------------ tooltips
 testdata/language-features/basic-list/list11.lc 1:1-1:6  {a} -> {_ : Num a} -> List a
 testdata/language-features/basic-list/list11.lc 1:9-1:10  b_
-testdata/language-features/basic-list/list11.lc 1:9-1:11  List b_ -> List c_
+testdata/language-features/basic-list/list11.lc 1:9-1:11  List b_ -> List b_
 testdata/language-features/basic-list/list11.lc 1:9-1:13  List b_
 testdata/language-features/basic-list/list11.lc 1:10-1:11  {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 eebc55d2..78811ae1 100644
--- a/testdata/language-features/basic-list/list12.out
+++ b/testdata/language-features/basic-list/list12.out
@@ -4,23 +4,23 @@ value :: {a} -> {_ : 'Num a[
 ------------ tooltips
 testdata/language-features/basic-list/list12.lc 1:1-1:6  {a} -> {_ : Num a} -> List a
 testdata/language-features/basic-list/list12.lc 1:9-1:10  b_
-testdata/language-features/basic-list/list12.lc 1:9-1:11  List b_ -> List c_
+testdata/language-features/basic-list/list12.lc 1:9-1:11  List b_ -> List b_
 testdata/language-features/basic-list/list12.lc 1:9-1:21  List c_
 testdata/language-features/basic-list/list12.lc 1:10-1:11  {a} -> a -> List a -> List a
 testdata/language-features/basic-list/list12.lc 1:11-1:12  b_
-testdata/language-features/basic-list/list12.lc 1:11-1:13  List b_ -> List c_
+testdata/language-features/basic-list/list12.lc 1:11-1:13  List b_ -> List b_
 testdata/language-features/basic-list/list12.lc 1:11-1:21  List d_
 testdata/language-features/basic-list/list12.lc 1:12-1:13  {a} -> a -> List a -> List a
 testdata/language-features/basic-list/list12.lc 1:13-1:14  b_
-testdata/language-features/basic-list/list12.lc 1:13-1:15  List b_ -> List c_
+testdata/language-features/basic-list/list12.lc 1:13-1:15  List b_ -> List b_
 testdata/language-features/basic-list/list12.lc 1:13-1:21  List e_
 testdata/language-features/basic-list/list12.lc 1:14-1:15  {a} -> a -> List a -> List a
 testdata/language-features/basic-list/list12.lc 1:15-1:16  b_
-testdata/language-features/basic-list/list12.lc 1:15-1:17  List b_ -> List c_
+testdata/language-features/basic-list/list12.lc 1:15-1:17  List b_ -> List b_
 testdata/language-features/basic-list/list12.lc 1:15-1:21  List f_
 testdata/language-features/basic-list/list12.lc 1:16-1:17  {a} -> a -> List a -> List a
 testdata/language-features/basic-list/list12.lc 1:17-1:18  b_
-testdata/language-features/basic-list/list12.lc 1:17-1:19  List b_ -> List c_
+testdata/language-features/basic-list/list12.lc 1:17-1:19  List b_ -> List b_
 testdata/language-features/basic-list/list12.lc 1:17-1:21  List f_
 testdata/language-features/basic-list/list12.lc 1:18-1:19  {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/listcomp01.out b/testdata/language-features/basic-list/listcomp01.out
index 8b857f79..649a2f20 100644
--- a/testdata/language-features/basic-list/listcomp01.out
+++ b/testdata/language-features/basic-list/listcomp01.out
@@ -4,7 +4,7 @@ value :: 'List ()
 ------------ tooltips
 testdata/language-features/basic-list/listcomp01.lc 1:1-1:6  List ()
 testdata/language-features/basic-list/listcomp01.lc 1:9-1:34  List ()
-testdata/language-features/basic-list/listcomp01.lc 1:10-1:12  () | List () | b_ -> List b_
+testdata/language-features/basic-list/listcomp01.lc 1:10-1:12  () | List () | b_ -> List a_
 testdata/language-features/basic-list/listcomp01.lc 1:20-1:33  List ()
 testdata/language-features/basic-list/listcomp01.lc 1:21-1:23  ()
 testdata/language-features/basic-list/listcomp01.lc 1:24-1:26  ()
diff --git a/testdata/language-features/basic-list/listcomp02.out b/testdata/language-features/basic-list/listcomp02.out
index 464eb751..691c04df 100644
--- a/testdata/language-features/basic-list/listcomp02.out
+++ b/testdata/language-features/basic-list/listcomp02.out
@@ -13,5 +13,5 @@ testdata/language-features/basic-list/listcomp02.lc 1:12-1:17  List ()
 testdata/language-features/basic-list/listcomp02.lc 1:15-1:17  () | List ()
 testdata/language-features/basic-list/listcomp02.lc 2:1-2:6  List ()
 testdata/language-features/basic-list/listcomp02.lc 2:9-2:21  List ()
-testdata/language-features/basic-list/listcomp02.lc 2:10-2:11  List b_ | b_ -> List b_ | d_
+testdata/language-features/basic-list/listcomp02.lc 2:10-2:11  List b_ | b_ -> List a_ | d_
 testdata/language-features/basic-list/listcomp02.lc 2:19-2:20  List ()
diff --git a/testdata/language-features/basic-list/listcomp03.out b/testdata/language-features/basic-list/listcomp03.out
index 1873533b..d9d98c75 100644
--- a/testdata/language-features/basic-list/listcomp03.out
+++ b/testdata/language-features/basic-list/listcomp03.out
@@ -5,7 +5,7 @@ value :: 'List ()
 testdata/language-features/basic-list/listcomp03.lc 1:1-1:6  List ()
 testdata/language-features/basic-list/listcomp03.lc 1:9-1:41  List ()
 testdata/language-features/basic-list/listcomp03.lc 1:10-1:12  () | List ()
-testdata/language-features/basic-list/listcomp03.lc 1:10-1:40  List () | List () -> List () | b_ -> List b_
+testdata/language-features/basic-list/listcomp03.lc 1:10-1:40  List () | List () -> List () | b_ -> List a_
 testdata/language-features/basic-list/listcomp03.lc 1:20-1:33  List ()
 testdata/language-features/basic-list/listcomp03.lc 1:21-1:23  ()
 testdata/language-features/basic-list/listcomp03.lc 1:24-1:26  ()
diff --git a/testdata/language-features/basic-list/listcomp04.out b/testdata/language-features/basic-list/listcomp04.out
index 7fe1306f..627ab11f 100644
--- a/testdata/language-features/basic-list/listcomp04.out
+++ b/testdata/language-features/basic-list/listcomp04.out
@@ -13,7 +13,7 @@ testdata/language-features/basic-list/listcomp04.lc 1:12-1:17  List ()
 testdata/language-features/basic-list/listcomp04.lc 1:15-1:17  () | List ()
 testdata/language-features/basic-list/listcomp04.lc 2:1-2:6  List ()
 testdata/language-features/basic-list/listcomp04.lc 2:9-2:30  List ()
-testdata/language-features/basic-list/listcomp04.lc 2:10-2:12  () | List () | b_ -> List b_
-testdata/language-features/basic-list/listcomp04.lc 2:10-2:29  List () | b_ -> List b_
+testdata/language-features/basic-list/listcomp04.lc 2:10-2:12  () | List () | b_ -> List a_
+testdata/language-features/basic-list/listcomp04.lc 2:10-2:29  List () | b_ -> List a_
 testdata/language-features/basic-list/listcomp04.lc 2:20-2:21  List ()
 testdata/language-features/basic-list/listcomp04.lc 2:28-2:29  List ()
diff --git a/testdata/language-features/basic-list/listcomp05.out b/testdata/language-features/basic-list/listcomp05.out
index ff871c08..7602c5ef 100644
--- a/testdata/language-features/basic-list/listcomp05.out
+++ b/testdata/language-features/basic-list/listcomp05.out
@@ -5,7 +5,7 @@ value :: 'List ()
 testdata/language-features/basic-list/listcomp05.lc 1:1-1:6  List ()
 testdata/language-features/basic-list/listcomp05.lc 1:9-1:39  List ()
 testdata/language-features/basic-list/listcomp05.lc 1:10-1:11  ()
-testdata/language-features/basic-list/listcomp05.lc 1:10-1:38  b_ -> List b_
+testdata/language-features/basic-list/listcomp05.lc 1:10-1:38  b_ -> List a_
 testdata/language-features/basic-list/listcomp05.lc 1:19-1:26  List ()
 testdata/language-features/basic-list/listcomp05.lc 1:20-1:22  ()
 testdata/language-features/basic-list/listcomp05.lc 1:23-1:25  () | List ()
diff --git a/testdata/language-features/basic-list/listcomp06.out b/testdata/language-features/basic-list/listcomp06.out
index 65679284..231185e2 100644
--- a/testdata/language-features/basic-list/listcomp06.out
+++ b/testdata/language-features/basic-list/listcomp06.out
@@ -6,7 +6,7 @@ value2 :: 'List ()
 testdata/language-features/basic-list/listcomp06.lc 1:1-1:7  List ()
 testdata/language-features/basic-list/listcomp06.lc 1:10-1:46  List ()
 testdata/language-features/basic-list/listcomp06.lc 1:11-1:12  () | List ()
-testdata/language-features/basic-list/listcomp06.lc 1:11-1:45  List () -> List () | b_ -> List b_
+testdata/language-features/basic-list/listcomp06.lc 1:11-1:45  List () -> List () | b_ -> List a_
 testdata/language-features/basic-list/listcomp06.lc 1:20-1:27  List ()
 testdata/language-features/basic-list/listcomp06.lc 1:21-1:23  ()
 testdata/language-features/basic-list/listcomp06.lc 1:24-1:26  () | List ()
@@ -16,7 +16,7 @@ testdata/language-features/basic-list/listcomp06.lc 1:41-1:45  Bool
 testdata/language-features/basic-list/listcomp06.lc 3:1-3:7  List ()
 testdata/language-features/basic-list/listcomp06.lc 3:10-3:46  List ()
 testdata/language-features/basic-list/listcomp06.lc 3:11-3:12  ()
-testdata/language-features/basic-list/listcomp06.lc 3:11-3:45  List () | b_ -> List b_
+testdata/language-features/basic-list/listcomp06.lc 3:11-3:45  List () | b_ -> List a_
 testdata/language-features/basic-list/listcomp06.lc 3:20-3:27  List ()
 testdata/language-features/basic-list/listcomp06.lc 3:21-3:23  ()
 testdata/language-features/basic-list/listcomp06.lc 3:24-3:26  () | List ()
diff --git a/testdata/language-features/basic-list/listcomp07.out b/testdata/language-features/basic-list/listcomp07.out
index 6238e239..a3f66edc 100644
--- a/testdata/language-features/basic-list/listcomp07.out
+++ b/testdata/language-features/basic-list/listcomp07.out
@@ -7,7 +7,7 @@ value3 :: 'List ()
 testdata/language-features/basic-list/listcomp07.lc 1:1-1:7  List ()
 testdata/language-features/basic-list/listcomp07.lc 1:10-6:11  List ()
 testdata/language-features/basic-list/listcomp07.lc 1:12-1:13  ()
-testdata/language-features/basic-list/listcomp07.lc 1:12-5:21  b_ -> List b_
+testdata/language-features/basic-list/listcomp07.lc 1:12-5:21  b_ -> List a_
 testdata/language-features/basic-list/listcomp07.lc 2:17-2:24  List ()
 testdata/language-features/basic-list/listcomp07.lc 2:18-2:20  ()
 testdata/language-features/basic-list/listcomp07.lc 2:21-2:23  () | List ()
@@ -19,7 +19,7 @@ testdata/language-features/basic-list/listcomp07.lc 5:20-5:21  ()
 testdata/language-features/basic-list/listcomp07.lc 8:1-8:7  List ()
 testdata/language-features/basic-list/listcomp07.lc 8:10-12:11  List ()
 testdata/language-features/basic-list/listcomp07.lc 8:12-8:13  ()
-testdata/language-features/basic-list/listcomp07.lc 8:12-11:21  b_ -> List b_
+testdata/language-features/basic-list/listcomp07.lc 8:12-11:21  b_ -> List a_
 testdata/language-features/basic-list/listcomp07.lc 8:21-8:28  List ()
 testdata/language-features/basic-list/listcomp07.lc 8:22-8:24  ()
 testdata/language-features/basic-list/listcomp07.lc 8:25-8:27  () | List ()
@@ -31,7 +31,7 @@ testdata/language-features/basic-list/listcomp07.lc 11:20-11:21  ()
 testdata/language-features/basic-list/listcomp07.lc 14:1-14:7  List ()
 testdata/language-features/basic-list/listcomp07.lc 14:10-20:3  List ()
 testdata/language-features/basic-list/listcomp07.lc 14:12-14:13  ()
-testdata/language-features/basic-list/listcomp07.lc 14:12-19:15  b_ -> List b_
+testdata/language-features/basic-list/listcomp07.lc 14:12-19:15  b_ -> List a_
 testdata/language-features/basic-list/listcomp07.lc 15:15-15:22  List ()
 testdata/language-features/basic-list/listcomp07.lc 15:16-15:18  ()
 testdata/language-features/basic-list/listcomp07.lc 15:19-15:21  () | List ()
diff --git a/testdata/language-features/basic-list/listcomp08.reject.out b/testdata/language-features/basic-list/listcomp08.reject.out
index 8bf99ab5..10384134 100644
--- a/testdata/language-features/basic-list/listcomp08.reject.out
+++ b/testdata/language-features/basic-list/listcomp08.reject.out
@@ -18,5 +18,5 @@ value = [x | x <- [], "not Bool"]
                       ^^^^^^^^^^
 
 ------------ tooltips
-testdata/language-features/basic-list/listcomp08.reject.lc 1:10-1:33  b_ -> List b_
+testdata/language-features/basic-list/listcomp08.reject.lc 1:10-1:33  b_ -> List a_
 testdata/language-features/basic-list/listcomp08.reject.lc 1:23-1:33  String
diff --git a/testdata/language-features/basic-list/listcomp09.out b/testdata/language-features/basic-list/listcomp09.out
index 55d987eb..d720baaf 100644
--- a/testdata/language-features/basic-list/listcomp09.out
+++ b/testdata/language-features/basic-list/listcomp09.out
@@ -4,6 +4,6 @@ value1 :: {_} -> 'List (()->'String)
 ------------ tooltips
 testdata/language-features/basic-list/listcomp09.lc 1:1-1:7  {_} -> List (()->String)
 testdata/language-features/basic-list/listcomp09.lc 1:10-1:36  List (()->String)
-testdata/language-features/basic-list/listcomp09.lc 1:11-1:25  List (()->String) | b_ -> List b_
+testdata/language-features/basic-list/listcomp09.lc 1:11-1:25  List (()->String) | b_ -> List a_
 testdata/language-features/basic-list/listcomp09.lc 1:18-1:25  String
 testdata/language-features/basic-list/listcomp09.lc 1:33-1:35  {a} -> List a
diff --git a/testdata/language-features/basic-values/fixity02.out b/testdata/language-features/basic-values/fixity02.out
index 6683f3d9..bed65026 100644
--- a/testdata/language-features/basic-values/fixity02.out
+++ b/testdata/language-features/basic-values/fixity02.out
@@ -31,28 +31,28 @@ testdata/language-features/basic-values/fixity02.lc 5:3-5:5  {a} -> {b} -> a ->
 testdata/language-features/basic-values/fixity02.lc 5:10-5:11  b_
 testdata/language-features/basic-values/fixity02.lc 11:1-11:7  Float
 testdata/language-features/basic-values/fixity02.lc 11:10-11:12  ()
-testdata/language-features/basic-values/fixity02.lc 11:10-11:15  a_->b_
+testdata/language-features/basic-values/fixity02.lc 11:10-11:15  a_->a_
 testdata/language-features/basic-values/fixity02.lc 11:10-11:34  Float
 testdata/language-features/basic-values/fixity02.lc 11:13-11:15  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/fixity02.lc 11:16-11:19  Char
-testdata/language-features/basic-values/fixity02.lc 11:16-11:22  a_->b_
+testdata/language-features/basic-values/fixity02.lc 11:16-11:22  a_->a_
 testdata/language-features/basic-values/fixity02.lc 11:16-11:34  Float
 testdata/language-features/basic-values/fixity02.lc 11:20-11:22  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/fixity02.lc 11:23-11:27  String
-testdata/language-features/basic-values/fixity02.lc 11:23-11:30  a_->b_
+testdata/language-features/basic-values/fixity02.lc 11:23-11:30  a_->a_
 testdata/language-features/basic-values/fixity02.lc 11:23-11:34  Float
 testdata/language-features/basic-values/fixity02.lc 11:28-11:30  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/fixity02.lc 11:31-11:34  Float
 testdata/language-features/basic-values/fixity02.lc 11:38-11:43  Type
 testdata/language-features/basic-values/fixity02.lc 12:1-12:7  Float
 testdata/language-features/basic-values/fixity02.lc 12:10-12:12  ()
-testdata/language-features/basic-values/fixity02.lc 12:10-12:15  a_->b_
+testdata/language-features/basic-values/fixity02.lc 12:10-12:15  a_->a_
 testdata/language-features/basic-values/fixity02.lc 12:10-12:34  Float
 testdata/language-features/basic-values/fixity02.lc 12:13-12:15  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/fixity02.lc 12:16-12:19  Char
 testdata/language-features/basic-values/fixity02.lc 12:16-12:22  a_->Char
 testdata/language-features/basic-values/fixity02.lc 12:16-12:27  Char
-testdata/language-features/basic-values/fixity02.lc 12:16-12:30  a_->b_
+testdata/language-features/basic-values/fixity02.lc 12:16-12:30  a_->a_
 testdata/language-features/basic-values/fixity02.lc 12:16-12:34  Float
 testdata/language-features/basic-values/fixity02.lc 12:20-12:22  {a} -> {b} -> a -> b->a
 testdata/language-features/basic-values/fixity02.lc 12:23-12:27  String
@@ -63,13 +63,13 @@ testdata/language-features/basic-values/fixity02.lc 13:1-13:7  Float
 testdata/language-features/basic-values/fixity02.lc 13:10-13:12  ()
 testdata/language-features/basic-values/fixity02.lc 13:10-13:15  a_->()
 testdata/language-features/basic-values/fixity02.lc 13:10-13:19  ()
-testdata/language-features/basic-values/fixity02.lc 13:10-13:22  a_->b_
+testdata/language-features/basic-values/fixity02.lc 13:10-13:22  a_->a_
 testdata/language-features/basic-values/fixity02.lc 13:10-13:34  Float
 testdata/language-features/basic-values/fixity02.lc 13:13-13:15  {a} -> {b} -> a -> b->a
 testdata/language-features/basic-values/fixity02.lc 13:16-13:19  Char
 testdata/language-features/basic-values/fixity02.lc 13:20-13:22  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/fixity02.lc 13:23-13:27  String
-testdata/language-features/basic-values/fixity02.lc 13:23-13:30  a_->b_
+testdata/language-features/basic-values/fixity02.lc 13:23-13:30  a_->a_
 testdata/language-features/basic-values/fixity02.lc 13:23-13:34  Float
 testdata/language-features/basic-values/fixity02.lc 13:28-13:30  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/fixity02.lc 13:31-13:34  Float
@@ -78,7 +78,7 @@ testdata/language-features/basic-values/fixity02.lc 14:1-14:7  Float
 testdata/language-features/basic-values/fixity02.lc 14:10-14:12  ()
 testdata/language-features/basic-values/fixity02.lc 14:10-14:15  a_->()
 testdata/language-features/basic-values/fixity02.lc 14:10-14:27  ()
-testdata/language-features/basic-values/fixity02.lc 14:10-14:30  a_->b_
+testdata/language-features/basic-values/fixity02.lc 14:10-14:30  a_->a_
 testdata/language-features/basic-values/fixity02.lc 14:10-14:34  Float
 testdata/language-features/basic-values/fixity02.lc 14:13-14:15  {a} -> {b} -> a -> b->a
 testdata/language-features/basic-values/fixity02.lc 14:16-14:19  Char
@@ -91,11 +91,11 @@ testdata/language-features/basic-values/fixity02.lc 14:31-14:34  Float
 testdata/language-features/basic-values/fixity02.lc 14:38-14:43  Type
 testdata/language-features/basic-values/fixity02.lc 15:1-15:7  String
 testdata/language-features/basic-values/fixity02.lc 15:10-15:12  ()
-testdata/language-features/basic-values/fixity02.lc 15:10-15:15  a_->b_
+testdata/language-features/basic-values/fixity02.lc 15:10-15:15  a_->a_
 testdata/language-features/basic-values/fixity02.lc 15:10-15:34  String
 testdata/language-features/basic-values/fixity02.lc 15:13-15:15  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/fixity02.lc 15:16-15:19  Char
-testdata/language-features/basic-values/fixity02.lc 15:16-15:22  a_->b_
+testdata/language-features/basic-values/fixity02.lc 15:16-15:22  a_->a_
 testdata/language-features/basic-values/fixity02.lc 15:16-15:34  String
 testdata/language-features/basic-values/fixity02.lc 15:20-15:22  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/fixity02.lc 15:23-15:27  String
@@ -106,7 +106,7 @@ testdata/language-features/basic-values/fixity02.lc 15:31-15:34  Float
 testdata/language-features/basic-values/fixity02.lc 15:38-15:44  Type
 testdata/language-features/basic-values/fixity02.lc 16:1-16:7  Char
 testdata/language-features/basic-values/fixity02.lc 16:10-16:12  ()
-testdata/language-features/basic-values/fixity02.lc 16:10-16:15  a_->b_
+testdata/language-features/basic-values/fixity02.lc 16:10-16:15  a_->a_
 testdata/language-features/basic-values/fixity02.lc 16:10-16:34  Char
 testdata/language-features/basic-values/fixity02.lc 16:13-16:15  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/fixity02.lc 16:16-16:19  Char
@@ -123,7 +123,7 @@ testdata/language-features/basic-values/fixity02.lc 17:1-17:7  String
 testdata/language-features/basic-values/fixity02.lc 17:10-17:12  ()
 testdata/language-features/basic-values/fixity02.lc 17:10-17:15  a_->()
 testdata/language-features/basic-values/fixity02.lc 17:10-17:19  ()
-testdata/language-features/basic-values/fixity02.lc 17:10-17:22  a_->b_
+testdata/language-features/basic-values/fixity02.lc 17:10-17:22  a_->a_
 testdata/language-features/basic-values/fixity02.lc 17:10-17:34  String
 testdata/language-features/basic-values/fixity02.lc 17:13-17:15  {a} -> {b} -> a -> b->a
 testdata/language-features/basic-values/fixity02.lc 17:16-17:19  Char
@@ -151,28 +151,28 @@ testdata/language-features/basic-values/fixity02.lc 18:31-18:34  Float
 testdata/language-features/basic-values/fixity02.lc 18:38-18:40  Type
 testdata/language-features/basic-values/fixity02.lc 20:1-20:10  Float
 testdata/language-features/basic-values/fixity02.lc 20:13-20:15  ()
-testdata/language-features/basic-values/fixity02.lc 20:13-20:22  a_->b_
+testdata/language-features/basic-values/fixity02.lc 20:13-20:22  a_->a_
 testdata/language-features/basic-values/fixity02.lc 20:13-20:49  Float
 testdata/language-features/basic-values/fixity02.lc 20:16-20:22  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/fixity02.lc 20:23-20:26  Char
-testdata/language-features/basic-values/fixity02.lc 20:23-20:33  a_->b_
+testdata/language-features/basic-values/fixity02.lc 20:23-20:33  a_->a_
 testdata/language-features/basic-values/fixity02.lc 20:23-20:49  Float
 testdata/language-features/basic-values/fixity02.lc 20:27-20:33  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/fixity02.lc 20:34-20:38  String
-testdata/language-features/basic-values/fixity02.lc 20:34-20:45  a_->b_
+testdata/language-features/basic-values/fixity02.lc 20:34-20:45  a_->a_
 testdata/language-features/basic-values/fixity02.lc 20:34-20:49  Float
 testdata/language-features/basic-values/fixity02.lc 20:39-20:45  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/fixity02.lc 20:46-20:49  Float
 testdata/language-features/basic-values/fixity02.lc 20:53-20:58  Type
 testdata/language-features/basic-values/fixity02.lc 21:1-21:10  Float
 testdata/language-features/basic-values/fixity02.lc 21:13-21:15  ()
-testdata/language-features/basic-values/fixity02.lc 21:13-21:22  a_->b_
+testdata/language-features/basic-values/fixity02.lc 21:13-21:22  a_->a_
 testdata/language-features/basic-values/fixity02.lc 21:13-21:49  Float
 testdata/language-features/basic-values/fixity02.lc 21:16-21:22  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/fixity02.lc 21:23-21:26  Char
 testdata/language-features/basic-values/fixity02.lc 21:23-21:33  a_->Char
 testdata/language-features/basic-values/fixity02.lc 21:23-21:38  Char
-testdata/language-features/basic-values/fixity02.lc 21:23-21:45  a_->b_
+testdata/language-features/basic-values/fixity02.lc 21:23-21:45  a_->a_
 testdata/language-features/basic-values/fixity02.lc 21:23-21:49  Float
 testdata/language-features/basic-values/fixity02.lc 21:27-21:33  {a} -> {b} -> a -> b->a
 testdata/language-features/basic-values/fixity02.lc 21:34-21:38  String
@@ -183,13 +183,13 @@ testdata/language-features/basic-values/fixity02.lc 22:1-22:10  Float
 testdata/language-features/basic-values/fixity02.lc 22:13-22:15  ()
 testdata/language-features/basic-values/fixity02.lc 22:13-22:22  a_->()
 testdata/language-features/basic-values/fixity02.lc 22:13-22:26  ()
-testdata/language-features/basic-values/fixity02.lc 22:13-22:33  a_->b_
+testdata/language-features/basic-values/fixity02.lc 22:13-22:33  a_->a_
 testdata/language-features/basic-values/fixity02.lc 22:13-22:49  Float
 testdata/language-features/basic-values/fixity02.lc 22:16-22:22  {a} -> {b} -> a -> b->a
 testdata/language-features/basic-values/fixity02.lc 22:23-22:26  Char
 testdata/language-features/basic-values/fixity02.lc 22:27-22:33  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/fixity02.lc 22:34-22:38  String
-testdata/language-features/basic-values/fixity02.lc 22:34-22:45  a_->b_
+testdata/language-features/basic-values/fixity02.lc 22:34-22:45  a_->a_
 testdata/language-features/basic-values/fixity02.lc 22:34-22:49  Float
 testdata/language-features/basic-values/fixity02.lc 22:39-22:45  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/fixity02.lc 22:46-22:49  Float
@@ -198,7 +198,7 @@ testdata/language-features/basic-values/fixity02.lc 23:1-23:10  Float
 testdata/language-features/basic-values/fixity02.lc 23:13-23:15  ()
 testdata/language-features/basic-values/fixity02.lc 23:13-23:22  a_->()
 testdata/language-features/basic-values/fixity02.lc 23:13-23:38  ()
-testdata/language-features/basic-values/fixity02.lc 23:13-23:45  a_->b_
+testdata/language-features/basic-values/fixity02.lc 23:13-23:45  a_->a_
 testdata/language-features/basic-values/fixity02.lc 23:13-23:49  Float
 testdata/language-features/basic-values/fixity02.lc 23:16-23:22  {a} -> {b} -> a -> b->a
 testdata/language-features/basic-values/fixity02.lc 23:23-23:26  Char
@@ -211,11 +211,11 @@ testdata/language-features/basic-values/fixity02.lc 23:46-23:49  Float
 testdata/language-features/basic-values/fixity02.lc 23:53-23:58  Type
 testdata/language-features/basic-values/fixity02.lc 24:1-24:10  String
 testdata/language-features/basic-values/fixity02.lc 24:13-24:15  ()
-testdata/language-features/basic-values/fixity02.lc 24:13-24:22  a_->b_
+testdata/language-features/basic-values/fixity02.lc 24:13-24:22  a_->a_
 testdata/language-features/basic-values/fixity02.lc 24:13-24:49  String
 testdata/language-features/basic-values/fixity02.lc 24:16-24:22  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/fixity02.lc 24:23-24:26  Char
-testdata/language-features/basic-values/fixity02.lc 24:23-24:33  a_->b_
+testdata/language-features/basic-values/fixity02.lc 24:23-24:33  a_->a_
 testdata/language-features/basic-values/fixity02.lc 24:23-24:49  String
 testdata/language-features/basic-values/fixity02.lc 24:27-24:33  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/fixity02.lc 24:34-24:38  String
@@ -226,7 +226,7 @@ testdata/language-features/basic-values/fixity02.lc 24:46-24:49  Float
 testdata/language-features/basic-values/fixity02.lc 24:53-24:59  Type
 testdata/language-features/basic-values/fixity02.lc 25:1-25:10  Char
 testdata/language-features/basic-values/fixity02.lc 25:13-25:15  ()
-testdata/language-features/basic-values/fixity02.lc 25:13-25:22  a_->b_
+testdata/language-features/basic-values/fixity02.lc 25:13-25:22  a_->a_
 testdata/language-features/basic-values/fixity02.lc 25:13-25:49  Char
 testdata/language-features/basic-values/fixity02.lc 25:16-25:22  {a} -> {b} -> a -> b->b
 testdata/language-features/basic-values/fixity02.lc 25:23-25:26  Char
@@ -243,7 +243,7 @@ testdata/language-features/basic-values/fixity02.lc 26:1-26:10  String
 testdata/language-features/basic-values/fixity02.lc 26:13-26:15  ()
 testdata/language-features/basic-values/fixity02.lc 26:13-26:22  a_->()
 testdata/language-features/basic-values/fixity02.lc 26:13-26:26  ()
-testdata/language-features/basic-values/fixity02.lc 26:13-26:33  a_->b_
+testdata/language-features/basic-values/fixity02.lc 26:13-26:33  a_->a_
 testdata/language-features/basic-values/fixity02.lc 26:13-26:49  String
 testdata/language-features/basic-values/fixity02.lc 26:16-26:22  {a} -> {b} -> a -> b->a
 testdata/language-features/basic-values/fixity02.lc 26:23-26:26  Char
diff --git a/testdata/language-features/basic-values/infix02.out b/testdata/language-features/basic-values/infix02.out
index 16d50a6f..c5c2b99c 100644
--- a/testdata/language-features/basic-values/infix02.out
+++ b/testdata/language-features/basic-values/infix02.out
@@ -7,7 +7,7 @@ testdata/language-features/basic-values/infix02.lc 1:1-1:4  {a} -> {b} -> {c} ->
 testdata/language-features/basic-values/infix02.lc 1:13-1:15  ()
 testdata/language-features/basic-values/infix02.lc 3:1-3:6  {a} -> {b} -> {c} -> a -> b -> c->()
 testdata/language-features/basic-values/infix02.lc 3:13-3:14  g_
-testdata/language-features/basic-values/infix02.lc 3:13-3:20  b_ -> b_->()
+testdata/language-features/basic-values/infix02.lc 3:13-3:20  b_ -> a_->()
 testdata/language-features/basic-values/infix02.lc 3:13-3:22  a_->()
 testdata/language-features/basic-values/infix02.lc 3:15-3:20  {a} -> {b} -> {c} -> a -> b -> c->()
 testdata/language-features/basic-values/infix02.lc 3:21-3:22  d_
diff --git a/testdata/language-features/basic-values/typesig03.out b/testdata/language-features/basic-values/typesig03.out
index 49f21cd9..720df136 100644
--- a/testdata/language-features/basic-values/typesig03.out
+++ b/testdata/language-features/basic-values/typesig03.out
@@ -11,7 +11,7 @@ testdata/language-features/basic-values/typesig03.lc 1:19-1:20  d_
 testdata/language-features/basic-values/typesig03.lc 1:19-1:26  Type
 testdata/language-features/basic-values/typesig03.lc 1:24-1:26  Type
 testdata/language-features/basic-values/typesig03.lc 2:1-2:5  {a} -> {b} -> {c} -> a -> b -> c->()
-testdata/language-features/basic-values/typesig03.lc 2:14-2:16  () | c_ -> c_ -> c_->() | c_ -> c_->() | c_->()
+testdata/language-features/basic-values/typesig03.lc 2:14-2:16  () | c_ -> b_ -> a_->() | c_ -> b_->() | c_->()
 testdata/language-features/basic-values/typesig03.lc 4:7-4:8  f_
 testdata/language-features/basic-values/typesig03.lc 4:7-4:18  Type
 testdata/language-features/basic-values/typesig03.lc 4:10-4:11  e_
@@ -20,4 +20,4 @@ testdata/language-features/basic-values/typesig03.lc 4:13-4:14  d_
 testdata/language-features/basic-values/typesig03.lc 4:13-4:18  Type
 testdata/language-features/basic-values/typesig03.lc 4:16-4:18  Type
 testdata/language-features/basic-values/typesig03.lc 5:1-5:5  {a} -> {b} -> {c} -> a -> b -> c->()
-testdata/language-features/basic-values/typesig03.lc 5:14-5:16  () | c_ -> c_ -> c_->() | c_ -> c_->() | c_->()
+testdata/language-features/basic-values/typesig03.lc 5:14-5:16  () | c_ -> b_ -> a_->() | c_ -> b_->() | c_->()
diff --git a/testdata/language-features/basic-values/typesig04.out b/testdata/language-features/basic-values/typesig04.out
index 0661ca9c..9d7d2072 100644
--- a/testdata/language-features/basic-values/typesig04.out
+++ b/testdata/language-features/basic-values/typesig04.out
@@ -10,7 +10,7 @@ testdata/language-features/basic-values/typesig04.lc 1:15-1:16  e_
 testdata/language-features/basic-values/typesig04.lc 1:20-1:21  Type | d_
 testdata/language-features/basic-values/typesig04.lc 1:26-1:28  Type
 testdata/language-features/basic-values/typesig04.lc 2:1-2:5  {a} -> {b} -> {c} -> a -> (b->c)->()
-testdata/language-features/basic-values/typesig04.lc 2:12-2:14  () | (c_->c_)->() | c_ -> (c_->c_)->()
+testdata/language-features/basic-values/typesig04.lc 2:12-2:14  () | (c_->b_)->() | c_ -> (b_->a_)->()
 testdata/language-features/basic-values/typesig04.lc 4:7-4:8  f_
 testdata/language-features/basic-values/typesig04.lc 4:7-4:20  Type
 testdata/language-features/basic-values/typesig04.lc 4:10-4:20  Type
@@ -18,4 +18,4 @@ testdata/language-features/basic-values/typesig04.lc 4:11-4:12  e_
 testdata/language-features/basic-values/typesig04.lc 4:14-4:15  Type | d_
 testdata/language-features/basic-values/typesig04.lc 4:18-4:20  Type
 testdata/language-features/basic-values/typesig04.lc 5:1-5:5  {a} -> {b} -> {c} -> a -> (b->c)->()
-testdata/language-features/basic-values/typesig04.lc 5:12-5:14  () | (c_->c_)->() | c_ -> (c_->c_)->()
+testdata/language-features/basic-values/typesig04.lc 5:12-5:14  () | (c_->b_)->() | c_ -> (b_->a_)->()
diff --git a/testdata/language-features/basic-values/typesig05.out b/testdata/language-features/basic-values/typesig05.out
index 4c781fa8..a2d2e91d 100644
--- a/testdata/language-features/basic-values/typesig05.out
+++ b/testdata/language-features/basic-values/typesig05.out
@@ -20,7 +20,7 @@ testdata/language-features/basic-values/typesig05.lc 4:19-4:22  String
 testdata/language-features/basic-values/typesig05.lc 4:26-4:30  Type
 testdata/language-features/basic-values/typesig05.lc 5:1-5:7  String
 testdata/language-features/basic-values/typesig05.lc 5:10-5:14  {a} -> {b} -> a -> b->b
-testdata/language-features/basic-values/typesig05.lc 5:10-5:18  a_->b_
+testdata/language-features/basic-values/typesig05.lc 5:10-5:18  a_->a_
 testdata/language-features/basic-values/typesig05.lc 5:10-5:22  String
 testdata/language-features/basic-values/typesig05.lc 5:15-5:18  Char
 testdata/language-features/basic-values/typesig05.lc 5:19-5:22  String
@@ -35,7 +35,7 @@ testdata/language-features/basic-values/typesig05.lc 8:19-8:22  String
 testdata/language-features/basic-values/typesig05.lc 10:11-10:17  Type
 testdata/language-features/basic-values/typesig05.lc 11:1-11:7  String
 testdata/language-features/basic-values/typesig05.lc 11:10-11:14  {a} -> {b} -> a -> b->b
-testdata/language-features/basic-values/typesig05.lc 11:10-11:18  a_->b_
+testdata/language-features/basic-values/typesig05.lc 11:10-11:18  a_->a_
 testdata/language-features/basic-values/typesig05.lc 11:10-11:22  String
 testdata/language-features/basic-values/typesig05.lc 11:15-11:18  Char
 testdata/language-features/basic-values/typesig05.lc 11:19-11:22  String
diff --git a/testdata/language-features/pattern/uncovered.out b/testdata/language-features/pattern/uncovered.out
index 74f875cb..c96c691e 100644
--- a/testdata/language-features/pattern/uncovered.out
+++ b/testdata/language-features/pattern/uncovered.out
@@ -4,10 +4,10 @@ f :: {a} -> {_ : 'Num a[0;32
 ------------ tooltips
 testdata/language-features/pattern/uncovered.lc 4:1-4:2  {a} -> {_ : Num a} -> Bool -> Bool -> Bool->a
 testdata/language-features/pattern/uncovered.lc 4:18-4:19  b_
-testdata/language-features/pattern/uncovered.lc 4:18-5:19  Bool->d_ | c_
-testdata/language-features/pattern/uncovered.lc 4:18-6:19  Bool->d_
+testdata/language-features/pattern/uncovered.lc 4:18-5:19  Bool->c_ | c_
+testdata/language-features/pattern/uncovered.lc 4:18-6:19  Bool->c_
 testdata/language-features/pattern/uncovered.lc 5:18-5:19  b_ | c_
-testdata/language-features/pattern/uncovered.lc 5:18-6:19  Bool->d_ | b_
+testdata/language-features/pattern/uncovered.lc 5:18-6:19  Bool->c_ | b_
 testdata/language-features/pattern/uncovered.lc 6:18-6:19  b_
 ------------ warnings
 Uncovered pattern(s) at testdata/language-features/pattern/uncovered.lc:4:1:
diff --git a/testdata/language-features/recursion/simplerec01.out b/testdata/language-features/recursion/simplerec01.out
index e975d532..9be285c9 100644
--- a/testdata/language-features/recursion/simplerec01.out
+++ b/testdata/language-features/recursion/simplerec01.out
@@ -4,6 +4,6 @@ fun :: {a} -> {_ : 'Num a[0;
 ------------ tooltips
 testdata/language-features/recursion/simplerec01.lc 1:1-1:4  {a} -> {_ : Num a} -> {_ : Eq a} -> {_ : Num a} -> a->Char
 testdata/language-features/recursion/simplerec01.lc 1:9-1:12  Char
-testdata/language-features/recursion/simplerec01.lc 1:9-2:14  Bool->Char | a_->b_
+testdata/language-features/recursion/simplerec01.lc 1:9-2:14  Bool->Char | a_->a_
 testdata/language-features/recursion/simplerec01.lc 2:9-2:12  e_
 testdata/language-features/recursion/simplerec01.lc 2:13-2:14  b_
diff --git a/testdata/language-features/recursion/simplerec02.out b/testdata/language-features/recursion/simplerec02.out
index 96ad9d37..43dd847f 100644
--- a/testdata/language-features/recursion/simplerec02.out
+++ b/testdata/language-features/recursion/simplerec02.out
@@ -4,7 +4,7 @@ value :: ()
 ------------ tooltips
 testdata/language-features/recursion/simplerec02.lc 1:1-1:6  ()
 testdata/language-features/recursion/simplerec02.lc 1:21-1:24  Char
-testdata/language-features/recursion/simplerec02.lc 1:21-2:26  Bool->Char | a_->b_
+testdata/language-features/recursion/simplerec02.lc 1:21-2:26  Bool->Char | a_->a_
 testdata/language-features/recursion/simplerec02.lc 2:21-2:24  e_
 testdata/language-features/recursion/simplerec02.lc 2:25-2:26  b_
 testdata/language-features/recursion/simplerec02.lc 3:12-3:14  ()
diff --git a/testdata/language-features/recursion/simplerec03.out b/testdata/language-features/recursion/simplerec03.out
index 27c2981e..30b0755d 100644
--- a/testdata/language-features/recursion/simplerec03.out
+++ b/testdata/language-features/recursion/simplerec03.out
@@ -5,6 +5,6 @@ value :: ()
 testdata/language-features/recursion/simplerec03.lc 1:1-1:6  ()
 testdata/language-features/recursion/simplerec03.lc 1:9-1:11  ()
 testdata/language-features/recursion/simplerec03.lc 3:13-3:16  Char
-testdata/language-features/recursion/simplerec03.lc 3:13-4:18  Bool->Char | a_->b_
+testdata/language-features/recursion/simplerec03.lc 3:13-4:18  Bool->Char | a_->a_
 testdata/language-features/recursion/simplerec03.lc 4:13-4:16  e_
 testdata/language-features/recursion/simplerec03.lc 4:17-4:18  b_