switch to Haskell style syntax in pretty print

38 files changed, 373 insertions, 373 deletions

diff --git a/testdata/language-features/basic-values/case02.out b/testdata/language-features/basic-values/case02.out
index 5c602ef2..e1b5a2e5 100644
--- a/testdata/language-features/basic-values/case02.out
+++ b/testdata/language-features/basic-values/case02.out
@@ -1,19 +1,19 @@
 main is not found
 ------------ trace
-value1 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a}->()
-value2 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a} -> {_ : 'Eq a} -> {_ : 'Num a}->'String
+value1 :: forall a . ('Eq a, 'Num a) => ()
+value2 :: forall a . ('Eq a, 'Num a, 'Eq a, 'Num a) => 'String
 ------------ tooltips
-testdata/language-features/basic-values/case02.lc 1:1-1:7  {a} -> {_ : Eq a} -> {_ : Num a}->()
+testdata/language-features/basic-values/case02.lc 1:1-1:7  forall a . (Eq a, Num a) => ()
 testdata/language-features/basic-values/case02.lc 1:10-3:10  ()
-testdata/language-features/basic-values/case02.lc 1:15-1:16  b_
+testdata/language-features/basic-values/case02.lc 1:15-1:16  _b
 testdata/language-features/basic-values/case02.lc 2:8-2:10  ()
-testdata/language-features/basic-values/case02.lc 2:8-3:10  Bool->()
+testdata/language-features/basic-values/case02.lc 2:8-3:10  Bool -> ()
 testdata/language-features/basic-values/case02.lc 3:8-3:10  ()
-testdata/language-features/basic-values/case02.lc 5:1-5:7  {a} -> {_ : Eq a} -> {_ : Num a} -> {_ : Eq a} -> {_ : Num a}->String
+testdata/language-features/basic-values/case02.lc 5:1-5:7  forall a . (Eq a, Num a, Eq a, Num a) => String
 testdata/language-features/basic-values/case02.lc 5:10-8:11  String
-testdata/language-features/basic-values/case02.lc 5:15-5:16  b_
+testdata/language-features/basic-values/case02.lc 5:15-5:16  _b
 testdata/language-features/basic-values/case02.lc 6:8-6:11  String
-testdata/language-features/basic-values/case02.lc 6:8-8:11  Bool->String
+testdata/language-features/basic-values/case02.lc 6:8-8:11  Bool -> String
 testdata/language-features/basic-values/case02.lc 7:8-7:11  String
-testdata/language-features/basic-values/case02.lc 7:8-8:11  Bool->String | String
+testdata/language-features/basic-values/case02.lc 7:8-8:11  Bool -> String | String
 testdata/language-features/basic-values/case02.lc 8:8-8:11  String
diff --git a/testdata/language-features/basic-values/case03.reject.out b/testdata/language-features/basic-values/case03.reject.out
index 8277264e..314fa80e 100644
--- a/testdata/language-features/basic-values/case03.reject.out
+++ b/testdata/language-features/basic-values/case03.reject.out
@@ -15,5 +15,5 @@ value1 = case () of
 testdata/language-features/basic-values/case03.reject.lc 1:10-3:10  ()
 testdata/language-features/basic-values/case03.reject.lc 1:15-1:17  ()
 testdata/language-features/basic-values/case03.reject.lc 2:8-2:10  ()
-testdata/language-features/basic-values/case03.reject.lc 2:8-3:10  Bool->()
+testdata/language-features/basic-values/case03.reject.lc 2:8-3:10  Bool -> ()
 testdata/language-features/basic-values/case03.reject.lc 3:8-3:10  ()
diff --git a/testdata/language-features/basic-values/case05.out b/testdata/language-features/basic-values/case05.out
index f4f03c51..cfd1d9af 100644
--- a/testdata/language-features/basic-values/case05.out
+++ b/testdata/language-features/basic-values/case05.out
@@ -1,15 +1,15 @@
 main is not found
 ------------ trace
-value :: {a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a->'Char
+value :: forall a . ('Eq a, 'Num a) => a -> 'Char
 ------------ tooltips
-testdata/language-features/basic-values/case05.lc 1:1-1:6  {a} -> {_ : Eq a} -> {_ : Num a} -> a->Char
+testdata/language-features/basic-values/case05.lc 1:1-1:6  forall a . (Eq a, Num a) => a -> Char
 testdata/language-features/basic-values/case05.lc 1:11-2:11  Char
-testdata/language-features/basic-values/case05.lc 1:16-1:17  e_
+testdata/language-features/basic-values/case05.lc 1:16-1:17  _e
 testdata/language-features/basic-values/case05.lc 2:8-2:11  Char
 ------------ warnings
 Uncovered pattern(s) at testdata/language-features/basic-values/case05.lc:1:16:
 value x = case x of
                ^
 Missing case(s):
-  _ | False <- fromInt 1 == a_
+  _ | False <- fromInt 1 == _a
 
diff --git a/testdata/language-features/basic-values/case06.out b/testdata/language-features/basic-values/case06.out
index 2867cc57..40e7db3b 100644
--- a/testdata/language-features/basic-values/case06.out
+++ b/testdata/language-features/basic-values/case06.out
@@ -1,10 +1,10 @@
 main is not found
 ------------ trace
-value :: {a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a->'Char
+value :: forall a . ('Eq a, 'Num a) => a -> 'Char
 ------------ tooltips
-testdata/language-features/basic-values/case06.lc 1:1-1:6  {a} -> {_ : Eq a} -> {_ : Num a} -> a->Char
+testdata/language-features/basic-values/case06.lc 1:1-1:6  forall a . (Eq a, Num a) => a -> Char
 testdata/language-features/basic-values/case06.lc 1:11-3:11  Char
-testdata/language-features/basic-values/case06.lc 1:16-1:17  e_
+testdata/language-features/basic-values/case06.lc 1:16-1:17  _e
 testdata/language-features/basic-values/case06.lc 2:8-2:11  Char
-testdata/language-features/basic-values/case06.lc 2:8-3:11  Bool->Char
+testdata/language-features/basic-values/case06.lc 2:8-3:11  Bool -> 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 a44de4d8..affad824 100644
--- a/testdata/language-features/basic-values/data01.out
+++ b/testdata/language-features/basic-values/data01.out
@@ -4,20 +4,20 @@ main is not found
 B :: 'A
 C :: 'A
 D :: 'A
-'ACase :: (a : 'A->Type) -> a B -> a C -> a D -> (b:'A) -> a b
-match'A :: (a : Type->Type) -> a 'A -> (b:Type) -> a b -> a b
+'ACase :: (a :: 'A -> Type) -> a B -> a C -> a D -> (b :: 'A) -> a b
+match'A :: (a :: Type -> Type) -> a 'A -> (b :: Type) -> a b -> a b
 'E :: Type
 F :: 'E
-G :: ()->'E
+G :: () -> 'E
 H :: 'E
-'ECase :: (a : 'E->Type) -> a F -> ((b:()) -> a (G b)) -> a H -> (c:'E) -> a c
-match'E :: (a : Type->Type) -> a 'E -> (b:Type) -> a b -> a b
+'ECase :: (a :: 'E -> Type) -> a F -> ((b :: ()) -> a (G b)) -> a H -> (c :: 'E) -> a c
+match'E :: (a :: Type -> Type) -> a 'E -> (b :: Type) -> a b -> a b
 'D1 :: Type
 C1 :: 'D1
-C2 :: ()->'D1
+C2 :: () -> 'D1
 C3 :: 'D1
-'D1Case :: (a : 'D1->Type) -> a C1 -> ((b:()) -> a (C2 b)) -> a C3 -> (c:'D1) -> a c
-match'D1 :: (a : Type->Type) -> a 'D1 -> (b:Type) -> a b -> a b
+'D1Case :: (a :: 'D1 -> Type) -> a C1 -> ((b :: ()) -> a (C2 b)) -> a C3 -> (c :: 'D1) -> a c
+match'D1 :: (a :: Type -> Type) -> a 'D1 -> (b :: Type) -> a b -> a b
 ------------ tooltips
 testdata/language-features/basic-values/data01.lc 1:6-1:7  Type
 testdata/language-features/basic-values/data01.lc 1:6-1:13  Type
@@ -27,12 +27,12 @@ testdata/language-features/basic-values/data01.lc 1:12-1:13  A
 testdata/language-features/basic-values/data01.lc 3:6-3:7  Type
 testdata/language-features/basic-values/data01.lc 3:6-3:22  Type
 testdata/language-features/basic-values/data01.lc 3:10-3:11  E
-testdata/language-features/basic-values/data01.lc 3:14-3:15  ()->E | E | Type
+testdata/language-features/basic-values/data01.lc 3:14-3:15  () -> E | E | Type
 testdata/language-features/basic-values/data01.lc 3:16-3:18  Type
 testdata/language-features/basic-values/data01.lc 3:21-3:22  E
 testdata/language-features/basic-values/data01.lc 5:6-5:8  Type
 testdata/language-features/basic-values/data01.lc 5:6-6:13  Type
 testdata/language-features/basic-values/data01.lc 5:9-5:11  D1
-testdata/language-features/basic-values/data01.lc 6:5-6:7  ()->D1 | D1 | Type
+testdata/language-features/basic-values/data01.lc 6:5-6:7  () -> D1 | D1 | Type
 testdata/language-features/basic-values/data01.lc 6:7-6:9  Type
 testdata/language-features/basic-values/data01.lc 6:11-6:13  D1
diff --git a/testdata/language-features/basic-values/def01.out b/testdata/language-features/basic-values/def01.out
index 4fa69d6c..6c174057 100644
--- a/testdata/language-features/basic-values/def01.out
+++ b/testdata/language-features/basic-values/def01.out
@@ -1,12 +1,12 @@
 main is not found
 ------------ trace
 unit :: ()
-fun1 :: {a} -> {b} -> {_ : 'Num b} -> a->b
-fun2 :: {a} -> {b} -> {c} -> {d} -> {e} -> a -> b -> c -> d -> e->'Char
+fun1 :: forall a b . 'Num b => a -> b
+fun2 :: forall a b c d e . a -> b -> c -> d -> e -> 'Char
 ------------ tooltips
 testdata/language-features/basic-values/def01.lc 1:1-1:5  ()
 testdata/language-features/basic-values/def01.lc 1:8-1:10  ()
-testdata/language-features/basic-values/def01.lc 3:1-3:5  {a} -> {b} -> {_ : Num b} -> a->b
-testdata/language-features/basic-values/def01.lc 3:10-3:11  b_
-testdata/language-features/basic-values/def01.lc 5:1-5:5  {a} -> {b} -> {c} -> {d} -> {e} -> a -> b -> c -> d -> e->Char
+testdata/language-features/basic-values/def01.lc 3:1-3:5  forall a b . Num b => a -> b
+testdata/language-features/basic-values/def01.lc 3:10-3:11  _b
+testdata/language-features/basic-values/def01.lc 5:1-5:5  forall a b c d e . a -> b -> c -> d -> e -> Char
 testdata/language-features/basic-values/def01.lc 5:18-5:21  Char
diff --git a/testdata/language-features/basic-values/def03.out b/testdata/language-features/basic-values/def03.out
index 3161d04a..02db7cba 100644
--- a/testdata/language-features/basic-values/def03.out
+++ b/testdata/language-features/basic-values/def03.out
@@ -1,15 +1,15 @@
 main is not found
 ------------ trace
-fun :: {a} -> {_ : 'Eq a} -> {_ : 'Num a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a->'Char
+fun :: forall a . ('Eq a, 'Num a, 'Eq a, 'Num a) => a -> 'Char
 ------------ tooltips
-testdata/language-features/basic-values/def03.lc 1:1-1:4  {a} -> {_ : Eq a} -> {_ : Num a} -> {_ : Eq a} -> {_ : Num a} -> a->Char
+testdata/language-features/basic-values/def03.lc 1:1-1:4  forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
 testdata/language-features/basic-values/def03.lc 1:9-1:12  Char
-testdata/language-features/basic-values/def03.lc 1:9-2:12  Bool->Char
+testdata/language-features/basic-values/def03.lc 1:9-2:12  Bool -> Char
 testdata/language-features/basic-values/def03.lc 2:9-2:12  Char
 ------------ warnings
 Uncovered pattern(s) at testdata/language-features/basic-values/def03.lc:1:1:
 fun 1 = '1'
 fun 2 = '2'
 Missing case(s):
-  _ | False <- fromInt 1 == a_, False <- fromInt 2 == a_
+  _ | False <- fromInt 1 == _a, False <- fromInt 2 == _a
 
diff --git a/testdata/language-features/basic-values/def04.out b/testdata/language-features/basic-values/def04.out
index 9b3e36f2..1f3fbeb7 100644
--- a/testdata/language-features/basic-values/def04.out
+++ b/testdata/language-features/basic-values/def04.out
@@ -1,17 +1,17 @@
 main is not found
 ------------ trace
-fun :: {a} -> {_ : 'Eq a} -> {_ : 'Num a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a->'Char
-fun2 :: {a} -> {b} -> {_ : 'Eq a} -> {_ : 'Num a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a -> b->'Char
+fun :: forall a . ('Eq a, 'Num a, 'Eq a, 'Num a) => a -> 'Char
+fun2 :: forall a b . ('Eq a, 'Num a, 'Eq a, 'Num a) => a -> b -> 'Char
 ------------ tooltips
-testdata/language-features/basic-values/def04.lc 1:1-1:4  {a} -> {_ : Eq a} -> {_ : Num a} -> {_ : Eq a} -> {_ : Num a} -> a->Char
+testdata/language-features/basic-values/def04.lc 1:1-1:4  forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
 testdata/language-features/basic-values/def04.lc 1:9-1:12  Char
-testdata/language-features/basic-values/def04.lc 1:9-3:12  Bool->Char
+testdata/language-features/basic-values/def04.lc 1:9-3:12  Bool -> Char
 testdata/language-features/basic-values/def04.lc 2:9-2:12  Char
-testdata/language-features/basic-values/def04.lc 2:9-3:12  Bool->Char | Char
+testdata/language-features/basic-values/def04.lc 2:9-3:12  Bool -> Char | Char
 testdata/language-features/basic-values/def04.lc 3:9-3:12  Char
-testdata/language-features/basic-values/def04.lc 5:1-5:5  {a} -> {b} -> {_ : Eq a} -> {_ : Num a} -> {_ : Eq a} -> {_ : Num a} -> a -> b->Char
+testdata/language-features/basic-values/def04.lc 5:1-5:5  forall a b . (Eq a, Num a, Eq a, Num a) => a -> b -> Char
 testdata/language-features/basic-values/def04.lc 5:12-5:15  Char
-testdata/language-features/basic-values/def04.lc 5:12-7:15  Bool->Char
+testdata/language-features/basic-values/def04.lc 5:12-7:15  Bool -> Char
 testdata/language-features/basic-values/def04.lc 6:12-6:15  Char
-testdata/language-features/basic-values/def04.lc 6:12-7:15  Bool->Char | Char
+testdata/language-features/basic-values/def04.lc 6:12-7:15  Bool -> Char | Char
 testdata/language-features/basic-values/def04.lc 7:12-7:15  Char
diff --git a/testdata/language-features/basic-values/def07.reject.out b/testdata/language-features/basic-values/def07.reject.out
index e54d61ca..be624025 100644
--- a/testdata/language-features/basic-values/def07.reject.out
+++ b/testdata/language-features/basic-values/def07.reject.out
@@ -5,9 +5,9 @@ fun _ = '_'
 fun 1 = '1'
 ^^^
 ------------ trace
-fun :: {a} -> {_ : 'Eq a} -> {_ : 'Num a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a->'Char
-fun2 :: {a} -> {b} -> {_ : 'Eq a} -> {_ : 'Num a} -> a -> b->'Char
-fun :: {a} -> a->'Char
+fun :: forall a . ('Eq a, 'Num a, 'Eq a, 'Num a) => a -> 'Char
+fun2 :: forall a b . ('Eq a, 'Num a) => a -> b -> 'Char
+fun :: forall a . a -> 'Char
 !already defined fun at testdata/language-features/basic-values/def07.reject.lc:4:1:
 fun _ = '_'
 ^^^
@@ -15,24 +15,24 @@ fun _ = '_'
 fun 1 = '1'
 ^^^
 ------------ tooltips
-testdata/language-features/basic-values/def07.reject.lc 1:1-1:4  {a} -> {_ : Eq a} -> {_ : Num a} -> {_ : Eq a} -> {_ : Num a} -> a->Char
+testdata/language-features/basic-values/def07.reject.lc 1:1-1:4  forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
 testdata/language-features/basic-values/def07.reject.lc 1:9-1:12  Char
-testdata/language-features/basic-values/def07.reject.lc 1:9-2:12  Bool->Char
+testdata/language-features/basic-values/def07.reject.lc 1:9-2:12  Bool -> Char
 testdata/language-features/basic-values/def07.reject.lc 2:9-2:12  Char
-testdata/language-features/basic-values/def07.reject.lc 3:1-3:5  {a} -> {b} -> {_ : Eq a} -> {_ : Num a} -> a -> b->Char
+testdata/language-features/basic-values/def07.reject.lc 3:1-3:5  forall a b . (Eq a, Num a) => a -> b -> Char
 testdata/language-features/basic-values/def07.reject.lc 3:12-3:15  Char
-testdata/language-features/basic-values/def07.reject.lc 4:1-4:4  {a} -> a->Char
+testdata/language-features/basic-values/def07.reject.lc 4:1-4:4  forall a . a -> Char
 testdata/language-features/basic-values/def07.reject.lc 4:9-4:12  Char
 ------------ warnings
 Uncovered pattern(s) at testdata/language-features/basic-values/def07.reject.lc:1:1:
 fun 1 = '1'
 fun 2 = '2'
 Missing case(s):
-  _ | False <- fromInt 1 == a_, False <- fromInt 2 == a_
+  _ | False <- fromInt 1 == _a, False <- fromInt 2 == _a
 
 Uncovered pattern(s) at testdata/language-features/basic-values/def07.reject.lc:3:1:
 fun2 1 _ = '1'
 ^^^^
 Missing case(s):
-  _ _ | False <- fromInt 1 == b_
+  _ _ | False <- fromInt 1 == _b
 
diff --git a/testdata/language-features/basic-values/fixity01.out b/testdata/language-features/basic-values/fixity01.out
index 4d3a5cf9..f30cd6fa 100644
--- a/testdata/language-features/basic-values/fixity01.out
+++ b/testdata/language-features/basic-values/fixity01.out
@@ -1,15 +1,15 @@
 main is not found
 ------------ trace
-funL :: {a} -> {b} -> a -> b->a
-funR :: {a} -> {b} -> a -> b->a
-<<<< :: {a} -> {b} -> a -> b->a
->>>> :: {a} -> {b} -> a -> b->b
+funL :: forall a b . a -> b -> a
+funR :: forall a b . a -> b -> a
+<<<< :: forall a b . a -> b -> a
+>>>> :: forall a b . a -> b -> b
 ------------ tooltips
-testdata/language-features/basic-values/fixity01.lc 1:1-1:5  {a} -> {b} -> a -> b->a
-testdata/language-features/basic-values/fixity01.lc 1:12-1:13  d_
-testdata/language-features/basic-values/fixity01.lc 2:1-2:5  {a} -> {b} -> a -> b->a
-testdata/language-features/basic-values/fixity01.lc 2:12-2:13  d_
-testdata/language-features/basic-values/fixity01.lc 4:3-4:7  {a} -> {b} -> a -> b->a
-testdata/language-features/basic-values/fixity01.lc 4:12-4:13  d_
-testdata/language-features/basic-values/fixity01.lc 5:3-5:7  {a} -> {b} -> a -> b->b
-testdata/language-features/basic-values/fixity01.lc 5:12-5:13  b_
+testdata/language-features/basic-values/fixity01.lc 1:1-1:5  forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity01.lc 1:12-1:13  _d
+testdata/language-features/basic-values/fixity01.lc 2:1-2:5  forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity01.lc 2:12-2:13  _d
+testdata/language-features/basic-values/fixity01.lc 4:3-4:7  forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity01.lc 4:12-4:13  _d
+testdata/language-features/basic-values/fixity01.lc 5:3-5:7  forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity01.lc 5:12-5:13  _b
diff --git a/testdata/language-features/basic-values/fixity02.out b/testdata/language-features/basic-values/fixity02.out
index bed65026..2f87c92d 100644
--- a/testdata/language-features/basic-values/fixity02.out
+++ b/testdata/language-features/basic-values/fixity02.out
@@ -1,9 +1,9 @@
 main is not found
 ------------ trace
-funL :: {a} -> {b} -> a -> b->a
-funR :: {a} -> {b} -> a -> b->b
-<@ :: {a} -> {b} -> a -> b->a
-@> :: {a} -> {b} -> a -> b->b
+funL :: forall a b . a -> b -> a
+funR :: forall a b . a -> b -> b
+<@ :: forall a b . a -> b -> a
+@> :: forall a b . a -> b -> b
 value1 :: 'Float
 value2 :: 'Float
 value3 :: 'Float
@@ -21,251 +21,251 @@ funValue6 :: 'Char
 funValue7 :: 'String
 funValue8 :: ()
 ------------ tooltips
-testdata/language-features/basic-values/fixity02.lc 1:1-1:5  {a} -> {b} -> a -> b->a
-testdata/language-features/basic-values/fixity02.lc 1:12-1:13  d_
-testdata/language-features/basic-values/fixity02.lc 2:1-2:5  {a} -> {b} -> a -> b->b
-testdata/language-features/basic-values/fixity02.lc 2:12-2:13  b_
-testdata/language-features/basic-values/fixity02.lc 4:3-4:5  {a} -> {b} -> a -> b->a
-testdata/language-features/basic-values/fixity02.lc 4:10-4:11  d_
-testdata/language-features/basic-values/fixity02.lc 5:3-5:5  {a} -> {b} -> a -> b->b
-testdata/language-features/basic-values/fixity02.lc 5:10-5:11  b_
+testdata/language-features/basic-values/fixity02.lc 1:1-1:5  forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 1:12-1:13  _d
+testdata/language-features/basic-values/fixity02.lc 2:1-2:5  forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 2:12-2:13  _b
+testdata/language-features/basic-values/fixity02.lc 4:3-4:5  forall a b . a -> b -> a
+testdata/language-features/basic-values/fixity02.lc 4:10-4:11  _d
+testdata/language-features/basic-values/fixity02.lc 5:3-5:5  forall a b . a -> b -> b
+testdata/language-features/basic-values/fixity02.lc 5:10-5:11  _b
 testdata/language-features/basic-values/fixity02.lc 11:1-11:7  Float
 testdata/language-features/basic-values/fixity02.lc 11:10-11:12  ()
-testdata/language-features/basic-values/fixity02.lc 11:10-11:15  a_->a_
+testdata/language-features/basic-values/fixity02.lc 11:10-11: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:13-11:15  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 11:16-11:19  Char
-testdata/language-features/basic-values/fixity02.lc 11:16-11:22  a_->a_
+testdata/language-features/basic-values/fixity02.lc 11:16-11: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:20-11:22  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 11:23-11:27  String
-testdata/language-features/basic-values/fixity02.lc 11:23-11:30  a_->a_
+testdata/language-features/basic-values/fixity02.lc 11:23-11: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:28-11:30  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 11:31-11:34  Float
 testdata/language-features/basic-values/fixity02.lc 11:38-11:43  Type
 testdata/language-features/basic-values/fixity02.lc 12:1-12:7  Float
 testdata/language-features/basic-values/fixity02.lc 12:10-12:12  ()
-testdata/language-features/basic-values/fixity02.lc 12:10-12:15  a_->a_
+testdata/language-features/basic-values/fixity02.lc 12:10-12: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:13-12:15  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 12:16-12:19  Char
-testdata/language-features/basic-values/fixity02.lc 12:16-12:22  a_->Char
+testdata/language-features/basic-values/fixity02.lc 12:16-12:22  _a -> Char
 testdata/language-features/basic-values/fixity02.lc 12:16-12:27  Char
-testdata/language-features/basic-values/fixity02.lc 12:16-12:30  a_->a_
+testdata/language-features/basic-values/fixity02.lc 12:16-12: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:20-12:22  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 12:23-12:27  String
-testdata/language-features/basic-values/fixity02.lc 12:28-12:30  {a} -> {b} -> a -> b->b
+testdata/language-features/basic-values/fixity02.lc 12:28-12:30  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 12:31-12:34  Float
 testdata/language-features/basic-values/fixity02.lc 12:38-12:43  Type
 testdata/language-features/basic-values/fixity02.lc 13:1-13:7  Float
 testdata/language-features/basic-values/fixity02.lc 13:10-13:12  ()
-testdata/language-features/basic-values/fixity02.lc 13:10-13:15  a_->()
+testdata/language-features/basic-values/fixity02.lc 13:10-13:15  _a -> ()
 testdata/language-features/basic-values/fixity02.lc 13:10-13:19  ()
-testdata/language-features/basic-values/fixity02.lc 13:10-13:22  a_->a_
+testdata/language-features/basic-values/fixity02.lc 13:10-13: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:13-13:15  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 13:16-13:19  Char
-testdata/language-features/basic-values/fixity02.lc 13:20-13:22  {a} -> {b} -> a -> b->b
+testdata/language-features/basic-values/fixity02.lc 13:20-13:22  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 13:23-13:27  String
-testdata/language-features/basic-values/fixity02.lc 13:23-13:30  a_->a_
+testdata/language-features/basic-values/fixity02.lc 13:23-13: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:28-13:30  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 13:31-13:34  Float
 testdata/language-features/basic-values/fixity02.lc 13:38-13:43  Type
 testdata/language-features/basic-values/fixity02.lc 14:1-14:7  Float
 testdata/language-features/basic-values/fixity02.lc 14:10-14:12  ()
-testdata/language-features/basic-values/fixity02.lc 14:10-14:15  a_->()
+testdata/language-features/basic-values/fixity02.lc 14:10-14:15  _a -> ()
 testdata/language-features/basic-values/fixity02.lc 14:10-14:27  ()
-testdata/language-features/basic-values/fixity02.lc 14:10-14:30  a_->a_
+testdata/language-features/basic-values/fixity02.lc 14:10-14: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:13-14:15  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 14:16-14:19  Char
-testdata/language-features/basic-values/fixity02.lc 14:16-14:22  a_->Char
+testdata/language-features/basic-values/fixity02.lc 14:16-14:22  _a -> Char
 testdata/language-features/basic-values/fixity02.lc 14:16-14:27  Char
-testdata/language-features/basic-values/fixity02.lc 14:20-14:22  {a} -> {b} -> a -> b->a
+testdata/language-features/basic-values/fixity02.lc 14:20-14:22  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 14:23-14:27  String
-testdata/language-features/basic-values/fixity02.lc 14:28-14:30  {a} -> {b} -> a -> b->b
+testdata/language-features/basic-values/fixity02.lc 14:28-14:30  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 14:31-14:34  Float
 testdata/language-features/basic-values/fixity02.lc 14:38-14:43  Type
 testdata/language-features/basic-values/fixity02.lc 15:1-15:7  String
 testdata/language-features/basic-values/fixity02.lc 15:10-15:12  ()
-testdata/language-features/basic-values/fixity02.lc 15:10-15:15  a_->a_
+testdata/language-features/basic-values/fixity02.lc 15:10-15: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:13-15:15  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 15:16-15:19  Char
-testdata/language-features/basic-values/fixity02.lc 15:16-15:22  a_->a_
+testdata/language-features/basic-values/fixity02.lc 15:16-15: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:20-15:22  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 15:23-15:27  String
-testdata/language-features/basic-values/fixity02.lc 15:23-15:30  a_->String
+testdata/language-features/basic-values/fixity02.lc 15:23-15:30  _a -> String
 testdata/language-features/basic-values/fixity02.lc 15:23-15:34  String
-testdata/language-features/basic-values/fixity02.lc 15:28-15:30  {a} -> {b} -> a -> b->a
+testdata/language-features/basic-values/fixity02.lc 15:28-15:30  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 15:31-15:34  Float
 testdata/language-features/basic-values/fixity02.lc 15:38-15:44  Type
 testdata/language-features/basic-values/fixity02.lc 16:1-16:7  Char
 testdata/language-features/basic-values/fixity02.lc 16:10-16:12  ()
-testdata/language-features/basic-values/fixity02.lc 16:10-16:15  a_->a_
+testdata/language-features/basic-values/fixity02.lc 16:10-16: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:13-16:15  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 16:16-16:19  Char
-testdata/language-features/basic-values/fixity02.lc 16:16-16:22  a_->Char
+testdata/language-features/basic-values/fixity02.lc 16:16-16:22  _a -> Char
 testdata/language-features/basic-values/fixity02.lc 16:16-16:34  Char
-testdata/language-features/basic-values/fixity02.lc 16:20-16:22  {a} -> {b} -> a -> b->a
+testdata/language-features/basic-values/fixity02.lc 16:20-16:22  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 16:23-16:27  String
-testdata/language-features/basic-values/fixity02.lc 16:23-16:30  a_->String
+testdata/language-features/basic-values/fixity02.lc 16:23-16:30  _a -> String
 testdata/language-features/basic-values/fixity02.lc 16:23-16:34  String
-testdata/language-features/basic-values/fixity02.lc 16:28-16:30  {a} -> {b} -> a -> b->a
+testdata/language-features/basic-values/fixity02.lc 16:28-16:30  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 16:31-16:34  Float
 testdata/language-features/basic-values/fixity02.lc 16:38-16:42  Type
 testdata/language-features/basic-values/fixity02.lc 17:1-17:7  String
 testdata/language-features/basic-values/fixity02.lc 17:10-17:12  ()
-testdata/language-features/basic-values/fixity02.lc 17:10-17:15  a_->()
+testdata/language-features/basic-values/fixity02.lc 17:10-17:15  _a -> ()
 testdata/language-features/basic-values/fixity02.lc 17:10-17:19  ()
-testdata/language-features/basic-values/fixity02.lc 17:10-17:22  a_->a_
+testdata/language-features/basic-values/fixity02.lc 17:10-17: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:13-17:15  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 17:16-17:19  Char
-testdata/language-features/basic-values/fixity02.lc 17:20-17:22  {a} -> {b} -> a -> b->b
+testdata/language-features/basic-values/fixity02.lc 17:20-17:22  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 17:23-17:27  String
-testdata/language-features/basic-values/fixity02.lc 17:23-17:30  a_->String
+testdata/language-features/basic-values/fixity02.lc 17:23-17:30  _a -> String
 testdata/language-features/basic-values/fixity02.lc 17:23-17:34  String
-testdata/language-features/basic-values/fixity02.lc 17:28-17:30  {a} -> {b} -> a -> b->a
+testdata/language-features/basic-values/fixity02.lc 17:28-17:30  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 17:31-17:34  Float
 testdata/language-features/basic-values/fixity02.lc 17:38-17:44  Type
 testdata/language-features/basic-values/fixity02.lc 18:1-18:7  ()
 testdata/language-features/basic-values/fixity02.lc 18:10-18:12  ()
-testdata/language-features/basic-values/fixity02.lc 18:10-18:15  a_->()
+testdata/language-features/basic-values/fixity02.lc 18:10-18:15  _a -> ()
 testdata/language-features/basic-values/fixity02.lc 18:10-18:34  ()
-testdata/language-features/basic-values/fixity02.lc 18:13-18:15  {a} -> {b} -> a -> b->a
+testdata/language-features/basic-values/fixity02.lc 18:13-18:15  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 18:16-18:19  Char
-testdata/language-features/basic-values/fixity02.lc 18:16-18:22  a_->Char
+testdata/language-features/basic-values/fixity02.lc 18:16-18:22  _a -> Char
 testdata/language-features/basic-values/fixity02.lc 18:16-18:34  Char
-testdata/language-features/basic-values/fixity02.lc 18:20-18:22  {a} -> {b} -> a -> b->a
+testdata/language-features/basic-values/fixity02.lc 18:20-18:22  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 18:23-18:27  String
-testdata/language-features/basic-values/fixity02.lc 18:23-18:30  a_->String
+testdata/language-features/basic-values/fixity02.lc 18:23-18:30  _a -> String
 testdata/language-features/basic-values/fixity02.lc 18:23-18:34  String
-testdata/language-features/basic-values/fixity02.lc 18:28-18:30  {a} -> {b} -> a -> b->a
+testdata/language-features/basic-values/fixity02.lc 18:28-18:30  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 18:31-18:34  Float
 testdata/language-features/basic-values/fixity02.lc 18:38-18:40  Type
 testdata/language-features/basic-values/fixity02.lc 20:1-20:10  Float
 testdata/language-features/basic-values/fixity02.lc 20:13-20:15  ()
-testdata/language-features/basic-values/fixity02.lc 20:13-20:22  a_->a_
+testdata/language-features/basic-values/fixity02.lc 20:13-20: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:16-20:22  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 20:23-20:26  Char
-testdata/language-features/basic-values/fixity02.lc 20:23-20:33  a_->a_
+testdata/language-features/basic-values/fixity02.lc 20:23-20: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:27-20:33  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 20:34-20:38  String
-testdata/language-features/basic-values/fixity02.lc 20:34-20:45  a_->a_
+testdata/language-features/basic-values/fixity02.lc 20:34-20: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:39-20:45  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 20:46-20:49  Float
 testdata/language-features/basic-values/fixity02.lc 20:53-20:58  Type
 testdata/language-features/basic-values/fixity02.lc 21:1-21:10  Float
 testdata/language-features/basic-values/fixity02.lc 21:13-21:15  ()
-testdata/language-features/basic-values/fixity02.lc 21:13-21:22  a_->a_
+testdata/language-features/basic-values/fixity02.lc 21:13-21: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:16-21:22  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 21:23-21:26  Char
-testdata/language-features/basic-values/fixity02.lc 21:23-21:33  a_->Char
+testdata/language-features/basic-values/fixity02.lc 21:23-21:33  _a -> Char
 testdata/language-features/basic-values/fixity02.lc 21:23-21:38  Char
-testdata/language-features/basic-values/fixity02.lc 21:23-21:45  a_->a_
+testdata/language-features/basic-values/fixity02.lc 21:23-21: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:27-21:33  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 21:34-21:38  String
-testdata/language-features/basic-values/fixity02.lc 21:39-21:45  {a} -> {b} -> a -> b->b
+testdata/language-features/basic-values/fixity02.lc 21:39-21:45  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 21:46-21:49  Float
 testdata/language-features/basic-values/fixity02.lc 21:53-21:58  Type
 testdata/language-features/basic-values/fixity02.lc 22:1-22:10  Float
 testdata/language-features/basic-values/fixity02.lc 22:13-22:15  ()
-testdata/language-features/basic-values/fixity02.lc 22:13-22:22  a_->()
+testdata/language-features/basic-values/fixity02.lc 22:13-22:22  _a -> ()
 testdata/language-features/basic-values/fixity02.lc 22:13-22:26  ()
-testdata/language-features/basic-values/fixity02.lc 22:13-22:33  a_->a_
+testdata/language-features/basic-values/fixity02.lc 22:13-22: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:16-22:22  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 22:23-22:26  Char
-testdata/language-features/basic-values/fixity02.lc 22:27-22:33  {a} -> {b} -> a -> b->b
+testdata/language-features/basic-values/fixity02.lc 22:27-22:33  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 22:34-22:38  String
-testdata/language-features/basic-values/fixity02.lc 22:34-22:45  a_->a_
+testdata/language-features/basic-values/fixity02.lc 22:34-22: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:39-22:45  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 22:46-22:49  Float
 testdata/language-features/basic-values/fixity02.lc 22:53-22:58  Type
 testdata/language-features/basic-values/fixity02.lc 23:1-23:10  Float
 testdata/language-features/basic-values/fixity02.lc 23:13-23:15  ()
-testdata/language-features/basic-values/fixity02.lc 23:13-23:22  a_->()
+testdata/language-features/basic-values/fixity02.lc 23:13-23:22  _a -> ()
 testdata/language-features/basic-values/fixity02.lc 23:13-23:38  ()
-testdata/language-features/basic-values/fixity02.lc 23:13-23:45  a_->a_
+testdata/language-features/basic-values/fixity02.lc 23:13-23: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:16-23:22  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 23:23-23:26  Char
-testdata/language-features/basic-values/fixity02.lc 23:23-23:33  a_->Char
+testdata/language-features/basic-values/fixity02.lc 23:23-23:33  _a -> Char
 testdata/language-features/basic-values/fixity02.lc 23:23-23:38  Char
-testdata/language-features/basic-values/fixity02.lc 23:27-23:33  {a} -> {b} -> a -> b->a
+testdata/language-features/basic-values/fixity02.lc 23:27-23:33  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 23:34-23:38  String
-testdata/language-features/basic-values/fixity02.lc 23:39-23:45  {a} -> {b} -> a -> b->b
+testdata/language-features/basic-values/fixity02.lc 23:39-23:45  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 23:46-23:49  Float
 testdata/language-features/basic-values/fixity02.lc 23:53-23:58  Type
 testdata/language-features/basic-values/fixity02.lc 24:1-24:10  String
 testdata/language-features/basic-values/fixity02.lc 24:13-24:15  ()
-testdata/language-features/basic-values/fixity02.lc 24:13-24:22  a_->a_
+testdata/language-features/basic-values/fixity02.lc 24:13-24: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:16-24:22  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 24:23-24:26  Char
-testdata/language-features/basic-values/fixity02.lc 24:23-24:33  a_->a_
+testdata/language-features/basic-values/fixity02.lc 24:23-24: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:27-24:33  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 24:34-24:38  String
-testdata/language-features/basic-values/fixity02.lc 24:34-24:45  a_->String
+testdata/language-features/basic-values/fixity02.lc 24:34-24:45  _a -> String
 testdata/language-features/basic-values/fixity02.lc 24:34-24:49  String
-testdata/language-features/basic-values/fixity02.lc 24:39-24:45  {a} -> {b} -> a -> b->a
+testdata/language-features/basic-values/fixity02.lc 24:39-24:45  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 24:46-24:49  Float
 testdata/language-features/basic-values/fixity02.lc 24:53-24:59  Type
 testdata/language-features/basic-values/fixity02.lc 25:1-25:10  Char
 testdata/language-features/basic-values/fixity02.lc 25:13-25:15  ()
-testdata/language-features/basic-values/fixity02.lc 25:13-25:22  a_->a_
+testdata/language-features/basic-values/fixity02.lc 25:13-25: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:16-25:22  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 25:23-25:26  Char
-testdata/language-features/basic-values/fixity02.lc 25:23-25:33  a_->Char
+testdata/language-features/basic-values/fixity02.lc 25:23-25:33  _a -> Char
 testdata/language-features/basic-values/fixity02.lc 25:23-25:49  Char
-testdata/language-features/basic-values/fixity02.lc 25:27-25:33  {a} -> {b} -> a -> b->a
+testdata/language-features/basic-values/fixity02.lc 25:27-25:33  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 25:34-25:38  String
-testdata/language-features/basic-values/fixity02.lc 25:34-25:45  a_->String
+testdata/language-features/basic-values/fixity02.lc 25:34-25:45  _a -> String
 testdata/language-features/basic-values/fixity02.lc 25:34-25:49  String
-testdata/language-features/basic-values/fixity02.lc 25:39-25:45  {a} -> {b} -> a -> b->a
+testdata/language-features/basic-values/fixity02.lc 25:39-25:45  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 25:46-25:49  Float
 testdata/language-features/basic-values/fixity02.lc 25:53-25:57  Type
 testdata/language-features/basic-values/fixity02.lc 26:1-26:10  String
 testdata/language-features/basic-values/fixity02.lc 26:13-26:15  ()
-testdata/language-features/basic-values/fixity02.lc 26:13-26:22  a_->()
+testdata/language-features/basic-values/fixity02.lc 26:13-26:22  _a -> ()
 testdata/language-features/basic-values/fixity02.lc 26:13-26:26  ()
-testdata/language-features/basic-values/fixity02.lc 26:13-26:33  a_->a_
+testdata/language-features/basic-values/fixity02.lc 26:13-26: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:16-26:22  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 26:23-26:26  Char
-testdata/language-features/basic-values/fixity02.lc 26:27-26:33  {a} -> {b} -> a -> b->b
+testdata/language-features/basic-values/fixity02.lc 26:27-26:33  forall a b . a -> b -> b
 testdata/language-features/basic-values/fixity02.lc 26:34-26:38  String
-testdata/language-features/basic-values/fixity02.lc 26:34-26:45  a_->String
+testdata/language-features/basic-values/fixity02.lc 26:34-26:45  _a -> String
 testdata/language-features/basic-values/fixity02.lc 26:34-26:49  String
-testdata/language-features/basic-values/fixity02.lc 26:39-26:45  {a} -> {b} -> a -> b->a
+testdata/language-features/basic-values/fixity02.lc 26:39-26:45  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 26:46-26:49  Float
 testdata/language-features/basic-values/fixity02.lc 26:53-26:59  Type
 testdata/language-features/basic-values/fixity02.lc 27:1-27:10  ()
 testdata/language-features/basic-values/fixity02.lc 27:13-27:15  ()
-testdata/language-features/basic-values/fixity02.lc 27:13-27:22  a_->()
+testdata/language-features/basic-values/fixity02.lc 27:13-27:22  _a -> ()
 testdata/language-features/basic-values/fixity02.lc 27:13-27:49  ()
-testdata/language-features/basic-values/fixity02.lc 27:16-27:22  {a} -> {b} -> a -> b->a
+testdata/language-features/basic-values/fixity02.lc 27:16-27:22  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 27:23-27:26  Char
-testdata/language-features/basic-values/fixity02.lc 27:23-27:33  a_->Char
+testdata/language-features/basic-values/fixity02.lc 27:23-27:33  _a -> Char
 testdata/language-features/basic-values/fixity02.lc 27:23-27:49  Char
-testdata/language-features/basic-values/fixity02.lc 27:27-27:33  {a} -> {b} -> a -> b->a
+testdata/language-features/basic-values/fixity02.lc 27:27-27:33  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 27:34-27:38  String
-testdata/language-features/basic-values/fixity02.lc 27:34-27:45  a_->String
+testdata/language-features/basic-values/fixity02.lc 27:34-27:45  _a -> String
 testdata/language-features/basic-values/fixity02.lc 27:34-27:49  String
-testdata/language-features/basic-values/fixity02.lc 27:39-27:45  {a} -> {b} -> a -> b->a
+testdata/language-features/basic-values/fixity02.lc 27:39-27:45  forall a b . a -> b -> a
 testdata/language-features/basic-values/fixity02.lc 27:46-27:49  Float
 testdata/language-features/basic-values/fixity02.lc 27:53-27:55  Type
diff --git a/testdata/language-features/basic-values/if01.out b/testdata/language-features/basic-values/if01.out
index d9211a28..991efd46 100644
--- a/testdata/language-features/basic-values/if01.out
+++ b/testdata/language-features/basic-values/if01.out
@@ -6,12 +6,12 @@ value2 :: 'Float
 testdata/language-features/basic-values/if01.lc 1:1-1:7  ()
 testdata/language-features/basic-values/if01.lc 1:10-1:33  ()
 testdata/language-features/basic-values/if01.lc 1:13-1:17  Bool
-testdata/language-features/basic-values/if01.lc 1:13-1:25  ()->()
+testdata/language-features/basic-values/if01.lc 1:13-1:25  () -> ()
 testdata/language-features/basic-values/if01.lc 1:23-1:25  ()
 testdata/language-features/basic-values/if01.lc 1:31-1:33  ()
 testdata/language-features/basic-values/if01.lc 2:1-2:7  Float
 testdata/language-features/basic-values/if01.lc 2:10-2:36  Float
 testdata/language-features/basic-values/if01.lc 2:13-2:18  Bool
-testdata/language-features/basic-values/if01.lc 2:13-2:27  Float->Float
+testdata/language-features/basic-values/if01.lc 2: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/if04.reject.out b/testdata/language-features/basic-values/if04.reject.out
index eed0fc59..23a77a44 100644
--- a/testdata/language-features/basic-values/if04.reject.out
+++ b/testdata/language-features/basic-values/if04.reject.out
@@ -19,6 +19,6 @@ value1 = if True then () else '_'
 
 ------------ tooltips
 testdata/language-features/basic-values/if04.reject.lc 1:13-1:17  Bool
-testdata/language-features/basic-values/if04.reject.lc 1:13-1:25  ()->()
+testdata/language-features/basic-values/if04.reject.lc 1:13-1:25  () -> ()
 testdata/language-features/basic-values/if04.reject.lc 1:23-1:25  ()
 testdata/language-features/basic-values/if04.reject.lc 1:31-1:34  Char
diff --git a/testdata/language-features/basic-values/infix01.out b/testdata/language-features/basic-values/infix01.out
index d4e62854..33ab245c 100644
--- a/testdata/language-features/basic-values/infix01.out
+++ b/testdata/language-features/basic-values/infix01.out
@@ -1,13 +1,13 @@
 main is not found
 ------------ trace
-fun :: {a} -> {b} -> a -> b->()
-value :: {a} -> {b} -> a -> b->()
+fun :: forall a b . a -> b -> ()
+value :: forall a b . a -> b -> ()
 ------------ tooltips
-testdata/language-features/basic-values/infix01.lc 1:1-1:4  {a} -> {b} -> a -> b->()
+testdata/language-features/basic-values/infix01.lc 1:1-1:4  forall a b . a -> b -> ()
 testdata/language-features/basic-values/infix01.lc 1:11-1:13  ()
-testdata/language-features/basic-values/infix01.lc 3:1-3:6  {a} -> {b} -> a -> b->()
-testdata/language-features/basic-values/infix01.lc 3:13-3:14  f_
-testdata/language-features/basic-values/infix01.lc 3:13-3:20  a_->()
+testdata/language-features/basic-values/infix01.lc 3:1-3:6  forall a b . a -> b -> ()
+testdata/language-features/basic-values/infix01.lc 3:13-3:14  _f
+testdata/language-features/basic-values/infix01.lc 3:13-3:20  _a -> ()
 testdata/language-features/basic-values/infix01.lc 3:13-3:22  ()
-testdata/language-features/basic-values/infix01.lc 3:15-3:20  {a} -> {b} -> a -> b->()
-testdata/language-features/basic-values/infix01.lc 3:21-3:22  c_
+testdata/language-features/basic-values/infix01.lc 3:15-3:20  forall a b . a -> b -> ()
+testdata/language-features/basic-values/infix01.lc 3:21-3:22  _c
diff --git a/testdata/language-features/basic-values/infix02.out b/testdata/language-features/basic-values/infix02.out
index c5c2b99c..11e17685 100644
--- a/testdata/language-features/basic-values/infix02.out
+++ b/testdata/language-features/basic-values/infix02.out
@@ -1,13 +1,13 @@
 main is not found
 ------------ trace
-fun :: {a} -> {b} -> {c} -> a -> b -> c->()
-value :: {a} -> {b} -> {c} -> a -> b -> c->()
+fun :: forall a b c . a -> b -> c -> ()
+value :: forall a b c . a -> b -> c -> ()
 ------------ tooltips
-testdata/language-features/basic-values/infix02.lc 1:1-1:4  {a} -> {b} -> {c} -> a -> b -> c->()
+testdata/language-features/basic-values/infix02.lc 1:1-1:4  forall a b c . a -> b -> c -> ()
 testdata/language-features/basic-values/infix02.lc 1:13-1:15  ()
-testdata/language-features/basic-values/infix02.lc 3:1-3:6  {a} -> {b} -> {c} -> a -> b -> c->()
-testdata/language-features/basic-values/infix02.lc 3:13-3:14  g_
-testdata/language-features/basic-values/infix02.lc 3:13-3:20  b_ -> a_->()
-testdata/language-features/basic-values/infix02.lc 3:13-3:22  a_->()
-testdata/language-features/basic-values/infix02.lc 3:15-3:20  {a} -> {b} -> {c} -> a -> b -> c->()
-testdata/language-features/basic-values/infix02.lc 3:21-3:22  d_
+testdata/language-features/basic-values/infix02.lc 3:1-3:6  forall a b c . a -> b -> c -> ()
+testdata/language-features/basic-values/infix02.lc 3:13-3:14  _g
+testdata/language-features/basic-values/infix02.lc 3:13-3:20  _b -> _a -> ()
+testdata/language-features/basic-values/infix02.lc 3:13-3:22  _a -> ()
+testdata/language-features/basic-values/infix02.lc 3:15-3:20  forall a b c . a -> b -> c -> ()
+testdata/language-features/basic-values/infix02.lc 3:21-3:22  _d
diff --git a/testdata/language-features/basic-values/infix03.out b/testdata/language-features/basic-values/infix03.out
index dcdc1bb6..dcab8247 100644
--- a/testdata/language-features/basic-values/infix03.out
+++ b/testdata/language-features/basic-values/infix03.out
@@ -1,33 +1,33 @@
 main is not found
 ------------ trace
 'D :: Type
-D2 :: () -> ()->'D
-D3 :: () -> () -> ()->'D
-'DCase :: (a : 'D->Type) -> ((b:()) -> (c:()) -> a (D2 b c)) -> ((d:()) -> (e:()) -> (f:()) -> a (D3 d e f)) -> (g:'D) -> a g
-match'D :: (a : Type->Type) -> a 'D -> (b:Type) -> a b -> a b
-d2 :: () -> ()->'D
-d3 :: () -> () -> ()->'D
+D2 :: () -> () -> 'D
+D3 :: () -> () -> () -> 'D
+'DCase :: (a :: 'D -> Type) -> ((b :: ()) -> (c :: ()) -> a (D2 b c)) -> ((d :: ()) -> (e :: ()) -> (f :: ()) -> a (D3 d e f)) -> (g :: 'D) -> a g
+match'D :: (a :: Type -> Type) -> a 'D -> (b :: Type) -> a b -> a b
+d2 :: () -> () -> 'D
+d3 :: () -> () -> () -> 'D
 ------------ tooltips
 testdata/language-features/basic-values/infix03.lc 1:6-1:7  Type
 testdata/language-features/basic-values/infix03.lc 1:6-1:18  Type
 testdata/language-features/basic-values/infix03.lc 1:6-2:12  Type
 testdata/language-features/basic-values/infix03.lc 1:6-2:21  Type
-testdata/language-features/basic-values/infix03.lc 1:10-1:12  () -> ()->D | D | Type
+testdata/language-features/basic-values/infix03.lc 1:10-1:12  () -> () -> D | D | Type
 testdata/language-features/basic-values/infix03.lc 1:13-1:15  Type
 testdata/language-features/basic-values/infix03.lc 1:16-1:18  Type
-testdata/language-features/basic-values/infix03.lc 2:10-2:12  () -> () -> ()->D | D | Type
+testdata/language-features/basic-values/infix03.lc 2:10-2:12  () -> () -> () -> D | D | Type
 testdata/language-features/basic-values/infix03.lc 2:13-2:15  Type
 testdata/language-features/basic-values/infix03.lc 2:16-2:18  Type
 testdata/language-features/basic-values/infix03.lc 2:19-2:21  Type
-testdata/language-features/basic-values/infix03.lc 4:1-4:3  () -> ()->D
-testdata/language-features/basic-values/infix03.lc 4:10-4:11  d_
-testdata/language-features/basic-values/infix03.lc 4:10-4:16  ()->D
+testdata/language-features/basic-values/infix03.lc 4:1-4:3  () -> () -> D
+testdata/language-features/basic-values/infix03.lc 4:10-4:11  _d
+testdata/language-features/basic-values/infix03.lc 4:10-4:16  () -> D
 testdata/language-features/basic-values/infix03.lc 4:10-4:18  D
-testdata/language-features/basic-values/infix03.lc 4:12-4:16  () -> ()->D
-testdata/language-features/basic-values/infix03.lc 4:17-4:18  b_
-testdata/language-features/basic-values/infix03.lc 6:1-6:3  () -> () -> ()->D
-testdata/language-features/basic-values/infix03.lc 6:10-6:11  d_
-testdata/language-features/basic-values/infix03.lc 6:10-6:16  () -> ()->D
-testdata/language-features/basic-values/infix03.lc 6:10-6:18  ()->D
-testdata/language-features/basic-values/infix03.lc 6:12-6:16  () -> () -> ()->D
-testdata/language-features/basic-values/infix03.lc 6:17-6:18  b_
+testdata/language-features/basic-values/infix03.lc 4:12-4:16  () -> () -> D
+testdata/language-features/basic-values/infix03.lc 4:17-4:18  _b
+testdata/language-features/basic-values/infix03.lc 6:1-6:3  () -> () -> () -> D
+testdata/language-features/basic-values/infix03.lc 6:10-6:11  _d
+testdata/language-features/basic-values/infix03.lc 6:10-6:16  () -> () -> D
+testdata/language-features/basic-values/infix03.lc 6:10-6:18  () -> D
+testdata/language-features/basic-values/infix03.lc 6:12-6:16  () -> () -> () -> D
+testdata/language-features/basic-values/infix03.lc 6:17-6:18  _b
diff --git a/testdata/language-features/basic-values/lambda01.out b/testdata/language-features/basic-values/lambda01.out
index 14711679..e2c51312 100644
--- a/testdata/language-features/basic-values/lambda01.out
+++ b/testdata/language-features/basic-values/lambda01.out
@@ -1,15 +1,15 @@
 main is not found
 ------------ trace
-fun1 :: {a} -> a->()
-fun2 :: {a} -> a->()
-fun3 :: {a} -> a->()
-fun4 :: {a} -> {b} -> {c} -> {d} -> {e} -> {f} -> {g} -> {h} -> {i} -> a -> b -> c -> d -> e -> f -> g -> h -> i->()
+fun1 :: forall a . a -> ()
+fun2 :: forall a . a -> ()
+fun3 :: forall a . a -> ()
+fun4 :: forall a b c d e f g h i . a -> b -> c -> d -> e -> f -> g -> h -> i -> ()
 ------------ tooltips
-testdata/language-features/basic-values/lambda01.lc 1:1-1:5  {a} -> a->()
+testdata/language-features/basic-values/lambda01.lc 1:1-1:5  forall a . a -> ()
 testdata/language-features/basic-values/lambda01.lc 1:14-1:16  ()
-testdata/language-features/basic-values/lambda01.lc 2:1-2:5  {a} -> a->()
+testdata/language-features/basic-values/lambda01.lc 2:1-2:5  forall a . a -> ()
 testdata/language-features/basic-values/lambda01.lc 2:15-2:17  ()
-testdata/language-features/basic-values/lambda01.lc 3:1-3:5  {a} -> a->()
+testdata/language-features/basic-values/lambda01.lc 3:1-3:5  forall a . a -> ()
 testdata/language-features/basic-values/lambda01.lc 3:13-3:15  ()
-testdata/language-features/basic-values/lambda01.lc 4:1-4:5  {a} -> {b} -> {c} -> {d} -> {e} -> {f} -> {g} -> {h} -> {i} -> a -> b -> c -> d -> e -> f -> g -> h -> i->()
+testdata/language-features/basic-values/lambda01.lc 4:1-4:5  forall a b c d e f g h i . a -> b -> c -> d -> e -> f -> g -> h -> i -> ()
 testdata/language-features/basic-values/lambda01.lc 5:28-5:30  ()
diff --git a/testdata/language-features/basic-values/lambda03.out b/testdata/language-features/basic-values/lambda03.out
index 7d9a98ae..902fdc98 100644
--- a/testdata/language-features/basic-values/lambda03.out
+++ b/testdata/language-features/basic-values/lambda03.out
@@ -1,9 +1,9 @@
 main is not found
 ------------ trace
-fun1 :: {a} -> {b} -> {c} -> a -> b -> c->b
-fun2 :: {a} -> {b} -> {c} -> {d} -> a -> b -> c -> d->a
+fun1 :: forall a b c . a -> b -> c -> b
+fun2 :: forall a b c d . a -> b -> c -> d -> a
 ------------ tooltips
-testdata/language-features/basic-values/lambda03.lc 1:1-1:5  {a} -> {b} -> {c} -> a -> b -> c->b
-testdata/language-features/basic-values/lambda03.lc 1:22-1:23  d_
-testdata/language-features/basic-values/lambda03.lc 2:1-2:5  {a} -> {b} -> {c} -> {d} -> a -> b -> c -> d->a
-testdata/language-features/basic-values/lambda03.lc 2:25-2:26  h_
+testdata/language-features/basic-values/lambda03.lc 1:1-1:5  forall a b c . a -> b -> c -> b
+testdata/language-features/basic-values/lambda03.lc 1:22-1:23  _d
+testdata/language-features/basic-values/lambda03.lc 2:1-2:5  forall a b c d . a -> b -> c -> d -> a
+testdata/language-features/basic-values/lambda03.lc 2:25-2:26  _h
diff --git a/testdata/language-features/basic-values/let01.out b/testdata/language-features/basic-values/let01.out
index 4c4793b6..8ab8c8e0 100644
--- a/testdata/language-features/basic-values/let01.out
+++ b/testdata/language-features/basic-values/let01.out
@@ -1,25 +1,25 @@
 main is not found
 ------------ trace
-value1 :: {a} -> {_ : 'Num a}->a
-value2 :: {a} -> {_ : 'Num a}->a
-value3 :: {a} -> {_ : 'Num a}->a
-value4 :: {a} -> {_ : 'Num a}->a
-value5 :: {a} -> {_ : 'Num a}->a
+value1 :: forall a . 'Num a => a
+value2 :: forall a . 'Num a => a
+value3 :: forall a . 'Num a => a
+value4 :: forall a . 'Num a => a
+value5 :: forall a . 'Num a => a
 ------------ tooltips
-testdata/language-features/basic-values/let01.lc 1:1-1:7  {a} -> {_ : Num a}->a
-testdata/language-features/basic-values/let01.lc 1:18-1:19  b_
-testdata/language-features/basic-values/let01.lc 1:23-1:24  b_
-testdata/language-features/basic-values/let01.lc 3:1-3:7  {a} -> {_ : Num a}->a
-testdata/language-features/basic-values/let01.lc 4:11-4:12  b_
-testdata/language-features/basic-values/let01.lc 5:6-5:7  b_
-testdata/language-features/basic-values/let01.lc 7:1-7:7  {a} -> {_ : Num a}->a
-testdata/language-features/basic-values/let01.lc 8:11-8:12  b_
+testdata/language-features/basic-values/let01.lc 1:1-1:7  forall a . Num a => a
+testdata/language-features/basic-values/let01.lc 1:18-1:19  _b
+testdata/language-features/basic-values/let01.lc 1:23-1:24  _b
+testdata/language-features/basic-values/let01.lc 3:1-3:7  forall a . Num a => a
+testdata/language-features/basic-values/let01.lc 4:11-4:12  _b
+testdata/language-features/basic-values/let01.lc 5:6-5:7  _b
+testdata/language-features/basic-values/let01.lc 7:1-7:7  forall a . Num a => a
+testdata/language-features/basic-values/let01.lc 8:11-8:12  _b
 testdata/language-features/basic-values/let01.lc 9:11-9:14  Char
-testdata/language-features/basic-values/let01.lc 10:6-10:7  b_
-testdata/language-features/basic-values/let01.lc 12:1-12:7  {a} -> {_ : Num a}->a
-testdata/language-features/basic-values/let01.lc 12:18-12:19  b_
-testdata/language-features/basic-values/let01.lc 13:13-13:14  b_
-testdata/language-features/basic-values/let01.lc 15:1-15:7  {a} -> {_ : Num a}->a
-testdata/language-features/basic-values/let01.lc 15:18-15:19  b_
-testdata/language-features/basic-values/let01.lc 16:18-16:19  b_
-testdata/language-features/basic-values/let01.lc 17:13-17:14  b_
+testdata/language-features/basic-values/let01.lc 10:6-10:7  _b
+testdata/language-features/basic-values/let01.lc 12:1-12:7  forall a . Num a => a
+testdata/language-features/basic-values/let01.lc 12:18-12:19  _b
+testdata/language-features/basic-values/let01.lc 13:13-13:14  _b
+testdata/language-features/basic-values/let01.lc 15:1-15:7  forall a . Num a => a
+testdata/language-features/basic-values/let01.lc 15:18-15:19  _b
+testdata/language-features/basic-values/let01.lc 16:18-16:19  _b
+testdata/language-features/basic-values/let01.lc 17:13-17:14  _b
diff --git a/testdata/language-features/basic-values/let02.out b/testdata/language-features/basic-values/let02.out
index 95f6541e..bee7d640 100644
--- a/testdata/language-features/basic-values/let02.out
+++ b/testdata/language-features/basic-values/let02.out
@@ -7,7 +7,7 @@ testdata/language-features/basic-values/let02.lc 2:11-2:13  ()
 testdata/language-features/basic-values/let02.lc 3:19-3:22  Char
 testdata/language-features/basic-values/let02.lc 3:26-3:28  ()
 testdata/language-features/basic-values/let02.lc 5:17-5:19  ()
-testdata/language-features/basic-values/let02.lc 6:17-6:18  b_
+testdata/language-features/basic-values/let02.lc 6:17-6:18  _b
 testdata/language-features/basic-values/let02.lc 7:17-7:24  String
 testdata/language-features/basic-values/let02.lc 8:12-8:15  Char
 testdata/language-features/basic-values/let02.lc 9:6-9:8  ()
diff --git a/testdata/language-features/basic-values/literal01.out b/testdata/language-features/basic-values/literal01.out
index dd36d512..0f7b3dbf 100644
--- a/testdata/language-features/basic-values/literal01.out
+++ b/testdata/language-features/basic-values/literal01.out
@@ -1,20 +1,20 @@
 main is not found
 ------------ trace
-intValue1 :: {a} -> {_ : 'Num a}->a
-intValue2 :: {a} -> {_ : 'Num a}->a
-intValue3 :: {a} -> {_ : 'Num a}->a
+intValue1 :: forall a . 'Num a => a
+intValue2 :: forall a . 'Num a => a
+intValue3 :: forall a . 'Num a => a
 floatValue1 :: 'Float
 floatValue2 :: 'Float
 charValue :: 'Char
 stringValue1 :: 'String
 stringValue2 :: 'String
 ------------ tooltips
-testdata/language-features/basic-values/literal01.lc 1:1-1:10  {a} -> {_ : Num a}->a
-testdata/language-features/basic-values/literal01.lc 1:13-1:14  b_
-testdata/language-features/basic-values/literal01.lc 2:1-2:10  {a} -> {_ : Num a}->a
-testdata/language-features/basic-values/literal01.lc 2:13-2:14  b_
-testdata/language-features/basic-values/literal01.lc 3:1-3:10  {a} -> {_ : Num a}->a
-testdata/language-features/basic-values/literal01.lc 3:13-3:18  b_
+testdata/language-features/basic-values/literal01.lc 1:1-1:10  forall a . Num a => a
+testdata/language-features/basic-values/literal01.lc 1:13-1:14  _b
+testdata/language-features/basic-values/literal01.lc 2:1-2:10  forall a . Num a => a
+testdata/language-features/basic-values/literal01.lc 2:13-2:14  _b
+testdata/language-features/basic-values/literal01.lc 3:1-3:10  forall a . Num a => a
+testdata/language-features/basic-values/literal01.lc 3:13-3:18  _b
 testdata/language-features/basic-values/literal01.lc 5:1-5:12  Float
 testdata/language-features/basic-values/literal01.lc 5:15-5:18  Float
 testdata/language-features/basic-values/literal01.lc 6:1-6:12  Float
diff --git a/testdata/language-features/basic-values/operator01.out b/testdata/language-features/basic-values/operator01.out
index 78e55853..597a3a00 100644
--- a/testdata/language-features/basic-values/operator01.out
+++ b/testdata/language-features/basic-values/operator01.out
@@ -1,15 +1,15 @@
 main is not found
 ------------ trace
-#$# :: {a} -> {b} -> a -> b->()
-$$# :: {a} -> {b} -> a -> b->()
-$$$# :: {a} -> {b} -> a -> b->()
-$$$ :: {a} -> {b} -> a -> b->()
+#$# :: forall a b . a -> b -> ()
+$$# :: forall a b . a -> b -> ()
+$$$# :: forall a b . a -> b -> ()
+$$$ :: forall a b . a -> b -> ()
 ------------ tooltips
-testdata/language-features/basic-values/operator01.lc 1:3-1:6  {a} -> {b} -> a -> b->()
+testdata/language-features/basic-values/operator01.lc 1:3-1:6  forall a b . a -> b -> ()
 testdata/language-features/basic-values/operator01.lc 1:11-1:13  ()
-testdata/language-features/basic-values/operator01.lc 3:3-3:6  {a} -> {b} -> a -> b->()
+testdata/language-features/basic-values/operator01.lc 3:3-3:6  forall a b . a -> b -> ()
 testdata/language-features/basic-values/operator01.lc 3:8-3:10  ()
-testdata/language-features/basic-values/operator01.lc 5:3-5:7  {a} -> {b} -> a -> b->()
+testdata/language-features/basic-values/operator01.lc 5:3-5:7  forall a b . a -> b -> ()
 testdata/language-features/basic-values/operator01.lc 6:3-6:5  ()
-testdata/language-features/basic-values/operator01.lc 8:3-8:6  {a} -> {b} -> a -> b->()
+testdata/language-features/basic-values/operator01.lc 8:3-8:6  forall a b . a -> b -> ()
 testdata/language-features/basic-values/operator01.lc 8:11-8:13  ()
diff --git a/testdata/language-features/basic-values/operator02.reject.out b/testdata/language-features/basic-values/operator02.reject.out
index 8e5ed72c..93092e52 100644
--- a/testdata/language-features/basic-values/operator02.reject.out
+++ b/testdata/language-features/basic-values/operator02.reject.out
@@ -5,9 +5,9 @@ a #$# b = ()
 a #$# b = ()
   ^^^
 ------------ trace
-#$# :: {a} -> {b} -> a -> b->()
-fun :: {a} -> a->()
-#$# :: {a} -> {b} -> a -> b->()
+#$# :: forall a b . a -> b -> ()
+fun :: forall a . a -> ()
+#$# :: forall a b . a -> b -> ()
 !already defined #$# at testdata/language-features/basic-values/operator02.reject.lc:3:3:
 a #$# b = ()
   ^^^
@@ -15,9 +15,9 @@ a #$# b = ()
 a #$# b = ()
   ^^^
 ------------ tooltips
-testdata/language-features/basic-values/operator02.reject.lc 1:3-1:6  {a} -> {b} -> a -> b->()
+testdata/language-features/basic-values/operator02.reject.lc 1:3-1:6  forall a b . a -> b -> ()
 testdata/language-features/basic-values/operator02.reject.lc 1:11-1:13  ()
-testdata/language-features/basic-values/operator02.reject.lc 2:1-2:4  {a} -> a->()
+testdata/language-features/basic-values/operator02.reject.lc 2:1-2:4  forall a . a -> ()
 testdata/language-features/basic-values/operator02.reject.lc 2:9-2:11  ()
-testdata/language-features/basic-values/operator02.reject.lc 3:3-3:6  {a} -> {b} -> a -> b->()
+testdata/language-features/basic-values/operator02.reject.lc 3:3-3:6  forall a b . a -> b -> ()
 testdata/language-features/basic-values/operator02.reject.lc 3:11-3:13  ()
diff --git a/testdata/language-features/basic-values/operator05.out b/testdata/language-features/basic-values/operator05.out
index 16c940fc..30b3fcac 100644
--- a/testdata/language-features/basic-values/operator05.out
+++ b/testdata/language-features/basic-values/operator05.out
@@ -5,7 +5,7 @@ value1 :: ()
 testdata/language-features/basic-values/operator05.lc 1:1-1:7  ()
 testdata/language-features/basic-values/operator05.lc 1:24-1:26  ()
 testdata/language-features/basic-values/operator05.lc 2:13-2:15  ()
-testdata/language-features/basic-values/operator05.lc 2:13-2:19  a_->()
+testdata/language-features/basic-values/operator05.lc 2:13-2:19  _a -> ()
 testdata/language-features/basic-values/operator05.lc 2:13-2:22  ()
-testdata/language-features/basic-values/operator05.lc 2:16-2:19  {a} -> {b} -> a -> b->()
+testdata/language-features/basic-values/operator05.lc 2:16-2:19  forall a b . a -> b -> ()
 testdata/language-features/basic-values/operator05.lc 2:20-2:22  ()
diff --git a/testdata/language-features/basic-values/operator06.out b/testdata/language-features/basic-values/operator06.out
index c37005c3..4fa5381e 100644
--- a/testdata/language-features/basic-values/operator06.out
+++ b/testdata/language-features/basic-values/operator06.out
@@ -4,8 +4,8 @@ value1 :: ()
 ------------ tooltips
 testdata/language-features/basic-values/operator06.lc 1:1-1:7  ()
 testdata/language-features/basic-values/operator06.lc 1:10-1:12  ()
-testdata/language-features/basic-values/operator06.lc 1:10-1:16  a_->()
+testdata/language-features/basic-values/operator06.lc 1:10-1:16  _a -> ()
 testdata/language-features/basic-values/operator06.lc 1:10-1:19  ()
-testdata/language-features/basic-values/operator06.lc 1:13-1:16  {a} -> {b} -> a -> b->()
+testdata/language-features/basic-values/operator06.lc 1:13-1:16  forall a b . a -> b -> ()
 testdata/language-features/basic-values/operator06.lc 1:17-1:19  ()
 testdata/language-features/basic-values/operator06.lc 2:19-2:21  ()
diff --git a/testdata/language-features/basic-values/shadowing01.out b/testdata/language-features/basic-values/shadowing01.out
index dad7b72b..8956a8a3 100644
--- a/testdata/language-features/basic-values/shadowing01.out
+++ b/testdata/language-features/basic-values/shadowing01.out
@@ -5,7 +5,7 @@ value :: 'Char
 testdata/language-features/basic-values/shadowing01.lc 1:1-1:6  Char
 testdata/language-features/basic-values/shadowing01.lc 2:11-2:14  Char
 testdata/language-features/basic-values/shadowing01.lc 3:11-3:18  String
-testdata/language-features/basic-values/shadowing01.lc 5:17-5:18  b_
+testdata/language-features/basic-values/shadowing01.lc 5:17-5:18  _b
 testdata/language-features/basic-values/shadowing01.lc 6:17-6:21  Float
 testdata/language-features/basic-values/shadowing01.lc 7:25-7:27  ()
 testdata/language-features/basic-values/shadowing01.lc 8:25-8:28  Char
diff --git a/testdata/language-features/basic-values/shadowing02.out b/testdata/language-features/basic-values/shadowing02.out
index a3acdba8..201f5f75 100644
--- a/testdata/language-features/basic-values/shadowing02.out
+++ b/testdata/language-features/basic-values/shadowing02.out
@@ -1,23 +1,23 @@
 main is not found
 ------------ trace
-c :: {a} -> {_ : 'Num a}->a
+c :: forall a . 'Num a => a
 world :: 'String
 value2 :: 'Char
 ------------ tooltips
-testdata/language-features/basic-values/shadowing02.lc 1:1-1:2  {a} -> {_ : Num a}->a
-testdata/language-features/basic-values/shadowing02.lc 1:5-1:6  b_
+testdata/language-features/basic-values/shadowing02.lc 1:1-1:2  forall a . Num a => a
+testdata/language-features/basic-values/shadowing02.lc 1:5-1:6  _b
 testdata/language-features/basic-values/shadowing02.lc 2:1-2:6  String
 testdata/language-features/basic-values/shadowing02.lc 2:9-2:16  String
 testdata/language-features/basic-values/shadowing02.lc 3:1-3:7  Char
 testdata/language-features/basic-values/shadowing02.lc 4:11-4:14  Char
 testdata/language-features/basic-values/shadowing02.lc 5:11-5:18  String
-testdata/language-features/basic-values/shadowing02.lc 6:11-6:14  b_
-testdata/language-features/basic-values/shadowing02.lc 8:17-8:18  b_
+testdata/language-features/basic-values/shadowing02.lc 6:11-6:14  _b
+testdata/language-features/basic-values/shadowing02.lc 8:17-8:18  _b
 testdata/language-features/basic-values/shadowing02.lc 9:17-9:21  Float
 testdata/language-features/basic-values/shadowing02.lc 10:25-10:27  ()
 testdata/language-features/basic-values/shadowing02.lc 11:25-11:28  Char
 testdata/language-features/basic-values/shadowing02.lc 12:25-12:29  Float
-testdata/language-features/basic-values/shadowing02.lc 13:25-13:26  {a} -> {_ : Num a}->a
+testdata/language-features/basic-values/shadowing02.lc 13:25-13:26  forall a . Num a => a
 testdata/language-features/basic-values/shadowing02.lc 14:20-14:25  String
 testdata/language-features/basic-values/shadowing02.lc 15:14-15:16  ()
 testdata/language-features/basic-values/shadowing02.lc 16:6-16:9  Char
diff --git a/testdata/language-features/basic-values/shadowing03.out b/testdata/language-features/basic-values/shadowing03.out
index f4b60d48..23d28466 100644
--- a/testdata/language-features/basic-values/shadowing03.out
+++ b/testdata/language-features/basic-values/shadowing03.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-x :: {a} -> {b} -> a -> b->()
+x :: forall a b . a -> b -> ()
 ------------ tooltips
-testdata/language-features/basic-values/shadowing03.lc 1:1-1:2  {a} -> {b} -> a -> b->()
+testdata/language-features/basic-values/shadowing03.lc 1:1-1:2  forall a b . a -> b -> ()
 testdata/language-features/basic-values/shadowing03.lc 1:9-1:11  ()
diff --git a/testdata/language-features/basic-values/shadowing04.out b/testdata/language-features/basic-values/shadowing04.out
index b1a26817..70a54caa 100644
--- a/testdata/language-features/basic-values/shadowing04.out
+++ b/testdata/language-features/basic-values/shadowing04.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-__ :: {a} -> {b} -> a -> b->()
+__ :: forall a b . a -> b -> ()
 ------------ tooltips
-testdata/language-features/basic-values/shadowing04.lc 1:1-1:3  {a} -> {b} -> a -> b->()
+testdata/language-features/basic-values/shadowing04.lc 1:1-1:3  forall a b . a -> b -> ()
 testdata/language-features/basic-values/shadowing04.lc 1:11-1:13  ()
diff --git a/testdata/language-features/basic-values/tuple02.out b/testdata/language-features/basic-values/tuple02.out
index 90605d50..649fc85f 100644
--- a/testdata/language-features/basic-values/tuple02.out
+++ b/testdata/language-features/basic-values/tuple02.out
@@ -1,12 +1,12 @@
 main is not found
 ------------ trace
-tuple1 :: {a} -> {_ : 'Num a}->(a, 'Float, 'Char, 'String, ())
+tuple1 :: forall a . 'Num a => (a, 'Float, 'Char, 'String, ())
 tuple2 :: ((), ())
 tuple3 :: (('String, 'Char), ())
 ------------ tooltips
-testdata/language-features/basic-values/tuple02.lc 1:1-1:7  {a} -> {_ : Num a}->(a, Float, Char, String, ())
-testdata/language-features/basic-values/tuple02.lc 1:10-1:33  (b_, Float, Char, String, ())
-testdata/language-features/basic-values/tuple02.lc 1:11-1:12  b_
+testdata/language-features/basic-values/tuple02.lc 1:1-1:7  forall a . Num a => (a, Float, Char, String, ())
+testdata/language-features/basic-values/tuple02.lc 1:10-1:33  (_b, Float, Char, String, ())
+testdata/language-features/basic-values/tuple02.lc 1:11-1:12  _b
 testdata/language-features/basic-values/tuple02.lc 1:13-1:16  Float
 testdata/language-features/basic-values/tuple02.lc 1:13-1:32  (Float, Char, String, ())
 testdata/language-features/basic-values/tuple02.lc 1:17-1:20  Char
diff --git a/testdata/language-features/basic-values/typesig03.out b/testdata/language-features/basic-values/typesig03.out
index 720df136..68d312c9 100644
--- a/testdata/language-features/basic-values/typesig03.out
+++ b/testdata/language-features/basic-values/typesig03.out
@@ -1,23 +1,23 @@
 main is not found
 ------------ trace
-fun1 :: {a} -> {b} -> {c} -> a -> b -> c->()
-fun2 :: {a} -> {b} -> {c} -> a -> b -> c->()
+fun1 :: forall a b c . a -> b -> c -> ()
+fun2 :: forall a b c . a -> b -> c -> ()
 ------------ tooltips
-testdata/language-features/basic-values/typesig03.lc 1:9-1:10  f_
+testdata/language-features/basic-values/typesig03.lc 1:9-1:10  _f
 testdata/language-features/basic-values/typesig03.lc 1:9-1:26  Type
-testdata/language-features/basic-values/typesig03.lc 1:14-1:15  e_
+testdata/language-features/basic-values/typesig03.lc 1:14-1:15  _e
 testdata/language-features/basic-values/typesig03.lc 1:14-1:26  Type
-testdata/language-features/basic-values/typesig03.lc 1:19-1:20  d_
+testdata/language-features/basic-values/typesig03.lc 1:19-1: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_ -> b_ -> a_->() | c_ -> b_->() | c_->()
-testdata/language-features/basic-values/typesig03.lc 4:7-4:8  f_
+testdata/language-features/basic-values/typesig03.lc 2:1-2:5  forall a b c . a -> b -> c -> ()
+testdata/language-features/basic-values/typesig03.lc 2:14-2:16  () | _c -> () | _c -> _b -> () | _c -> _b -> _a -> ()
+testdata/language-features/basic-values/typesig03.lc 4:7-4:8  _f
 testdata/language-features/basic-values/typesig03.lc 4:7-4:18  Type
-testdata/language-features/basic-values/typesig03.lc 4:10-4:11  e_
+testdata/language-features/basic-values/typesig03.lc 4:10-4:11  _e
 testdata/language-features/basic-values/typesig03.lc 4:10-4:18  Type
-testdata/language-features/basic-values/typesig03.lc 4:13-4:14  d_
+testdata/language-features/basic-values/typesig03.lc 4:13-4: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_ -> b_ -> a_->() | c_ -> b_->() | c_->()
+testdata/language-features/basic-values/typesig03.lc 5:1-5:5  forall a b c . a -> b -> c -> ()
+testdata/language-features/basic-values/typesig03.lc 5:14-5:16  () | _c -> () | _c -> _b -> () | _c -> _b -> _a -> ()
diff --git a/testdata/language-features/basic-values/typesig04.out b/testdata/language-features/basic-values/typesig04.out
index 9d7d2072..3059a3ac 100644
--- a/testdata/language-features/basic-values/typesig04.out
+++ b/testdata/language-features/basic-values/typesig04.out
@@ -1,21 +1,21 @@
 main is not found
 ------------ trace
-fun1 :: {a} -> {b} -> {c} -> a -> (b->c)->()
-fun2 :: {a} -> {b} -> {c} -> a -> (b->c)->()
+fun1 :: forall a b c . a -> (b -> c) -> ()
+fun2 :: forall a b c . a -> (b -> c) -> ()
 ------------ tooltips
-testdata/language-features/basic-values/typesig04.lc 1:9-1:10  f_
+testdata/language-features/basic-values/typesig04.lc 1:9-1:10  _f
 testdata/language-features/basic-values/typesig04.lc 1:9-1:28  Type
 testdata/language-features/basic-values/typesig04.lc 1:14-1:28  Type
-testdata/language-features/basic-values/typesig04.lc 1:15-1:16  e_
-testdata/language-features/basic-values/typesig04.lc 1:20-1:21  Type | d_
+testdata/language-features/basic-values/typesig04.lc 1: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_->b_)->() | c_ -> (b_->a_)->()
-testdata/language-features/basic-values/typesig04.lc 4:7-4:8  f_
+testdata/language-features/basic-values/typesig04.lc 2:1-2:5  forall a b c . a -> (b -> c) -> ()
+testdata/language-features/basic-values/typesig04.lc 2:12-2:14  () | (_c -> _b) -> () | _c -> (_b -> _a) -> ()
+testdata/language-features/basic-values/typesig04.lc 4:7-4:8  _f
 testdata/language-features/basic-values/typesig04.lc 4:7-4:20  Type
 testdata/language-features/basic-values/typesig04.lc 4:10-4:20  Type
-testdata/language-features/basic-values/typesig04.lc 4:11-4:12  e_
-testdata/language-features/basic-values/typesig04.lc 4:14-4:15  Type | d_
+testdata/language-features/basic-values/typesig04.lc 4: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_->b_)->() | c_ -> (b_->a_)->()
+testdata/language-features/basic-values/typesig04.lc 5:1-5:5  forall a b c . a -> (b -> c) -> ()
+testdata/language-features/basic-values/typesig04.lc 5:12-5:14  () | (_c -> _b) -> () | _c -> (_b -> _a) -> ()
diff --git a/testdata/language-features/basic-values/typesig05.out b/testdata/language-features/basic-values/typesig05.out
index a2d2e91d..1e8fa0f6 100644
--- a/testdata/language-features/basic-values/typesig05.out
+++ b/testdata/language-features/basic-values/typesig05.out
@@ -1,41 +1,41 @@
 main is not found
 ------------ trace
-funL :: {a} -> {b} -> a -> b->a
-funR :: {a} -> {b} -> a -> b->b
+funL :: forall a b . a -> b -> a
+funR :: forall a b . a -> b -> b
 value1 :: 'Char
 value2 :: 'String
 value3 :: 'Char
 value4 :: 'String
 ------------ tooltips
-testdata/language-features/basic-values/typesig05.lc 1:1-1:5  {a} -> {b} -> a -> b->a
-testdata/language-features/basic-values/typesig05.lc 1:12-1:13  d_
-testdata/language-features/basic-values/typesig05.lc 2:1-2:5  {a} -> {b} -> a -> b->b
-testdata/language-features/basic-values/typesig05.lc 2:12-2:13  b_
+testdata/language-features/basic-values/typesig05.lc 1:1-1:5  forall a b . a -> b -> a
+testdata/language-features/basic-values/typesig05.lc 1:12-1:13  _d
+testdata/language-features/basic-values/typesig05.lc 2:1-2:5  forall a b . a -> b -> b
+testdata/language-features/basic-values/typesig05.lc 2:12-2:13  _b
 testdata/language-features/basic-values/typesig05.lc 4:1-4:7  Char
-testdata/language-features/basic-values/typesig05.lc 4:10-4:14  {a} -> {b} -> a -> b->a
-testdata/language-features/basic-values/typesig05.lc 4:10-4:18  a_->Char
+testdata/language-features/basic-values/typesig05.lc 4:10-4:14  forall a b . a -> b -> a
+testdata/language-features/basic-values/typesig05.lc 4:10-4:18  _a -> Char
 testdata/language-features/basic-values/typesig05.lc 4:10-4:22  Char
 testdata/language-features/basic-values/typesig05.lc 4:15-4:18  Char
 testdata/language-features/basic-values/typesig05.lc 4:19-4:22  String
 testdata/language-features/basic-values/typesig05.lc 4:26-4:30  Type
 testdata/language-features/basic-values/typesig05.lc 5:1-5:7  String
-testdata/language-features/basic-values/typesig05.lc 5:10-5:14  {a} -> {b} -> a -> b->b
-testdata/language-features/basic-values/typesig05.lc 5:10-5:18  a_->a_
+testdata/language-features/basic-values/typesig05.lc 5:10-5:14  forall a b . a -> b -> b
+testdata/language-features/basic-values/typesig05.lc 5:10-5:18  _a -> _a
 testdata/language-features/basic-values/typesig05.lc 5:10-5:22  String
 testdata/language-features/basic-values/typesig05.lc 5:15-5:18  Char
 testdata/language-features/basic-values/typesig05.lc 5:19-5:22  String
 testdata/language-features/basic-values/typesig05.lc 5:26-5:32  Type
 testdata/language-features/basic-values/typesig05.lc 7:11-7:15  Type
 testdata/language-features/basic-values/typesig05.lc 8:1-8:7  Char
-testdata/language-features/basic-values/typesig05.lc 8:10-8:14  {a} -> {b} -> a -> b->a
-testdata/language-features/basic-values/typesig05.lc 8:10-8:18  a_->Char
+testdata/language-features/basic-values/typesig05.lc 8:10-8:14  forall a b . a -> b -> a
+testdata/language-features/basic-values/typesig05.lc 8:10-8:18  _a -> Char
 testdata/language-features/basic-values/typesig05.lc 8:10-8:22  Char
 testdata/language-features/basic-values/typesig05.lc 8:15-8:18  Char
 testdata/language-features/basic-values/typesig05.lc 8:19-8:22  String
 testdata/language-features/basic-values/typesig05.lc 10:11-10:17  Type
 testdata/language-features/basic-values/typesig05.lc 11:1-11:7  String
-testdata/language-features/basic-values/typesig05.lc 11:10-11:14  {a} -> {b} -> a -> b->b
-testdata/language-features/basic-values/typesig05.lc 11:10-11:18  a_->a_
+testdata/language-features/basic-values/typesig05.lc 11:10-11:14  forall a b . a -> b -> b
+testdata/language-features/basic-values/typesig05.lc 11:10-11:18  _a -> _a
 testdata/language-features/basic-values/typesig05.lc 11:10-11:22  String
 testdata/language-features/basic-values/typesig05.lc 11:15-11:18  Char
 testdata/language-features/basic-values/typesig05.lc 11:19-11:22  String
diff --git a/testdata/language-features/basic-values/typesig06.out b/testdata/language-features/basic-values/typesig06.out
index 2335d27b..a5bcd427 100644
--- a/testdata/language-features/basic-values/typesig06.out
+++ b/testdata/language-features/basic-values/typesig06.out
@@ -1,25 +1,25 @@
 main is not found
 ------------ trace
-funL :: {a} -> {b} -> a -> b->a
-<@ :: {a} -> {b} -> a -> b->a
+funL :: forall a b . a -> b -> a
+<@ :: forall a b . a -> b -> a
 value1 :: 'String
 value2 :: 'String
 ------------ tooltips
-testdata/language-features/basic-values/typesig06.lc 1:1-1:5  {a} -> {b} -> a -> b->a
-testdata/language-features/basic-values/typesig06.lc 1:12-1:13  d_
-testdata/language-features/basic-values/typesig06.lc 2:3-2:5  {a} -> {b} -> a -> b->a
-testdata/language-features/basic-values/typesig06.lc 2:10-2:11  d_
+testdata/language-features/basic-values/typesig06.lc 1:1-1:5  forall a b . a -> b -> a
+testdata/language-features/basic-values/typesig06.lc 1:12-1:13  _d
+testdata/language-features/basic-values/typesig06.lc 2:3-2:5  forall a b . a -> b -> a
+testdata/language-features/basic-values/typesig06.lc 2:10-2:11  _d
 testdata/language-features/basic-values/typesig06.lc 4:1-4:7  String
 testdata/language-features/basic-values/typesig06.lc 4:10-4:14  String
-testdata/language-features/basic-values/typesig06.lc 4:10-4:17  a_->String
+testdata/language-features/basic-values/typesig06.lc 4:10-4:17  _a -> String
 testdata/language-features/basic-values/typesig06.lc 4:10-4:21  String
-testdata/language-features/basic-values/typesig06.lc 4:15-4:17  {a} -> {b} -> a -> b->a
+testdata/language-features/basic-values/typesig06.lc 4:15-4:17  forall a b . a -> b -> a
 testdata/language-features/basic-values/typesig06.lc 4:18-4:21  Float
 testdata/language-features/basic-values/typesig06.lc 4:25-4:31  Type
 testdata/language-features/basic-values/typesig06.lc 5:1-5:7  String
 testdata/language-features/basic-values/typesig06.lc 5:10-5:14  String
-testdata/language-features/basic-values/typesig06.lc 5:10-5:21  a_->String
+testdata/language-features/basic-values/typesig06.lc 5:10-5:21  _a -> String
 testdata/language-features/basic-values/typesig06.lc 5:10-5:25  String
-testdata/language-features/basic-values/typesig06.lc 5:15-5:21  {a} -> {b} -> a -> b->a
+testdata/language-features/basic-values/typesig06.lc 5:15-5:21  forall a b . a -> b -> a
 testdata/language-features/basic-values/typesig06.lc 5:22-5:25  Float
 testdata/language-features/basic-values/typesig06.lc 5:29-5:35  Type
diff --git a/testdata/language-features/basic-values/typesig07.out b/testdata/language-features/basic-values/typesig07.out
index 402f8630..d8beb681 100644
--- a/testdata/language-features/basic-values/typesig07.out
+++ b/testdata/language-features/basic-values/typesig07.out
@@ -3,24 +3,24 @@ main is not found
 value1 :: 'Int
 value2 :: 'Int
 value3 :: 'Int
-value4 :: () -> ()->()
-@@@ :: () -> ()->()
-value6 :: () -> ()->()
+value4 :: () -> () -> ()
+@@@ :: () -> () -> ()
+value6 :: () -> () -> ()
 ------------ tooltips
 testdata/language-features/basic-values/typesig07.lc 1:27-1:30  Type
 testdata/language-features/basic-values/typesig07.lc 3:1-3:7  Int
-testdata/language-features/basic-values/typesig07.lc 3:10-3:11  b_
+testdata/language-features/basic-values/typesig07.lc 3:10-3:11  _b
 testdata/language-features/basic-values/typesig07.lc 4:1-4:7  Int
-testdata/language-features/basic-values/typesig07.lc 4:10-4:11  b_
+testdata/language-features/basic-values/typesig07.lc 4:10-4:11  _b
 testdata/language-features/basic-values/typesig07.lc 5:1-5:7  Int
-testdata/language-features/basic-values/typesig07.lc 5:10-5:11  b_
+testdata/language-features/basic-values/typesig07.lc 5:10-5:11  _b
 testdata/language-features/basic-values/typesig07.lc 8:12-8:14  Type
 testdata/language-features/basic-values/typesig07.lc 8:18-8:20  Type
 testdata/language-features/basic-values/typesig07.lc 8:18-8:26  Type
 testdata/language-features/basic-values/typesig07.lc 8:24-8:26  Type
-testdata/language-features/basic-values/typesig07.lc 10:1-10:7  () -> ()->()
-testdata/language-features/basic-values/typesig07.lc 10:14-10:16  () | () -> ()->() | ()->()
-testdata/language-features/basic-values/typesig07.lc 11:3-11:6  () -> ()->()
-testdata/language-features/basic-values/typesig07.lc 11:11-11:13  () | () -> ()->() | ()->()
-testdata/language-features/basic-values/typesig07.lc 12:1-12:7  () -> ()->()
-testdata/language-features/basic-values/typesig07.lc 12:14-12:16  () | () -> ()->() | ()->()
+testdata/language-features/basic-values/typesig07.lc 10:1-10:7  () -> () -> ()
+testdata/language-features/basic-values/typesig07.lc 10:14-10:16  () | () -> () | () -> () -> ()
+testdata/language-features/basic-values/typesig07.lc 11:3-11:6  () -> () -> ()
+testdata/language-features/basic-values/typesig07.lc 11:11-11:13  () | () -> () | () -> () -> ()
+testdata/language-features/basic-values/typesig07.lc 12:1-12:7  () -> () -> ()
+testdata/language-features/basic-values/typesig07.lc 12:14-12:16  () | () -> () | () -> () -> ()
diff --git a/testdata/language-features/basic-values/typesyn02.out b/testdata/language-features/basic-values/typesyn02.out
index dc6e687e..858e7b33 100644
--- a/testdata/language-features/basic-values/typesyn02.out
+++ b/testdata/language-features/basic-values/typesyn02.out
@@ -1,14 +1,14 @@
 main is not found
 ------------ trace
 'MyUnit :: Type
-fun :: {a} -> a -> ()->()
+fun :: forall a . a -> () -> ()
 ------------ tooltips
 testdata/language-features/basic-values/typesyn02.lc 1:6-1:12  Type
 testdata/language-features/basic-values/typesyn02.lc 1:15-1:17  Type
-testdata/language-features/basic-values/typesyn02.lc 3:8-3:9  b_
+testdata/language-features/basic-values/typesyn02.lc 3:8-3:9  _b
 testdata/language-features/basic-values/typesyn02.lc 3:8-3:29  Type
 testdata/language-features/basic-values/typesyn02.lc 3:13-3:19  Type
 testdata/language-features/basic-values/typesyn02.lc 3:13-3:29  Type
 testdata/language-features/basic-values/typesyn02.lc 3:23-3:29  Type
-testdata/language-features/basic-values/typesyn02.lc 4:1-4:4  {a} -> a -> ()->()
-testdata/language-features/basic-values/typesyn02.lc 4:12-4:14  () | ()->() | a_ -> ()->()
+testdata/language-features/basic-values/typesyn02.lc 4:1-4:4  forall a . a -> () -> ()
+testdata/language-features/basic-values/typesyn02.lc 4:12-4:14  () | () -> () | _a -> () -> ()
diff --git a/testdata/language-features/basic-values/where05.out b/testdata/language-features/basic-values/where05.out
index 95f7c3c3..a0785fa9 100644
--- a/testdata/language-features/basic-values/where05.out
+++ b/testdata/language-features/basic-values/where05.out
@@ -1,35 +1,35 @@
 main is not found
 ------------ trace
-value1 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a}->()
-value2 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a}->()
-value3 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a}->()
-value4 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a}->()
+value1 :: forall a . ('Eq a, 'Num a) => ()
+value2 :: forall a . ('Eq a, 'Num a) => ()
+value3 :: forall a . ('Eq a, 'Num a) => ()
+value4 :: forall a . ('Eq a, 'Num a) => ()
 ------------ tooltips
-testdata/language-features/basic-values/where05.lc 1:1-1:7  {a} -> {_ : Eq a} -> {_ : Num a}->()
+testdata/language-features/basic-values/where05.lc 1:1-1:7  forall a . (Eq a, Num a) => ()
 testdata/language-features/basic-values/where05.lc 1:10-3:10  ()
-testdata/language-features/basic-values/where05.lc 1:15-1:16  b_
+testdata/language-features/basic-values/where05.lc 1:15-1:16  _b
 testdata/language-features/basic-values/where05.lc 2:8-2:9  ()
-testdata/language-features/basic-values/where05.lc 2:8-3:10  Bool->()
+testdata/language-features/basic-values/where05.lc 2:8-3:10  Bool -> ()
 testdata/language-features/basic-values/where05.lc 2:20-2:22  ()
 testdata/language-features/basic-values/where05.lc 3:8-3:10  ()
-testdata/language-features/basic-values/where05.lc 5:1-5:7  {a} -> {_ : Eq a} -> {_ : Num a}->()
+testdata/language-features/basic-values/where05.lc 5:1-5:7  forall a . (Eq a, Num a) => ()
 testdata/language-features/basic-values/where05.lc 5:10-8:10  ()
-testdata/language-features/basic-values/where05.lc 5:15-5:16  b_
+testdata/language-features/basic-values/where05.lc 5:15-5:16  _b
 testdata/language-features/basic-values/where05.lc 6:8-6:9  ()
-testdata/language-features/basic-values/where05.lc 6:8-8:10  Bool->()
+testdata/language-features/basic-values/where05.lc 6:8-8:10  Bool -> ()
 testdata/language-features/basic-values/where05.lc 7:14-7:16  ()
 testdata/language-features/basic-values/where05.lc 8:8-8:10  ()
-testdata/language-features/basic-values/where05.lc 10:1-10:7  {a} -> {_ : Eq a} -> {_ : Num a}->()
+testdata/language-features/basic-values/where05.lc 10:1-10:7  forall a . (Eq a, Num a) => ()
 testdata/language-features/basic-values/where05.lc 10:10-14:10  ()
-testdata/language-features/basic-values/where05.lc 10:15-10:16  b_
+testdata/language-features/basic-values/where05.lc 10:15-10:16  _b
 testdata/language-features/basic-values/where05.lc 11:8-11:9  ()
-testdata/language-features/basic-values/where05.lc 11:8-14:10  Bool->()
+testdata/language-features/basic-values/where05.lc 11:8-14:10  Bool -> ()
 testdata/language-features/basic-values/where05.lc 13:8-13:10  ()
 testdata/language-features/basic-values/where05.lc 14:8-14:10  ()
-testdata/language-features/basic-values/where05.lc 16:1-16:7  {a} -> {_ : Eq a} -> {_ : Num a}->()
+testdata/language-features/basic-values/where05.lc 16:1-16:7  forall a . (Eq a, Num a) => ()
 testdata/language-features/basic-values/where05.lc 16:10-18:10  ()
-testdata/language-features/basic-values/where05.lc 16:15-16:16  b_
+testdata/language-features/basic-values/where05.lc 16:15-16:16  _b
 testdata/language-features/basic-values/where05.lc 17:8-17:9  ()
-testdata/language-features/basic-values/where05.lc 17:8-18:10  Bool->()
+testdata/language-features/basic-values/where05.lc 17:8-18:10  Bool -> ()
 testdata/language-features/basic-values/where05.lc 18:8-18:10  ()
 testdata/language-features/basic-values/where05.lc 21:6-21:8  ()
diff --git a/testdata/language-features/basic-values/wildcard01.out b/testdata/language-features/basic-values/wildcard01.out
index dd651320..891a7edd 100644
--- a/testdata/language-features/basic-values/wildcard01.out
+++ b/testdata/language-features/basic-values/wildcard01.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-funUnit :: {a} -> a->()
+funUnit :: forall a . a -> ()
 ------------ tooltips
-testdata/language-features/basic-values/wildcard01.lc 1:1-1:8  {a} -> a->()
+testdata/language-features/basic-values/wildcard01.lc 1:1-1:8  forall a . a -> ()
 testdata/language-features/basic-values/wildcard01.lc 1:13-1:15  ()