better source range handling

37 files changed, 1446 insertions, 763 deletions

diff --git a/testdata/Builtins.out b/testdata/Builtins.out
index dca1e33e..68d9101a 100644
--- a/testdata/Builtins.out
+++ b/testdata/Builtins.out
@@ -5,20 +5,26 @@ testdata/Builtins.lc 9:1-9:3  {a} -> a->a
 testdata/Builtins.lc 13:6-13:9  Type
 testdata/Builtins.lc 13:12-13:16  'Nat
 testdata/Builtins.lc 13:24-13:27  Type
+testdata/Builtins.lc 13:6-13:9  Type->Type
 testdata/Builtins.lc 13:19-13:23  'Nat->'Nat
+testdata/Builtins.lc 13:6-13:23  Type->Type
 testdata/Builtins.lc 13:6-13:23  Type
+testdata/Builtins.lc 13:19-13:23  Type->Type
 testdata/Builtins.lc 13:19-13:23  Type
 testdata/Builtins.lc 13:19-13:23  'Nat
 testdata/Builtins.lc 15:6-15:10  Type->Type
 testdata/Builtins.lc 15:6-15:10  Type
 testdata/Builtins.lc 15:15-15:18  {a} -> 'List a
-testdata/Builtins.lc 15:6-15:35  Type
+testdata/Builtins.lc 15:6-15:36  Type->Type
+testdata/Builtins.lc 15:6-15:36  Type
 testdata/Builtins.lc 15:26-15:27  Type
 testdata/Builtins.lc 15:29-15:33  Type->Type
 testdata/Builtins.lc 15:34-15:35  Type
 testdata/Builtins.lc 15:21-15:25  {a} -> a -> 'List a -> 'List a
+testdata/Builtins.lc 15:6-15:25  Type->Type
 testdata/Builtins.lc 15:6-15:25  Type
 testdata/Builtins.lc 15:15-15:18  'List V1
+testdata/Builtins.lc 15:21-15:25  Type->Type
 testdata/Builtins.lc 15:21-15:25  Type
 testdata/Builtins.lc 15:21-15:25  'List V4
 testdata/Builtins.lc 19:26-23:31  Type -> Type->Type
@@ -29,7 +35,6 @@ testdata/Builtins.lc 20:22-23:31  Type
 testdata/Builtins.lc 20:30-20:39  Type -> Type->Type
 testdata/Builtins.lc 20:30-20:39  Type->Type
 testdata/Builtins.lc 20:30-20:39  Type
-testdata/Builtins.lc 20:30-20:39  Type -> Type -> Type->Type
 testdata/Builtins.lc 20:31-20:32  Type
 testdata/Builtins.lc 20:34-20:35  Type
 testdata/Builtins.lc 20:37-20:38  Type
@@ -39,7 +44,6 @@ testdata/Builtins.lc 21:33-21:45  Type -> Type -> Type->Type
 testdata/Builtins.lc 21:33-21:45  Type -> Type->Type
 testdata/Builtins.lc 21:33-21:45  Type->Type
 testdata/Builtins.lc 21:33-21:45  Type
-testdata/Builtins.lc 21:33-21:45  Type -> Type -> Type -> Type->Type
 testdata/Builtins.lc 21:34-21:35  Type
 testdata/Builtins.lc 21:37-21:38  Type
 testdata/Builtins.lc 21:40-21:41  Type
@@ -51,7 +55,6 @@ testdata/Builtins.lc 22:36-22:51  Type -> Type -> Type->Type
 testdata/Builtins.lc 22:36-22:51  Type -> Type->Type
 testdata/Builtins.lc 22:36-22:51  Type->Type
 testdata/Builtins.lc 22:36-22:51  Type
-testdata/Builtins.lc 22:36-22:51  Type -> Type -> Type -> Type -> Type->Type
 testdata/Builtins.lc 22:37-22:38  Type
 testdata/Builtins.lc 22:40-22:41  Type
 testdata/Builtins.lc 22:43-22:44  Type
@@ -59,61 +62,76 @@ testdata/Builtins.lc 22:46-22:47  Type
 testdata/Builtins.lc 22:49-22:50  Type
 testdata/Builtins.lc 22:22-22:32  Type
 testdata/Builtins.lc 23:25-23:31  Type
-testdata/Builtins.lc 23:25-23:31  Type -> Type->Type
 testdata/Builtins.lc 23:26-23:27  Type
 testdata/Builtins.lc 23:29-23:30  Type
 testdata/Builtins.lc 19:5-19:18  Type -> Type->Type
-testdata/Builtins.lc 26:10-26:24  Type->Type
-testdata/Builtins.lc 26:10-26:24  Type
 testdata/Builtins.lc 25:7-25:21  Type->Type
-testdata/Builtins.lc 28:10-28:21  Type->Type
-testdata/Builtins.lc 28:10-28:21  Type
 testdata/Builtins.lc 27:7-27:18  Type->Type
-testdata/Builtins.lc 30:10-30:26  Type->Type
-testdata/Builtins.lc 30:10-30:26  Type
 testdata/Builtins.lc 29:7-29:23  Type->Type
 testdata/Builtins.lc 32:17-32:21  Type
+testdata/Builtins.lc 32:26-32:37  Type->Type
 testdata/Builtins.lc 32:26-32:37  Type
 testdata/Builtins.lc 32:26-32:29  Type
+testdata/Builtins.lc 32:33-32:37  Type->Type
 testdata/Builtins.lc 32:33-32:37  Type
 testdata/Builtins.lc 32:6-32:10  Type -> 'Nat->Type
-testdata/Builtins.lc 33:9-33:25  Type
+testdata/Builtins.lc 33:9-33:27  Type->Type
+testdata/Builtins.lc 33:9-33:27  Type
 testdata/Builtins.lc 33:9-33:10  Type
-testdata/Builtins.lc 33:14-33:25  Type
+testdata/Builtins.lc 33:14-33:27  Type->Type
+testdata/Builtins.lc 33:14-33:27  Type
 testdata/Builtins.lc 33:14-33:15  Type
-testdata/Builtins.lc 33:19-33:25  Type
+testdata/Builtins.lc 33:19-33:27  Type->Type
+testdata/Builtins.lc 33:19-33:27  Type
 testdata/Builtins.lc 33:19-33:23  Type -> 'Nat->Type
 testdata/Builtins.lc 33:24-33:25  Type
+testdata/Builtins.lc 33:26-33:27  'Nat
 testdata/Builtins.lc 33:3-33:5  {a} -> a -> a -> 'VecS a (Succ (Succ Zero))
-testdata/Builtins.lc 34:9-34:30  Type
+testdata/Builtins.lc 34:9-34:32  Type->Type
+testdata/Builtins.lc 34:9-34:32  Type
 testdata/Builtins.lc 34:9-34:10  Type
-testdata/Builtins.lc 34:14-34:30  Type
+testdata/Builtins.lc 34:14-34:32  Type->Type
+testdata/Builtins.lc 34:14-34:32  Type
 testdata/Builtins.lc 34:14-34:15  Type
-testdata/Builtins.lc 34:19-34:30  Type
+testdata/Builtins.lc 34:19-34:32  Type->Type
+testdata/Builtins.lc 34:19-34:32  Type
 testdata/Builtins.lc 34:19-34:20  Type
-testdata/Builtins.lc 34:24-34:30  Type
+testdata/Builtins.lc 34:24-34:32  Type->Type
+testdata/Builtins.lc 34:24-34:32  Type
 testdata/Builtins.lc 34:24-34:28  Type -> 'Nat->Type
 testdata/Builtins.lc 34:29-34:30  Type
+testdata/Builtins.lc 34:31-34:32  'Nat
 testdata/Builtins.lc 34:3-34:5  {a} -> a -> a -> a -> 'VecS a (Succ (Succ (Succ Zero)))
-testdata/Builtins.lc 35:9-35:35  Type
+testdata/Builtins.lc 35:9-35:37  Type->Type
+testdata/Builtins.lc 35:9-35:37  Type
 testdata/Builtins.lc 35:9-35:10  Type
-testdata/Builtins.lc 35:14-35:35  Type
+testdata/Builtins.lc 35:14-35:37  Type->Type
+testdata/Builtins.lc 35:14-35:37  Type
 testdata/Builtins.lc 35:14-35:15  Type
-testdata/Builtins.lc 35:19-35:35  Type
+testdata/Builtins.lc 35:19-35:37  Type->Type
+testdata/Builtins.lc 35:19-35:37  Type
 testdata/Builtins.lc 35:19-35:20  Type
-testdata/Builtins.lc 35:24-35:35  Type
+testdata/Builtins.lc 35:24-35:37  Type->Type
+testdata/Builtins.lc 35:24-35:37  Type
 testdata/Builtins.lc 35:24-35:25  Type
-testdata/Builtins.lc 35:29-35:35  Type
+testdata/Builtins.lc 35:29-35:37  Type->Type
+testdata/Builtins.lc 35:29-35:37  Type
 testdata/Builtins.lc 35:29-35:33  Type -> 'Nat->Type
 testdata/Builtins.lc 35:34-35:35  Type
+testdata/Builtins.lc 35:36-35:37  'Nat
 testdata/Builtins.lc 35:3-35:5  {a} -> a -> a -> a -> a -> 'VecS a (Succ (Succ (Succ (Succ Zero))))
-testdata/Builtins.lc 32:6-35:5  Type
+testdata/Builtins.lc 32:6-35:37  Type->Type
+testdata/Builtins.lc 32:6-35:37  Type
+testdata/Builtins.lc 32:6-32:10  Type->Type
 testdata/Builtins.lc 32:6-32:10  Type
-testdata/Builtins.lc 33:3-33:5  Type
+testdata/Builtins.lc 33:3-33:27  Type->Type
+testdata/Builtins.lc 33:3-33:27  Type
 testdata/Builtins.lc 33:3-33:5  'VecS V3 (Succ (Succ Zero))
-testdata/Builtins.lc 34:3-34:5  Type
+testdata/Builtins.lc 34:3-34:32  Type->Type
+testdata/Builtins.lc 34:3-34:32  Type
 testdata/Builtins.lc 34:3-34:5  'VecS V5 (Succ (Succ (Succ Zero)))
-testdata/Builtins.lc 35:3-35:5  Type
+testdata/Builtins.lc 35:3-35:37  Type->Type
+testdata/Builtins.lc 35:3-35:37  Type
 testdata/Builtins.lc 35:3-35:5  'VecS V7 (Succ (Succ (Succ (Succ Zero))))
 testdata/Builtins.lc 37:23-37:26  Type
 testdata/Builtins.lc 37:47-37:55  'Nat -> Type->Type
@@ -133,10 +151,10 @@ testdata/Builtins.lc 40:21-40:22  Type
 testdata/Builtins.lc 41:37-41:60  'Nat->Type
 testdata/Builtins.lc 41:37-41:60  Type
 testdata/Builtins.lc 41:37-41:40  'Nat -> Type->Type
-testdata/Builtins.lc 41:43-41:56  'Nat
-testdata/Builtins.lc 41:43-41:47  'Nat->'Nat
-testdata/Builtins.lc 41:50-41:56  'Nat
-testdata/Builtins.lc 41:50-41:54  'Nat->'Nat
+testdata/Builtins.lc 41:41-41:58  'Nat
+testdata/Builtins.lc 41:42-41:47  'Nat->'Nat
+testdata/Builtins.lc 41:48-41:57  'Nat
+testdata/Builtins.lc 41:49-41:54  'Nat->'Nat
 testdata/Builtins.lc 41:55-41:56  'Nat
 testdata/Builtins.lc 41:59-41:60  Type
 testdata/Builtins.lc 40:15-40:16  'Nat
@@ -150,138 +168,224 @@ testdata/Builtins.lc 45:21-45:22  'Nat
 testdata/Builtins.lc 45:23-45:24  Type
 testdata/Builtins.lc 45:5-45:10  'Nat -> Type->Type
 testdata/Builtins.lc 48:13-48:16  Type
+testdata/Builtins.lc 48:20-48:39  Type->Type
 testdata/Builtins.lc 48:20-48:39  Type
 testdata/Builtins.lc 48:20-48:23  Type
+testdata/Builtins.lc 48:27-48:39  Type->Type
 testdata/Builtins.lc 48:27-48:39  Type
 testdata/Builtins.lc 48:27-48:31  Type
+testdata/Builtins.lc 48:35-48:39  Type->Type
 testdata/Builtins.lc 48:35-48:39  Type
 testdata/Builtins.lc 48:6-48:9  'Nat -> 'Nat -> Type->Type
 testdata/Builtins.lc 49:11-49:14  'Nat -> Type->Type
+testdata/Builtins.lc 49:15-49:16  'Nat
 testdata/Builtins.lc 49:17-49:22  Type
+testdata/Builtins.lc 49:26-49:54  Type->Type
 testdata/Builtins.lc 49:26-49:54  Type
 testdata/Builtins.lc 49:26-49:29  'Nat -> Type->Type
+testdata/Builtins.lc 49:30-49:31  'Nat
 testdata/Builtins.lc 49:32-49:37  Type
+testdata/Builtins.lc 49:41-49:54  Type->Type
 testdata/Builtins.lc 49:41-49:54  Type
 testdata/Builtins.lc 49:41-49:44  'Nat -> 'Nat -> Type->Type
+testdata/Builtins.lc 49:45-49:46  'Nat
+testdata/Builtins.lc 49:47-49:48  'Nat
 testdata/Builtins.lc 49:49-49:54  Type
 testdata/Builtins.lc 49:3-49:7  'VecS 'Float (Succ (Succ Zero)) -> 'VecS 'Float (Succ (Succ Zero)) -> 'Mat (Succ (Succ Zero)) (Succ (Succ Zero)) 'Float
 testdata/Builtins.lc 50:11-50:14  'Nat -> Type->Type
+testdata/Builtins.lc 50:15-50:16  'Nat
 testdata/Builtins.lc 50:17-50:22  Type
+testdata/Builtins.lc 50:26-50:54  Type->Type
 testdata/Builtins.lc 50:26-50:54  Type
 testdata/Builtins.lc 50:26-50:29  'Nat -> Type->Type
+testdata/Builtins.lc 50:30-50:31  'Nat
 testdata/Builtins.lc 50:32-50:37  Type
+testdata/Builtins.lc 50:41-50:54  Type->Type
 testdata/Builtins.lc 50:41-50:54  Type
 testdata/Builtins.lc 50:41-50:44  'Nat -> 'Nat -> Type->Type
+testdata/Builtins.lc 50:45-50:46  'Nat
+testdata/Builtins.lc 50:47-50:48  'Nat
 testdata/Builtins.lc 50:49-50:54  Type
 testdata/Builtins.lc 50:3-50:7  'VecS 'Float (Succ (Succ (Succ Zero))) -> 'VecS 'Float (Succ (Succ (Succ Zero))) -> 'Mat (Succ (Succ (Succ Zero))) (Succ (Succ Zero)) 'Float
 testdata/Builtins.lc 51:11-51:14  'Nat -> Type->Type
+testdata/Builtins.lc 51:15-51:16  'Nat
 testdata/Builtins.lc 51:17-51:22  Type
+testdata/Builtins.lc 51:26-51:54  Type->Type
 testdata/Builtins.lc 51:26-51:54  Type
 testdata/Builtins.lc 51:26-51:29  'Nat -> Type->Type
+testdata/Builtins.lc 51:30-51:31  'Nat
 testdata/Builtins.lc 51:32-51:37  Type
+testdata/Builtins.lc 51:41-51:54  Type->Type
 testdata/Builtins.lc 51:41-51:54  Type
 testdata/Builtins.lc 51:41-51:44  'Nat -> 'Nat -> Type->Type
+testdata/Builtins.lc 51:45-51:46  'Nat
+testdata/Builtins.lc 51:47-51:48  'Nat
 testdata/Builtins.lc 51:49-51:54  Type
 testdata/Builtins.lc 51:3-51:7  'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'Mat (Succ (Succ (Succ (Succ Zero)))) (Succ (Succ Zero)) 'Float
 testdata/Builtins.lc 52:11-52:14  'Nat -> Type->Type
+testdata/Builtins.lc 52:15-52:16  'Nat
 testdata/Builtins.lc 52:17-52:22  Type
+testdata/Builtins.lc 52:26-52:69  Type->Type
 testdata/Builtins.lc 52:26-52:69  Type
 testdata/Builtins.lc 52:26-52:29  'Nat -> Type->Type
+testdata/Builtins.lc 52:30-52:31  'Nat
 testdata/Builtins.lc 52:32-52:37  Type
+testdata/Builtins.lc 52:41-52:69  Type->Type
 testdata/Builtins.lc 52:41-52:69  Type
 testdata/Builtins.lc 52:41-52:44  'Nat -> Type->Type
+testdata/Builtins.lc 52:45-52:46  'Nat
 testdata/Builtins.lc 52:47-52:52  Type
+testdata/Builtins.lc 52:56-52:69  Type->Type
 testdata/Builtins.lc 52:56-52:69  Type
 testdata/Builtins.lc 52:56-52:59  'Nat -> 'Nat -> Type->Type
+testdata/Builtins.lc 52:60-52:61  'Nat
+testdata/Builtins.lc 52:62-52:63  'Nat
 testdata/Builtins.lc 52:64-52:69  Type
 testdata/Builtins.lc 52:3-52:7  'VecS 'Float (Succ (Succ Zero)) -> 'VecS 'Float (Succ (Succ Zero)) -> 'VecS 'Float (Succ (Succ Zero)) -> 'Mat (Succ (Succ Zero)) (Succ (Succ (Succ Zero))) 'Float
 testdata/Builtins.lc 53:11-53:14  'Nat -> Type->Type
+testdata/Builtins.lc 53:15-53:16  'Nat
 testdata/Builtins.lc 53:17-53:22  Type
+testdata/Builtins.lc 53:26-53:69  Type->Type
 testdata/Builtins.lc 53:26-53:69  Type
 testdata/Builtins.lc 53:26-53:29  'Nat -> Type->Type
+testdata/Builtins.lc 53:30-53:31  'Nat
 testdata/Builtins.lc 53:32-53:37  Type
+testdata/Builtins.lc 53:41-53:69  Type->Type
 testdata/Builtins.lc 53:41-53:69  Type
 testdata/Builtins.lc 53:41-53:44  'Nat -> Type->Type
+testdata/Builtins.lc 53:45-53:46  'Nat
 testdata/Builtins.lc 53:47-53:52  Type
+testdata/Builtins.lc 53:56-53:69  Type->Type
 testdata/Builtins.lc 53:56-53:69  Type
 testdata/Builtins.lc 53:56-53:59  'Nat -> 'Nat -> Type->Type
+testdata/Builtins.lc 53:60-53:61  'Nat
+testdata/Builtins.lc 53:62-53:63  'Nat
 testdata/Builtins.lc 53:64-53:69  Type
 testdata/Builtins.lc 53:3-53:7  'VecS 'Float (Succ (Succ (Succ Zero))) -> 'VecS 'Float (Succ (Succ (Succ Zero))) -> 'VecS 'Float (Succ (Succ (Succ Zero))) -> 'Mat (Succ (Succ (Succ Zero))) (Succ (Succ (Succ Zero))) 'Float
 testdata/Builtins.lc 54:11-54:14  'Nat -> Type->Type
+testdata/Builtins.lc 54:15-54:16  'Nat
 testdata/Builtins.lc 54:17-54:22  Type
+testdata/Builtins.lc 54:26-54:69  Type->Type
 testdata/Builtins.lc 54:26-54:69  Type
 testdata/Builtins.lc 54:26-54:29  'Nat -> Type->Type
+testdata/Builtins.lc 54:30-54:31  'Nat
 testdata/Builtins.lc 54:32-54:37  Type
+testdata/Builtins.lc 54:41-54:69  Type->Type
 testdata/Builtins.lc 54:41-54:69  Type
 testdata/Builtins.lc 54:41-54:44  'Nat -> Type->Type
+testdata/Builtins.lc 54:45-54:46  'Nat
 testdata/Builtins.lc 54:47-54:52  Type
+testdata/Builtins.lc 54:56-54:69  Type->Type
 testdata/Builtins.lc 54:56-54:69  Type
 testdata/Builtins.lc 54:56-54:59  'Nat -> 'Nat -> Type->Type
+testdata/Builtins.lc 54:60-54:61  'Nat
+testdata/Builtins.lc 54:62-54:63  'Nat
 testdata/Builtins.lc 54:64-54:69  Type
 testdata/Builtins.lc 54:3-54:7  'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'Mat (Succ (Succ (Succ (Succ Zero)))) (Succ (Succ (Succ Zero))) 'Float
 testdata/Builtins.lc 55:11-55:14  'Nat -> Type->Type
+testdata/Builtins.lc 55:15-55:16  'Nat
 testdata/Builtins.lc 55:17-55:22  Type
+testdata/Builtins.lc 55:26-55:84  Type->Type
 testdata/Builtins.lc 55:26-55:84  Type
 testdata/Builtins.lc 55:26-55:29  'Nat -> Type->Type
+testdata/Builtins.lc 55:30-55:31  'Nat
 testdata/Builtins.lc 55:32-55:37  Type
+testdata/Builtins.lc 55:41-55:84  Type->Type
 testdata/Builtins.lc 55:41-55:84  Type
 testdata/Builtins.lc 55:41-55:44  'Nat -> Type->Type
+testdata/Builtins.lc 55:45-55:46  'Nat
 testdata/Builtins.lc 55:47-55:52  Type
+testdata/Builtins.lc 55:56-55:84  Type->Type
 testdata/Builtins.lc 55:56-55:84  Type
 testdata/Builtins.lc 55:56-55:59  'Nat -> Type->Type
+testdata/Builtins.lc 55:60-55:61  'Nat
 testdata/Builtins.lc 55:62-55:67  Type
+testdata/Builtins.lc 55:71-55:84  Type->Type
 testdata/Builtins.lc 55:71-55:84  Type
 testdata/Builtins.lc 55:71-55:74  'Nat -> 'Nat -> Type->Type
+testdata/Builtins.lc 55:75-55:76  'Nat
+testdata/Builtins.lc 55:77-55:78  'Nat
 testdata/Builtins.lc 55:79-55:84  Type
 testdata/Builtins.lc 55:3-55:7  'VecS 'Float (Succ (Succ Zero)) -> 'VecS 'Float (Succ (Succ Zero)) -> 'VecS 'Float (Succ (Succ Zero)) -> 'VecS 'Float (Succ (Succ Zero)) -> 'Mat (Succ (Succ Zero)) (Succ (Succ (Succ (Succ Zero)))) 'Float
 testdata/Builtins.lc 56:11-56:14  'Nat -> Type->Type
+testdata/Builtins.lc 56:15-56:16  'Nat
 testdata/Builtins.lc 56:17-56:22  Type
+testdata/Builtins.lc 56:26-56:84  Type->Type
 testdata/Builtins.lc 56:26-56:84  Type
 testdata/Builtins.lc 56:26-56:29  'Nat -> Type->Type
+testdata/Builtins.lc 56:30-56:31  'Nat
 testdata/Builtins.lc 56:32-56:37  Type
+testdata/Builtins.lc 56:41-56:84  Type->Type
 testdata/Builtins.lc 56:41-56:84  Type
 testdata/Builtins.lc 56:41-56:44  'Nat -> Type->Type
+testdata/Builtins.lc 56:45-56:46  'Nat
 testdata/Builtins.lc 56:47-56:52  Type
+testdata/Builtins.lc 56:56-56:84  Type->Type
 testdata/Builtins.lc 56:56-56:84  Type
 testdata/Builtins.lc 56:56-56:59  'Nat -> Type->Type
+testdata/Builtins.lc 56:60-56:61  'Nat
 testdata/Builtins.lc 56:62-56:67  Type
+testdata/Builtins.lc 56:71-56:84  Type->Type
 testdata/Builtins.lc 56:71-56:84  Type
 testdata/Builtins.lc 56:71-56:74  'Nat -> 'Nat -> Type->Type
+testdata/Builtins.lc 56:75-56:76  'Nat
+testdata/Builtins.lc 56:77-56:78  'Nat
 testdata/Builtins.lc 56:79-56:84  Type
 testdata/Builtins.lc 56:3-56:7  'VecS 'Float (Succ (Succ (Succ Zero))) -> 'VecS 'Float (Succ (Succ (Succ Zero))) -> 'VecS 'Float (Succ (Succ (Succ Zero))) -> 'VecS 'Float (Succ (Succ (Succ Zero))) -> 'Mat (Succ (Succ (Succ Zero))) (Succ (Succ (Succ (Succ Zero)))) 'Float
 testdata/Builtins.lc 57:11-57:14  'Nat -> Type->Type
+testdata/Builtins.lc 57:15-57:16  'Nat
 testdata/Builtins.lc 57:17-57:22  Type
+testdata/Builtins.lc 57:26-57:84  Type->Type
 testdata/Builtins.lc 57:26-57:84  Type
 testdata/Builtins.lc 57:26-57:29  'Nat -> Type->Type
+testdata/Builtins.lc 57:30-57:31  'Nat
 testdata/Builtins.lc 57:32-57:37  Type
+testdata/Builtins.lc 57:41-57:84  Type->Type
 testdata/Builtins.lc 57:41-57:84  Type
 testdata/Builtins.lc 57:41-57:44  'Nat -> Type->Type
+testdata/Builtins.lc 57:45-57:46  'Nat
 testdata/Builtins.lc 57:47-57:52  Type
+testdata/Builtins.lc 57:56-57:84  Type->Type
 testdata/Builtins.lc 57:56-57:84  Type
 testdata/Builtins.lc 57:56-57:59  'Nat -> Type->Type
+testdata/Builtins.lc 57:60-57:61  'Nat
 testdata/Builtins.lc 57:62-57:67  Type
+testdata/Builtins.lc 57:71-57:84  Type->Type
 testdata/Builtins.lc 57:71-57:84  Type
 testdata/Builtins.lc 57:71-57:74  'Nat -> 'Nat -> Type->Type
+testdata/Builtins.lc 57:75-57:76  'Nat
+testdata/Builtins.lc 57:77-57:78  'Nat
 testdata/Builtins.lc 57:79-57:84  Type
 testdata/Builtins.lc 57:3-57:7  'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'Mat (Succ (Succ (Succ (Succ Zero)))) (Succ (Succ (Succ (Succ Zero)))) 'Float
+testdata/Builtins.lc 48:6-48:9  Type->Type
 testdata/Builtins.lc 48:6-48:9  Type
+testdata/Builtins.lc 48:6-57:84  Type->Type
 testdata/Builtins.lc 48:6-57:84  Type
+testdata/Builtins.lc 49:3-49:54  Type->Type
 testdata/Builtins.lc 49:3-49:54  Type
 testdata/Builtins.lc 49:3-49:7  'Mat (Succ (Succ Zero)) (Succ (Succ Zero)) 'Float
+testdata/Builtins.lc 50:3-50:54  Type->Type
 testdata/Builtins.lc 50:3-50:54  Type
 testdata/Builtins.lc 50:3-50:7  'Mat (Succ (Succ (Succ Zero))) (Succ (Succ Zero)) 'Float
+testdata/Builtins.lc 51:3-51:54  Type->Type
 testdata/Builtins.lc 51:3-51:54  Type
 testdata/Builtins.lc 51:3-51:7  'Mat (Succ (Succ (Succ (Succ Zero)))) (Succ (Succ Zero)) 'Float
+testdata/Builtins.lc 52:3-52:69  Type->Type
 testdata/Builtins.lc 52:3-52:69  Type
 testdata/Builtins.lc 52:3-52:7  'Mat (Succ (Succ Zero)) (Succ (Succ (Succ Zero))) 'Float
+testdata/Builtins.lc 53:3-53:69  Type->Type
 testdata/Builtins.lc 53:3-53:69  Type
 testdata/Builtins.lc 53:3-53:7  'Mat (Succ (Succ (Succ Zero))) (Succ (Succ (Succ Zero))) 'Float
+testdata/Builtins.lc 54:3-54:69  Type->Type
 testdata/Builtins.lc 54:3-54:69  Type
 testdata/Builtins.lc 54:3-54:7  'Mat (Succ (Succ (Succ (Succ Zero)))) (Succ (Succ (Succ Zero))) 'Float
+testdata/Builtins.lc 55:3-55:84  Type->Type
 testdata/Builtins.lc 55:3-55:84  Type
 testdata/Builtins.lc 55:3-55:7  'Mat (Succ (Succ Zero)) (Succ (Succ (Succ (Succ Zero)))) 'Float
+testdata/Builtins.lc 56:3-56:84  Type->Type
 testdata/Builtins.lc 56:3-56:84  Type
 testdata/Builtins.lc 56:3-56:7  'Mat (Succ (Succ (Succ Zero))) (Succ (Succ (Succ (Succ Zero)))) 'Float
+testdata/Builtins.lc 57:3-57:84  Type->Type
 testdata/Builtins.lc 57:3-57:84  Type
 testdata/Builtins.lc 57:3-57:7  'Mat (Succ (Succ (Succ (Succ Zero)))) (Succ (Succ (Succ (Succ Zero)))) 'Float
 testdata/Builtins.lc 60:22-64:37  Type->Type
@@ -311,87 +415,99 @@ testdata/Builtins.lc 68:14-68:16  'Swizz
 testdata/Builtins.lc 68:19-68:21  'Swizz
 testdata/Builtins.lc 68:24-68:26  'Swizz
 testdata/Builtins.lc 68:29-68:31  'Swizz
+testdata/Builtins.lc 68:6-68:31  Type->Type
 testdata/Builtins.lc 68:6-68:31  Type
-testdata/Builtins.lc 71:27-71:56  Type
+testdata/Builtins.lc 68:6-68:11  Type->Type
+testdata/Builtins.lc 71:11-71:56  Type
+testdata/Builtins.lc 71:26-71:56  Type->Type
+testdata/Builtins.lc 71:26-71:56  Type
 testdata/Builtins.lc 71:27-71:28  V5
+testdata/Builtins.lc 71:32-71:33  Type->Type
 testdata/Builtins.lc 71:32-71:33  Type
 testdata/Builtins.lc 71:32-71:33  V4
+testdata/Builtins.lc 71:38-71:56  Type->Type
 testdata/Builtins.lc 71:38-71:56  Type
 testdata/Builtins.lc 71:38-71:41  'Nat -> Type->Type
 testdata/Builtins.lc 71:42-71:43  'Nat
 testdata/Builtins.lc 71:42-71:43  V2
 testdata/Builtins.lc 71:44-71:45  Type
+testdata/Builtins.lc 71:49-71:56  Type->Type
 testdata/Builtins.lc 71:49-71:56  Type
 testdata/Builtins.lc 71:49-71:52  'Nat -> Type->Type
 testdata/Builtins.lc 71:53-71:54  'Nat
 testdata/Builtins.lc 71:55-71:56  Type
-testdata/Builtins.lc 72:24-77:6  {a} -> {b} -> {c:'Nat} -> a->b -> 'VecS a c -> 'VecS b c
-testdata/Builtins.lc 72:24-77:6  {a} -> {b:'Nat} -> V2->a -> 'VecS V3 b -> 'VecS a b
-testdata/Builtins.lc 72:24-77:6  {a:'Nat} -> V2->V2 -> 'VecS V3 a -> 'VecS V3 a
-testdata/Builtins.lc 72:24-77:6  V2->V2 -> 'VecS V3 V1 -> 'VecS V3 V2
-testdata/Builtins.lc 72:24-77:6  'VecS V3 V1 -> 'VecS V3 V2
-testdata/Builtins.lc 72:24-77:6  'VecS V3 V2
-testdata/Builtins.lc 72:24-72:32  {a} -> (d : b:'Nat -> 'VecS a b -> Type) -> (e:a -> f:a -> d (Succ (Succ Zero)) (V2 a e f)) -> (h:a -> i:a -> j:a -> d (Succ (Succ (Succ Zero))) (V3 a h i j)) -> (l:a -> m:a -> n:a -> o:a -> d (Succ (Succ (Succ (Succ Zero)))) (V4 a l m n o)) -> {q:'Nat} -> (r : 'VecS a q) -> d q r
-testdata/Builtins.lc 72:34-72:50  a:'Nat -> 'VecS V1 a -> Type
+testdata/Builtins.lc 72:23-77:6  {a} -> {b} -> {c:'Nat} -> a->b -> 'VecS a c -> 'VecS b c
+testdata/Builtins.lc 72:23-77:6  {a} -> {b:'Nat} -> V2->a -> 'VecS V3 b -> 'VecS a b
+testdata/Builtins.lc 72:23-77:6  {a:'Nat} -> V2->V2 -> 'VecS V3 a -> 'VecS V3 a
+testdata/Builtins.lc 72:23-77:6  V2->V2 -> 'VecS V3 V1 -> 'VecS V3 V2
+testdata/Builtins.lc 72:23-77:6  'VecS V3 V1 -> 'VecS V3 V2
+testdata/Builtins.lc 72:23-77:6  'VecS V3 V2
+testdata/Builtins.lc 72:23-72:32  {a} -> (d : b:'Nat -> 'VecS a b -> Type) -> (e:a -> f:a -> d (Succ (Succ Zero)) (V2 a e f)) -> (h:a -> i:a -> j:a -> d (Succ (Succ (Succ Zero))) (V3 a h i j)) -> (l:a -> m:a -> n:a -> o:a -> d (Succ (Succ (Succ (Succ Zero)))) (V4 a l m n o)) -> {q:'Nat} -> (r : 'VecS a q) -> d q r
+testdata/Builtins.lc 72:33-72:51  a:'Nat -> 'VecS V1 a -> Type
 testdata/Builtins.lc 72:34-72:50  'VecS V1 V0 -> Type
-testdata/Builtins.lc 72:43-72:50  Type
-testdata/Builtins.lc 72:43-72:46  'Nat -> Type->Type
+testdata/Builtins.lc 72:42-72:50  Type
+testdata/Builtins.lc 72:42-72:46  'Nat -> Type->Type
 testdata/Builtins.lc 72:47-72:48  'Nat
 testdata/Builtins.lc 72:49-72:50  Type
-testdata/Builtins.lc 73:6-73:28  V0 -> V1 -> 'VecS V6 (Succ (Succ Zero))
+testdata/Builtins.lc 73:5-73:29  V0 -> V1 -> 'VecS V6 (Succ (Succ Zero))
 testdata/Builtins.lc 73:6-73:28  V1 -> 'VecS V6 (Succ (Succ Zero))
-testdata/Builtins.lc 73:14-73:27  'VecS V6 (Succ (Succ Zero))
+testdata/Builtins.lc 73:14-73:28  'VecS V6 (Succ (Succ Zero))
 testdata/Builtins.lc 73:14-73:16  {a} -> a -> a -> 'VecS a (Succ (Succ Zero))
-testdata/Builtins.lc 73:18-73:21  V0
+testdata/Builtins.lc 73:17-73:22  V0
 testdata/Builtins.lc 73:18-73:19  V8->V8
 testdata/Builtins.lc 73:20-73:21  V7
 testdata/Builtins.lc 73:20-73:21  V2
-testdata/Builtins.lc 73:24-73:27  V5
+testdata/Builtins.lc 73:23-73:28  V5
 testdata/Builtins.lc 73:24-73:25  V6->V6
 testdata/Builtins.lc 73:26-73:27  V6
-testdata/Builtins.lc 74:6-74:36  V4 -> V5 -> V6 -> 'VecS V6 (Succ (Succ (Succ Zero)))
+testdata/Builtins.lc 74:5-74:37  V4 -> V5 -> V6 -> 'VecS V6 (Succ (Succ (Succ Zero)))
 testdata/Builtins.lc 74:6-74:36  V5 -> V6 -> 'VecS V6 (Succ (Succ (Succ Zero)))
 testdata/Builtins.lc 74:6-74:36  V6 -> 'VecS V6 (Succ (Succ (Succ Zero)))
-testdata/Builtins.lc 74:16-74:35  'VecS V6 (Succ (Succ (Succ Zero)))
+testdata/Builtins.lc 74:16-74:36  'VecS V6 (Succ (Succ (Succ Zero)))
 testdata/Builtins.lc 74:16-74:18  {a} -> a -> a -> a -> 'VecS a (Succ (Succ (Succ Zero)))
-testdata/Builtins.lc 74:20-74:23  V0
+testdata/Builtins.lc 74:19-74:24  V0
 testdata/Builtins.lc 74:20-74:21  V8->V8
 testdata/Builtins.lc 74:22-74:23  V7
-testdata/Builtins.lc 74:26-74:29  V6
+testdata/Builtins.lc 74:25-74:30  V6
 testdata/Builtins.lc 74:26-74:27  V7->V7
 testdata/Builtins.lc 74:28-74:29  V7
-testdata/Builtins.lc 74:32-74:35  V6
+testdata/Builtins.lc 74:31-74:36  V6
 testdata/Builtins.lc 74:32-74:33  V7->V7
 testdata/Builtins.lc 74:34-74:35  V7
-testdata/Builtins.lc 75:6-75:44  V4 -> V5 -> V6 -> V7 -> 'VecS V7 (Succ (Succ (Succ (Succ Zero))))
+testdata/Builtins.lc 75:5-75:45  V4 -> V5 -> V6 -> V7 -> 'VecS V7 (Succ (Succ (Succ (Succ Zero))))
 testdata/Builtins.lc 75:6-75:44  V5 -> V6 -> V7 -> 'VecS V7 (Succ (Succ (Succ (Succ Zero))))
 testdata/Builtins.lc 75:6-75:44  V6 -> V7 -> 'VecS V7 (Succ (Succ (Succ (Succ Zero))))
 testdata/Builtins.lc 75:6-75:44  V7 -> 'VecS V7 (Succ (Succ (Succ (Succ Zero))))
-testdata/Builtins.lc 75:18-75:43  'VecS V7 (Succ (Succ (Succ (Succ Zero))))
+testdata/Builtins.lc 75:18-75:44  'VecS V7 (Succ (Succ (Succ (Succ Zero))))
 testdata/Builtins.lc 75:18-75:20  {a} -> a -> a -> a -> a -> 'VecS a (Succ (Succ (Succ (Succ Zero))))
-testdata/Builtins.lc 75:22-75:25  V0
+testdata/Builtins.lc 75:21-75:26  V0
 testdata/Builtins.lc 75:22-75:23  V9->V9
 testdata/Builtins.lc 75:24-75:25  V8
-testdata/Builtins.lc 75:28-75:31  V7
+testdata/Builtins.lc 75:27-75:32  V7
 testdata/Builtins.lc 75:28-75:29  V8->V8
 testdata/Builtins.lc 75:30-75:31  V8
-testdata/Builtins.lc 75:34-75:37  V7
+testdata/Builtins.lc 75:33-75:38  V7
 testdata/Builtins.lc 75:34-75:35  V8->V8
 testdata/Builtins.lc 75:36-75:37  V8
-testdata/Builtins.lc 75:40-75:43  V7
+testdata/Builtins.lc 75:39-75:44  V7
 testdata/Builtins.lc 75:40-75:41  V8->V8
 testdata/Builtins.lc 75:42-75:43  V8
 testdata/Builtins.lc 76:6-76:7  'Nat
 testdata/Builtins.lc 77:5-77:6  'VecS V4 V2
 testdata/Builtins.lc 72:1-72:7  {a} -> {b} -> {c:'Nat} -> a->b -> 'VecS a c -> 'VecS b c
+testdata/Builtins.lc 80:16-80:48  Type
+testdata/Builtins.lc 80:16-80:48  Type->Type
+testdata/Builtins.lc 80:27-80:48  Type->Type
 testdata/Builtins.lc 80:27-80:48  Type
 testdata/Builtins.lc 80:27-80:30  'Nat -> Type->Type
 testdata/Builtins.lc 80:31-80:32  'Nat
 testdata/Builtins.lc 80:31-80:32  V1
 testdata/Builtins.lc 80:33-80:34  Type
 testdata/Builtins.lc 80:33-80:34  V2
+testdata/Builtins.lc 80:38-80:48  Type->Type
 testdata/Builtins.lc 80:38-80:48  Type
 testdata/Builtins.lc 80:38-80:43  Type
+testdata/Builtins.lc 80:47-80:48  Type->Type
 testdata/Builtins.lc 80:47-80:48  Type
 testdata/Builtins.lc 81:17-89:32  {a} -> {b:'Nat} -> 'VecS a b -> 'Swizz->a
 testdata/Builtins.lc 81:17-89:32  {a:'Nat} -> 'VecS V1 a -> 'Swizz->V3
@@ -428,12 +544,15 @@ testdata/Builtins.lc 86:26-86:28  'Swizz
 testdata/Builtins.lc 81:17-81:20  'VecS V1 V0
 testdata/Builtins.lc 81:17-81:20  'VecS V5 V4
 testdata/Builtins.lc 81:1-81:12  {a} -> {b:'Nat} -> 'VecS a b -> 'Swizz->a
+testdata/Builtins.lc 92:15-92:43  Type
+testdata/Builtins.lc 92:28-92:43  Type->Type
 testdata/Builtins.lc 92:28-92:43  Type
 testdata/Builtins.lc 92:28-92:31  'Nat -> Type->Type
 testdata/Builtins.lc 92:32-92:33  'Nat
 testdata/Builtins.lc 92:32-92:33  V1
 testdata/Builtins.lc 92:34-92:35  Type
 testdata/Builtins.lc 92:34-92:35  V2
+testdata/Builtins.lc 92:39-92:43  Type->Type
 testdata/Builtins.lc 92:39-92:43  Type
 testdata/Builtins.lc 93:16-95:31  {a} -> {b:'Nat} -> 'VecS a b -> 'Bool
 testdata/Builtins.lc 93:16-95:31  {a:'Nat} -> 'VecS V1 a -> 'Bool
@@ -455,17 +574,24 @@ testdata/Builtins.lc 95:27-95:31  'Bool
 testdata/Builtins.lc 93:16-93:19  'VecS V1 V0
 testdata/Builtins.lc 93:16-93:19  'VecS V4 V3
 testdata/Builtins.lc 93:1-93:11  {a} -> {b:'Nat} -> 'VecS a b -> 'Bool
+testdata/Builtins.lc 97:16-97:71  Type
+testdata/Builtins.lc 97:16-97:71  Type->Type
+testdata/Builtins.lc 97:27-97:71  Type->Type
+testdata/Builtins.lc 97:27-97:71  Type
+testdata/Builtins.lc 97:38-97:71  Type->Type
 testdata/Builtins.lc 97:38-97:71  Type
 testdata/Builtins.lc 97:38-97:41  'Nat -> Type->Type
 testdata/Builtins.lc 97:42-97:43  'Nat
 testdata/Builtins.lc 97:42-97:43  V3
 testdata/Builtins.lc 97:44-97:45  Type
 testdata/Builtins.lc 97:44-97:45  V4
+testdata/Builtins.lc 97:49-97:71  Type->Type
 testdata/Builtins.lc 97:49-97:71  Type
 testdata/Builtins.lc 97:49-97:52  'Nat -> Type->Type
 testdata/Builtins.lc 97:53-97:54  'Nat
 testdata/Builtins.lc 97:53-97:54  V2
 testdata/Builtins.lc 97:55-97:60  Type
+testdata/Builtins.lc 97:64-97:71  Type->Type
 testdata/Builtins.lc 97:64-97:71  Type
 testdata/Builtins.lc 97:64-97:67  'Nat -> Type->Type
 testdata/Builtins.lc 97:68-97:69  'Nat
@@ -478,7 +604,7 @@ testdata/Builtins.lc 98:19-98:58  'VecS 'Swizz V1 -> 'VecS V4 V2
 testdata/Builtins.lc 98:19-98:58  'VecS V4 V2
 testdata/Builtins.lc 98:34-98:58  V0
 testdata/Builtins.lc 98:34-98:40  {a} -> {b} -> {c:'Nat} -> a->b -> 'VecS a c -> 'VecS b c
-testdata/Builtins.lc 98:42-98:55  V2->V2
+testdata/Builtins.lc 98:41-98:56  V2->V2
 testdata/Builtins.lc 98:42-98:53  {a} -> {b:'Nat} -> 'VecS a b -> 'Swizz->a
 testdata/Builtins.lc 98:54-98:55  'VecS V1 V0
 testdata/Builtins.lc 98:54-98:55  'VecS V10 V9
@@ -489,55 +615,34 @@ testdata/Builtins.lc 98:19-98:29  {a} -> {b:'Nat} -> 'VecS a b -> 'Bool
 testdata/Builtins.lc 98:30-98:31  'VecS V1 V0
 testdata/Builtins.lc 98:30-98:31  'VecS V6 V5
 testdata/Builtins.lc 98:1-98:12  {a} -> {b:'Nat} -> {c:'Nat} -> 'VecS a b -> 'VecS 'Swizz c -> 'VecS a c
-testdata/Builtins.lc 105:10-106:30  Type->Type
-testdata/Builtins.lc 105:10-106:30  Type
-testdata/Builtins.lc 105:10-105:16  Type
+testdata/Builtins.lc 105:25-106:30  Type->Type
+testdata/Builtins.lc 105:25-106:30  Type
 testdata/Builtins.lc 105:25-105:28  Type
-testdata/Builtins.lc 106:10-106:30  Type
-testdata/Builtins.lc 106:10-106:16  Type
 testdata/Builtins.lc 106:25-106:30  Type
 testdata/Builtins.lc 103:7-103:13  Type->Type
-testdata/Builtins.lc 116:10-162:19  Type->Type
-testdata/Builtins.lc 116:10-162:19  Type
-testdata/Builtins.lc 116:10-116:19  Type
+testdata/Builtins.lc 116:20-142:33  Type->Type
+testdata/Builtins.lc 116:20-142:33  Type
 testdata/Builtins.lc 116:20-116:24  Type
-testdata/Builtins.lc 122:10-162:19  Type
-testdata/Builtins.lc 122:10-122:19  Type
+testdata/Builtins.lc 122:20-142:33  Type
 testdata/Builtins.lc 122:20-122:23  Type
-testdata/Builtins.lc 129:10-162:19  Type
-testdata/Builtins.lc 129:10-129:19  Type
+testdata/Builtins.lc 129:20-142:33  Type
 testdata/Builtins.lc 129:20-129:24  Type
-testdata/Builtins.lc 136:10-162:19  Type
-testdata/Builtins.lc 136:10-136:19  Type
+testdata/Builtins.lc 136:20-142:33  Type
 testdata/Builtins.lc 136:20-136:25  Type
-testdata/Builtins.lc 142:10-162:19  Type
-testdata/Builtins.lc 142:10-162:19  Type -> 'Nat->Type
-testdata/Builtins.lc 142:10-162:19  'Nat->Type
-testdata/Builtins.lc 142:10-154:19  Type
-testdata/Builtins.lc 142:10-154:19  'Nat->Type
-testdata/Builtins.lc 142:10-142:19  Type
-testdata/Builtins.lc 148:10-154:19  'Nat->Type
-testdata/Builtins.lc 148:10-154:19  Type
-testdata/Builtins.lc 148:10-148:19  Type
-testdata/Builtins.lc 154:10-154:19  'Nat->Type
-testdata/Builtins.lc 154:10-154:19  Type
-testdata/Builtins.lc 160:10-162:19  Type
-testdata/Builtins.lc 160:10-162:19  'Nat->Type
-testdata/Builtins.lc 160:10-160:19  Type
-testdata/Builtins.lc 161:10-162:19  'Nat->Type
-testdata/Builtins.lc 161:10-162:19  Type
-testdata/Builtins.lc 161:10-161:19  Type
-testdata/Builtins.lc 162:10-162:19  'Nat->Type
-testdata/Builtins.lc 162:10-162:19  Type
 testdata/Builtins.lc 142:26-142:33  Type
 testdata/Builtins.lc 108:7-108:16  Type->Type
 testdata/Builtins.lc 108:7-109:28  Type
+testdata/Builtins.lc 108:7-109:28  Type->Type
+testdata/Builtins.lc 109:11-109:28  Type->Type
 testdata/Builtins.lc 109:11-109:28  Type
 testdata/Builtins.lc 109:11-109:12  Type
+testdata/Builtins.lc 109:16-109:28  Type->Type
 testdata/Builtins.lc 109:16-109:28  Type
 testdata/Builtins.lc 109:16-109:17  Type
+testdata/Builtins.lc 109:21-109:28  Type->Type
 testdata/Builtins.lc 109:21-109:28  Type
 testdata/Builtins.lc 109:21-109:24  'Nat -> Type->Type
+testdata/Builtins.lc 109:25-109:26  'Nat
 testdata/Builtins.lc 109:27-109:28  Type
 testdata/Builtins.lc 116:20-163:12  {a} -> {b : 'Component a} -> a -> a -> 'VecS a (Succ (Succ Zero))
 testdata/Builtins.lc 116:20-163:12  {a : 'Component V0} -> V1 -> V2 -> 'VecS V3 (Succ (Succ Zero))
@@ -593,14 +698,20 @@ testdata/Builtins.lc 163:10-163:12  'VecS 'Bool (Succ (Succ (Succ (Succ Zero))))
 testdata/Builtins.lc 163:10-163:12  {a} -> a -> a -> 'VecS a (Succ (Succ Zero))
 testdata/Builtins.lc 109:3-109:7  {a} -> {b : 'Component a} -> a -> a -> 'VecS a (Succ (Succ Zero))
 testdata/Builtins.lc 108:7-110:33  Type
+testdata/Builtins.lc 108:7-110:33  Type->Type
+testdata/Builtins.lc 110:11-110:33  Type->Type
 testdata/Builtins.lc 110:11-110:33  Type
 testdata/Builtins.lc 110:11-110:12  Type
+testdata/Builtins.lc 110:16-110:33  Type->Type
 testdata/Builtins.lc 110:16-110:33  Type
 testdata/Builtins.lc 110:16-110:17  Type
+testdata/Builtins.lc 110:21-110:33  Type->Type
 testdata/Builtins.lc 110:21-110:33  Type
 testdata/Builtins.lc 110:21-110:22  Type
+testdata/Builtins.lc 110:26-110:33  Type->Type
 testdata/Builtins.lc 110:26-110:33  Type
 testdata/Builtins.lc 110:26-110:29  'Nat -> Type->Type
+testdata/Builtins.lc 110:30-110:31  'Nat
 testdata/Builtins.lc 110:32-110:33  Type
 testdata/Builtins.lc 116:20-164:12  {a} -> {b : 'Component a} -> a -> a -> a -> 'VecS a (Succ (Succ (Succ Zero)))
 testdata/Builtins.lc 116:20-164:12  {a : 'Component V0} -> V1 -> V2 -> V3 -> 'VecS V4 (Succ (Succ (Succ Zero)))
@@ -656,16 +767,23 @@ testdata/Builtins.lc 164:10-164:12  'VecS 'Bool (Succ (Succ (Succ (Succ Zero))))
 testdata/Builtins.lc 164:10-164:12  {a} -> a -> a -> a -> 'VecS a (Succ (Succ (Succ Zero)))
 testdata/Builtins.lc 110:3-110:7  {a} -> {b : 'Component a} -> a -> a -> a -> 'VecS a (Succ (Succ (Succ Zero)))
 testdata/Builtins.lc 108:7-111:38  Type
+testdata/Builtins.lc 108:7-111:38  Type->Type
+testdata/Builtins.lc 111:11-111:38  Type->Type
 testdata/Builtins.lc 111:11-111:38  Type
 testdata/Builtins.lc 111:11-111:12  Type
+testdata/Builtins.lc 111:16-111:38  Type->Type
 testdata/Builtins.lc 111:16-111:38  Type
 testdata/Builtins.lc 111:16-111:17  Type
+testdata/Builtins.lc 111:21-111:38  Type->Type
 testdata/Builtins.lc 111:21-111:38  Type
 testdata/Builtins.lc 111:21-111:22  Type
+testdata/Builtins.lc 111:26-111:38  Type->Type
 testdata/Builtins.lc 111:26-111:38  Type
 testdata/Builtins.lc 111:26-111:27  Type
+testdata/Builtins.lc 111:31-111:38  Type->Type
 testdata/Builtins.lc 111:31-111:38  Type
 testdata/Builtins.lc 111:31-111:34  'Nat -> Type->Type
+testdata/Builtins.lc 111:35-111:36  'Nat
 testdata/Builtins.lc 111:37-111:38  Type
 testdata/Builtins.lc 116:20-165:12  {a} -> {b : 'Component a} -> a -> a -> a -> a -> 'VecS a (Succ (Succ (Succ (Succ Zero))))
 testdata/Builtins.lc 116:20-165:12  {a : 'Component V0} -> V1 -> V2 -> V3 -> V4 -> 'VecS V5 (Succ (Succ (Succ (Succ Zero))))
@@ -721,6 +839,8 @@ testdata/Builtins.lc 165:10-165:12  'VecS 'Bool (Succ (Succ (Succ (Succ Zero))))
 testdata/Builtins.lc 165:10-165:12  {a} -> a -> a -> a -> a -> 'VecS a (Succ (Succ (Succ (Succ Zero))))
 testdata/Builtins.lc 111:3-111:7  {a} -> {b : 'Component a} -> a -> a -> a -> a -> 'VecS a (Succ (Succ (Succ (Succ Zero))))
 testdata/Builtins.lc 108:7-112:16  Type
+testdata/Builtins.lc 108:7-112:16  Type->Type
+testdata/Builtins.lc 112:15-112:16  Type->Type
 testdata/Builtins.lc 112:15-112:16  Type
 testdata/Builtins.lc 116:20-166:40  {a} -> {b : 'Component a}->a
 testdata/Builtins.lc 116:20-166:40  {a : 'Component V0}->V1
@@ -734,7 +854,6 @@ testdata/Builtins.lc 129:20-166:40  {a : 'Component V0}->V1
 testdata/Builtins.lc 133:14-133:23  {a:'Unit}->'Word
 testdata/Builtins.lc 133:19-133:23  Type
 testdata/Builtins.lc 133:14-133:15  'Word
-testdata/Builtins.lc 133:14-133:15  'Int
 testdata/Builtins.lc 136:20-166:40  {a : 'Component V0}->V1
 testdata/Builtins.lc 140:14-140:17  {a:'Unit}->'Float
 testdata/Builtins.lc 140:14-140:17  'Float
@@ -788,6 +907,8 @@ testdata/Builtins.lc 166:29-166:34  'Bool
 testdata/Builtins.lc 166:35-166:40  'Bool
 testdata/Builtins.lc 112:3-112:11  {a} -> {b : 'Component a}->a
 testdata/Builtins.lc 108:7-113:15  Type
+testdata/Builtins.lc 108:7-113:15  Type->Type
+testdata/Builtins.lc 113:14-113:15  Type->Type
 testdata/Builtins.lc 113:14-113:15  Type
 testdata/Builtins.lc 116:20-167:35  {a} -> {b : 'Component a}->a
 testdata/Builtins.lc 116:20-167:35  {a : 'Component V0}->V1
@@ -801,7 +922,6 @@ testdata/Builtins.lc 129:20-167:35  {a : 'Component V0}->V1
 testdata/Builtins.lc 134:13-134:22  {a:'Unit}->'Word
 testdata/Builtins.lc 134:18-134:22  Type
 testdata/Builtins.lc 134:13-134:14  'Word
-testdata/Builtins.lc 134:13-134:14  'Int
 testdata/Builtins.lc 136:20-167:35  {a : 'Component V0}->V1
 testdata/Builtins.lc 141:13-141:16  {a:'Unit}->'Float
 testdata/Builtins.lc 141:13-141:16  'Float
@@ -854,60 +974,16 @@ testdata/Builtins.lc 167:21-167:25  'Bool
 testdata/Builtins.lc 167:26-167:30  'Bool
 testdata/Builtins.lc 167:31-167:35  'Bool
 testdata/Builtins.lc 113:3-113:10  {a} -> {b : 'Component a}->a
-testdata/Builtins.lc 171:10-172:29  Type->Type
-testdata/Builtins.lc 171:10-172:29  Type
-testdata/Builtins.lc 171:10-171:18  Type
+testdata/Builtins.lc 171:25-172:29  Type->Type
+testdata/Builtins.lc 171:25-172:29  Type
 testdata/Builtins.lc 171:25-171:28  Type
-testdata/Builtins.lc 172:10-172:29  Type
-testdata/Builtins.lc 172:10-172:18  Type
 testdata/Builtins.lc 172:25-172:29  Type
 testdata/Builtins.lc 169:7-169:15  Type->Type
-testdata/Builtins.lc 176:10-188:18  Type->Type
-testdata/Builtins.lc 176:10-188:18  Type
-testdata/Builtins.lc 176:10-176:18  Type
+testdata/Builtins.lc 176:25-180:39  Type->Type
+testdata/Builtins.lc 176:25-180:39  Type
 testdata/Builtins.lc 176:25-176:30  Type
-testdata/Builtins.lc 177:10-188:18  Type
-testdata/Builtins.lc 177:10-179:18  Type -> 'Nat->Type
-testdata/Builtins.lc 177:10-179:18  'Nat->Type
-testdata/Builtins.lc 177:10-179:18  Type
-testdata/Builtins.lc 177:10-177:18  Type
-testdata/Builtins.lc 178:10-179:18  'Nat->Type
-testdata/Builtins.lc 178:10-179:18  Type
-testdata/Builtins.lc 178:10-178:18  Type
-testdata/Builtins.lc 179:10-179:18  'Nat->Type
-testdata/Builtins.lc 179:10-179:18  Type
+testdata/Builtins.lc 177:31-180:39  Type
 testdata/Builtins.lc 177:31-177:38  Type
-testdata/Builtins.lc 180:10-188:18  Type
-testdata/Builtins.lc 180:10-188:18  'Nat -> 'Nat -> Type->Type
-testdata/Builtins.lc 180:10-188:18  'Nat -> Type->Type
-testdata/Builtins.lc 180:10-188:18  Type->Type
-testdata/Builtins.lc 180:10-188:18  'Nat->Type
-testdata/Builtins.lc 180:10-182:18  Type
-testdata/Builtins.lc 180:10-182:18  'Nat->Type
-testdata/Builtins.lc 180:10-180:18  Type
-testdata/Builtins.lc 181:10-182:18  'Nat->Type
-testdata/Builtins.lc 181:10-182:18  Type
-testdata/Builtins.lc 181:10-181:18  Type
-testdata/Builtins.lc 182:10-182:18  'Nat->Type
-testdata/Builtins.lc 182:10-182:18  Type
-testdata/Builtins.lc 183:10-188:18  'Nat->Type
-testdata/Builtins.lc 183:10-188:18  Type
-testdata/Builtins.lc 183:10-185:18  Type
-testdata/Builtins.lc 183:10-185:18  'Nat->Type
-testdata/Builtins.lc 183:10-183:18  Type
-testdata/Builtins.lc 184:10-185:18  'Nat->Type
-testdata/Builtins.lc 184:10-185:18  Type
-testdata/Builtins.lc 184:10-184:18  Type
-testdata/Builtins.lc 185:10-185:18  'Nat->Type
-testdata/Builtins.lc 185:10-185:18  Type
-testdata/Builtins.lc 186:10-188:18  'Nat->Type
-testdata/Builtins.lc 186:10-188:18  Type
-testdata/Builtins.lc 186:10-186:18  Type
-testdata/Builtins.lc 187:10-188:18  'Nat->Type
-testdata/Builtins.lc 187:10-188:18  Type
-testdata/Builtins.lc 187:10-187:18  Type
-testdata/Builtins.lc 188:10-188:18  'Nat->Type
-testdata/Builtins.lc 188:10-188:18  Type
 testdata/Builtins.lc 180:30-180:39  Type
 testdata/Builtins.lc 174:7-174:15  Type->Type
 testdata/Builtins.lc 190:6-190:20  Type
@@ -926,14 +1002,18 @@ testdata/Builtins.lc 202:7-202:28  'BlendingFactor
 testdata/Builtins.lc 203:7-203:20  'BlendingFactor
 testdata/Builtins.lc 204:7-204:28  'BlendingFactor
 testdata/Builtins.lc 205:7-205:23  'BlendingFactor
+testdata/Builtins.lc 190:6-205:23  Type->Type
 testdata/Builtins.lc 190:6-205:23  Type
+testdata/Builtins.lc 190:6-190:20  Type->Type
 testdata/Builtins.lc 207:6-207:19  Type
 testdata/Builtins.lc 208:7-208:14  'BlendEquation
 testdata/Builtins.lc 209:7-209:19  'BlendEquation
 testdata/Builtins.lc 210:7-210:26  'BlendEquation
 testdata/Builtins.lc 211:7-211:10  'BlendEquation
 testdata/Builtins.lc 212:7-212:10  'BlendEquation
+testdata/Builtins.lc 207:6-212:10  Type->Type
 testdata/Builtins.lc 207:6-212:10  Type
+testdata/Builtins.lc 207:6-207:19  Type->Type
 testdata/Builtins.lc 214:6-214:20  Type
 testdata/Builtins.lc 215:7-215:12  'LogicOperation
 testdata/Builtins.lc 216:7-216:10  'LogicOperation
@@ -951,7 +1031,9 @@ testdata/Builtins.lc 227:7-227:19  'LogicOperation
 testdata/Builtins.lc 228:7-228:17  'LogicOperation
 testdata/Builtins.lc 229:7-229:11  'LogicOperation
 testdata/Builtins.lc 230:7-230:10  'LogicOperation
+testdata/Builtins.lc 214:6-230:10  Type->Type
 testdata/Builtins.lc 214:6-230:10  Type
+testdata/Builtins.lc 214:6-214:20  Type->Type
 testdata/Builtins.lc 232:6-232:22  Type
 testdata/Builtins.lc 233:7-233:13  'StencilOperation
 testdata/Builtins.lc 234:7-234:13  'StencilOperation
@@ -961,7 +1043,9 @@ testdata/Builtins.lc 237:7-237:17  'StencilOperation
 testdata/Builtins.lc 238:7-238:13  'StencilOperation
 testdata/Builtins.lc 239:7-239:17  'StencilOperation
 testdata/Builtins.lc 240:7-240:15  'StencilOperation
+testdata/Builtins.lc 232:6-240:15  Type->Type
 testdata/Builtins.lc 232:6-240:15  Type
+testdata/Builtins.lc 232:6-232:22  Type->Type
 testdata/Builtins.lc 242:6-242:24  Type
 testdata/Builtins.lc 243:7-243:12  'ComparisonFunction
 testdata/Builtins.lc 244:7-244:11  'ComparisonFunction
@@ -971,47 +1055,66 @@ testdata/Builtins.lc 247:7-247:14  'ComparisonFunction
 testdata/Builtins.lc 248:7-248:15  'ComparisonFunction
 testdata/Builtins.lc 249:7-249:13  'ComparisonFunction
 testdata/Builtins.lc 250:7-250:13  'ComparisonFunction
+testdata/Builtins.lc 242:6-250:13  Type->Type
 testdata/Builtins.lc 242:6-250:13  Type
+testdata/Builtins.lc 242:6-242:24  Type->Type
 testdata/Builtins.lc 252:6-252:21  Type
 testdata/Builtins.lc 253:7-253:17  'ProvokingVertex
 testdata/Builtins.lc 254:7-254:18  'ProvokingVertex
+testdata/Builtins.lc 252:6-254:18  Type->Type
 testdata/Builtins.lc 252:6-254:18  Type
+testdata/Builtins.lc 252:6-252:21  Type->Type
 testdata/Builtins.lc 256:6-256:14  Type
 testdata/Builtins.lc 257:7-257:16  'CullMode
 testdata/Builtins.lc 258:7-258:15  'CullMode
 testdata/Builtins.lc 259:7-259:15  'CullMode
+testdata/Builtins.lc 256:6-259:15  Type->Type
 testdata/Builtins.lc 256:6-259:15  Type
+testdata/Builtins.lc 256:6-256:14  Type->Type
 testdata/Builtins.lc 261:6-261:15  Type
 testdata/Builtins.lc 262:17-262:22  Type
+testdata/Builtins.lc 261:6-261:15  Type->Type
 testdata/Builtins.lc 262:7-262:16  'Float->'PointSize
 testdata/Builtins.lc 263:7-263:23  'PointSize
+testdata/Builtins.lc 261:6-263:23  Type->Type
 testdata/Builtins.lc 261:6-263:23  Type
+testdata/Builtins.lc 262:7-262:16  Type->Type
 testdata/Builtins.lc 262:7-262:16  Type
 testdata/Builtins.lc 262:7-262:16  'PointSize
 testdata/Builtins.lc 265:6-265:17  Type
 testdata/Builtins.lc 266:7-266:18  'PolygonMode
 testdata/Builtins.lc 267:20-267:29  Type
+testdata/Builtins.lc 265:6-265:17  Type->Type
 testdata/Builtins.lc 267:7-267:19  'PointSize->'PolygonMode
 testdata/Builtins.lc 268:19-268:24  Type
 testdata/Builtins.lc 268:7-268:18  'Float->'PolygonMode
+testdata/Builtins.lc 265:6-268:18  Type->Type
 testdata/Builtins.lc 265:6-268:18  Type
+testdata/Builtins.lc 267:7-267:19  Type->Type
 testdata/Builtins.lc 267:7-267:19  Type
 testdata/Builtins.lc 267:7-267:19  'PolygonMode
+testdata/Builtins.lc 268:7-268:18  Type->Type
 testdata/Builtins.lc 268:7-268:18  Type
 testdata/Builtins.lc 268:7-268:18  'PolygonMode
 testdata/Builtins.lc 270:6-270:19  Type
 testdata/Builtins.lc 271:7-271:15  'PolygonOffset
 testdata/Builtins.lc 272:14-272:19  Type
+testdata/Builtins.lc 270:6-272:25  Type->Type
 testdata/Builtins.lc 270:6-272:25  Type
 testdata/Builtins.lc 272:20-272:25  Type
+testdata/Builtins.lc 270:6-270:19  Type->Type
 testdata/Builtins.lc 272:7-272:13  'Float -> 'Float->'PolygonOffset
+testdata/Builtins.lc 270:6-272:13  Type->Type
 testdata/Builtins.lc 270:6-272:13  Type
+testdata/Builtins.lc 272:7-272:13  Type->Type
 testdata/Builtins.lc 272:7-272:13  Type
 testdata/Builtins.lc 272:7-272:13  'PolygonOffset
 testdata/Builtins.lc 274:6-274:28  Type
 testdata/Builtins.lc 275:7-275:16  'PointSpriteCoordOrigin
 testdata/Builtins.lc 276:7-276:16  'PointSpriteCoordOrigin
+testdata/Builtins.lc 274:6-276:16  Type->Type
 testdata/Builtins.lc 274:6-276:16  Type
+testdata/Builtins.lc 274:6-274:28  Type->Type
 testdata/Builtins.lc 279:6-279:11  Type->Type
 testdata/Builtins.lc 279:6-279:11  Type
 testdata/Builtins.lc 280:6-280:13  Type->Type
@@ -1024,79 +1127,110 @@ testdata/Builtins.lc 285:7-285:11  'PrimitiveType
 testdata/Builtins.lc 286:7-286:12  'PrimitiveType
 testdata/Builtins.lc 287:7-287:24  'PrimitiveType
 testdata/Builtins.lc 288:7-288:20  'PrimitiveType
+testdata/Builtins.lc 283:6-288:20  Type->Type
 testdata/Builtins.lc 283:6-288:20  Type
+testdata/Builtins.lc 283:6-283:19  Type->Type
 testdata/Builtins.lc 291:16-291:18  Type
+testdata/Builtins.lc 291:22-291:48  Type->Type
 testdata/Builtins.lc 291:22-291:48  Type
 testdata/Builtins.lc 291:22-291:25  'Nat -> Type->Type
+testdata/Builtins.lc 291:26-291:27  'Nat
 testdata/Builtins.lc 291:28-291:33  Type
+testdata/Builtins.lc 291:37-291:48  Type->Type
 testdata/Builtins.lc 291:37-291:48  Type
 testdata/Builtins.lc 291:37-291:40  'Nat -> Type->Type
+testdata/Builtins.lc 291:41-291:42  'Nat
 testdata/Builtins.lc 291:43-291:48  Type
 testdata/Builtins.lc 291:1-291:12  'Tuple0 -> 'VecS 'Float (Succ (Succ Zero)) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
+testdata/Builtins.lc 294:14-294:25  Type->Type
 testdata/Builtins.lc 294:14-294:25  Type
 testdata/Builtins.lc 294:14-294:20  Type
+testdata/Builtins.lc 294:24-294:25  Type->Type
 testdata/Builtins.lc 294:24-294:25  Type
 testdata/Builtins.lc 294:24-294:25  V2
 testdata/Builtins.lc 294:1-294:8  {a} -> 'String->a
+testdata/Builtins.lc 295:14-295:25  Type->Type
 testdata/Builtins.lc 295:14-295:25  Type
 testdata/Builtins.lc 295:14-295:20  Type
+testdata/Builtins.lc 295:24-295:25  Type->Type
 testdata/Builtins.lc 295:24-295:25  Type
 testdata/Builtins.lc 295:24-295:25  V2
 testdata/Builtins.lc 295:1-295:10  {a} -> 'String->a
 testdata/Builtins.lc 297:23-297:36  Type
+testdata/Builtins.lc 297:40-297:44  Type->Type
 testdata/Builtins.lc 297:40-297:44  Type
 testdata/Builtins.lc 297:6-297:19  'PrimitiveType->Type
 testdata/Builtins.lc 298:26-298:34  Type
+testdata/Builtins.lc 298:38-298:111  Type->Type
 testdata/Builtins.lc 298:38-298:111  Type
 testdata/Builtins.lc 298:38-298:49  Type
+testdata/Builtins.lc 298:53-298:111  Type->Type
 testdata/Builtins.lc 298:53-298:111  Type
 testdata/Builtins.lc 298:53-298:66  Type
+testdata/Builtins.lc 298:70-298:111  Type->Type
 testdata/Builtins.lc 298:70-298:111  Type
 testdata/Builtins.lc 298:70-298:85  Type
+testdata/Builtins.lc 298:89-298:111  Type->Type
 testdata/Builtins.lc 298:89-298:111  Type
 testdata/Builtins.lc 298:89-298:102  'PrimitiveType->Type
 testdata/Builtins.lc 298:103-298:111  'PrimitiveType
 testdata/Builtins.lc 298:3-298:14  'CullMode -> 'PolygonMode -> 'PolygonOffset -> 'ProvokingVertex -> 'RasterContext Triangle
 testdata/Builtins.lc 299:26-299:35  Type
+testdata/Builtins.lc 299:39-299:108  Type->Type
 testdata/Builtins.lc 299:39-299:108  Type
 testdata/Builtins.lc 299:39-299:44  Type
+testdata/Builtins.lc 299:48-299:108  Type->Type
 testdata/Builtins.lc 299:48-299:108  Type
 testdata/Builtins.lc 299:48-299:70  Type
+testdata/Builtins.lc 299:89-299:108  Type->Type
 testdata/Builtins.lc 299:89-299:108  Type
 testdata/Builtins.lc 299:89-299:102  'PrimitiveType->Type
 testdata/Builtins.lc 299:103-299:108  'PrimitiveType
 testdata/Builtins.lc 299:3-299:11  'PointSize -> 'Float -> 'PointSpriteCoordOrigin -> 'RasterContext Point
 testdata/Builtins.lc 300:26-300:31  Type
+testdata/Builtins.lc 300:35-300:107  Type->Type
 testdata/Builtins.lc 300:35-300:107  Type
 testdata/Builtins.lc 300:35-300:50  Type
+testdata/Builtins.lc 300:89-300:107  Type->Type
 testdata/Builtins.lc 300:89-300:107  Type
 testdata/Builtins.lc 300:89-300:102  'PrimitiveType->Type
 testdata/Builtins.lc 300:103-300:107  'PrimitiveType
 testdata/Builtins.lc 300:3-300:10  'Float -> 'ProvokingVertex -> 'RasterContext Line
+testdata/Builtins.lc 297:6-297:19  Type->Type
 testdata/Builtins.lc 297:6-297:19  Type
+testdata/Builtins.lc 297:6-300:107  Type->Type
 testdata/Builtins.lc 297:6-300:107  Type
+testdata/Builtins.lc 298:3-298:111  Type->Type
 testdata/Builtins.lc 298:3-298:111  Type
 testdata/Builtins.lc 298:3-298:14  'RasterContext Triangle
+testdata/Builtins.lc 299:3-299:108  Type->Type
 testdata/Builtins.lc 299:3-299:108  Type
 testdata/Builtins.lc 299:3-299:11  'RasterContext Point
+testdata/Builtins.lc 300:3-300:107  Type->Type
 testdata/Builtins.lc 300:3-300:107  Type
 testdata/Builtins.lc 300:3-300:10  'RasterContext Line
 testdata/Builtins.lc 302:6-302:18  Type->Type
-testdata/Builtins.lc 304:27-304:56  Type
+testdata/Builtins.lc 304:26-304:56  Type->Type
+testdata/Builtins.lc 304:26-304:56  Type
 testdata/Builtins.lc 304:27-304:35  Type->Type
 testdata/Builtins.lc 304:36-304:37  Type
+testdata/Builtins.lc 304:42-304:56  Type->Type
 testdata/Builtins.lc 304:42-304:56  Type
 testdata/Builtins.lc 304:42-304:54  Type->Type
 testdata/Builtins.lc 304:55-304:56  Type
 testdata/Builtins.lc 303:3-303:9  {a} -> {b : 'Floating a} -> 'Interpolated a
 testdata/Builtins.lc 303:11-303:24  {a} -> {b : 'Floating a} -> 'Interpolated a
+testdata/Builtins.lc 305:42-305:56  Type->Type
 testdata/Builtins.lc 305:42-305:56  Type
 testdata/Builtins.lc 305:42-305:54  Type->Type
 testdata/Builtins.lc 305:55-305:56  Type
 testdata/Builtins.lc 305:3-305:7  {a} -> 'Interpolated a
+testdata/Builtins.lc 302:6-305:7  Type->Type
 testdata/Builtins.lc 302:6-305:7  Type
+testdata/Builtins.lc 303:3-303:9  Type->Type
 testdata/Builtins.lc 303:3-303:9  Type
 testdata/Builtins.lc 303:3-303:9  'Interpolated V2
+testdata/Builtins.lc 303:11-303:24  Type->Type
 testdata/Builtins.lc 303:11-303:24  Type
 testdata/Builtins.lc 303:11-303:24  'Interpolated V3
 testdata/Builtins.lc 305:3-305:7  'Interpolated V3
@@ -1139,58 +1273,72 @@ testdata/Builtins.lc 316:80-316:81  Type
 testdata/Builtins.lc 316:23-316:69  Type
 testdata/Builtins.lc 313:5-313:21  Type->Type
 testdata/Builtins.lc 318:18-318:22  Type
+testdata/Builtins.lc 318:26-318:30  Type->Type
 testdata/Builtins.lc 318:26-318:30  Type
 testdata/Builtins.lc 318:6-318:14  Type->Type
+testdata/Builtins.lc 319:60-319:70  Type->Type
 testdata/Builtins.lc 319:60-319:70  Type
 testdata/Builtins.lc 319:60-319:68  Type->Type
 testdata/Builtins.lc 319:69-319:70  Type
 testdata/Builtins.lc 319:69-319:70  V1
 testdata/Builtins.lc 319:3-319:13  {a} -> 'Blending a
-testdata/Builtins.lc 320:27-320:70  Type
+testdata/Builtins.lc 320:26-320:70  Type->Type
+testdata/Builtins.lc 320:26-320:70  Type
 testdata/Builtins.lc 320:27-320:35  Type->Type
 testdata/Builtins.lc 320:36-320:37  Type
 testdata/Builtins.lc 320:36-320:37  V1
+testdata/Builtins.lc 320:42-320:70  Type->Type
 testdata/Builtins.lc 320:42-320:70  Type
 testdata/Builtins.lc 320:42-320:56  Type
+testdata/Builtins.lc 320:60-320:70  Type->Type
 testdata/Builtins.lc 320:60-320:70  Type
 testdata/Builtins.lc 320:60-320:68  Type->Type
 testdata/Builtins.lc 320:69-320:70  Type
 testdata/Builtins.lc 320:3-320:15  {a} -> {b : 'Integral a} -> 'LogicOperation -> 'Blending a
-testdata/Builtins.lc 321:26-321:56  Type -> Type->Type
 testdata/Builtins.lc 321:27-321:40  Type
 testdata/Builtins.lc 321:42-321:55  Type
+testdata/Builtins.lc 322:29-323:74  Type->Type
 testdata/Builtins.lc 322:29-323:74  Type
-testdata/Builtins.lc 322:29-322:97  Type -> Type->Type
 testdata/Builtins.lc 322:30-322:62  Type
-testdata/Builtins.lc 322:30-322:62  Type -> Type->Type
 testdata/Builtins.lc 322:31-322:45  Type
 testdata/Builtins.lc 322:47-322:61  Type
 testdata/Builtins.lc 322:64-322:96  Type
-testdata/Builtins.lc 322:64-322:96  Type -> Type->Type
 testdata/Builtins.lc 322:65-322:79  Type
 testdata/Builtins.lc 322:81-322:95  Type
+testdata/Builtins.lc 323:29-323:74  Type->Type
 testdata/Builtins.lc 323:29-323:74  Type
 testdata/Builtins.lc 323:29-323:32  'Nat -> Type->Type
+testdata/Builtins.lc 323:33-323:34  'Nat
 testdata/Builtins.lc 323:35-323:40  Type
+testdata/Builtins.lc 323:60-323:74  Type->Type
 testdata/Builtins.lc 323:60-323:74  Type
 testdata/Builtins.lc 323:60-323:68  Type->Type
 testdata/Builtins.lc 323:69-323:74  Type
 testdata/Builtins.lc 321:3-321:8  'Tuple2 'BlendEquation 'BlendEquation -> 'Tuple2 ('Tuple2 'BlendingFactor 'BlendingFactor) ('Tuple2 'BlendingFactor 'BlendingFactor) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'Blending 'Float
 testdata/Builtins.lc 318:6-318:14  Type
+testdata/Builtins.lc 318:6-323:74  Type->Type
 testdata/Builtins.lc 318:6-323:74  Type
+testdata/Builtins.lc 319:3-319:70  Type->Type
 testdata/Builtins.lc 319:3-319:70  Type
 testdata/Builtins.lc 319:3-319:13  'Blending V0
+testdata/Builtins.lc 320:3-320:70  Type->Type
 testdata/Builtins.lc 320:3-320:70  Type
 testdata/Builtins.lc 320:3-320:15  'Blending V2
+testdata/Builtins.lc 321:3-323:74  Type->Type
 testdata/Builtins.lc 321:3-323:74  Type
 testdata/Builtins.lc 321:3-321:8  'Blending 'Float
 testdata/Builtins.lc 330:6-330:18  Type
+testdata/Builtins.lc 330:6-330:18  Type->Type
 testdata/Builtins.lc 331:6-331:16  Type
+testdata/Builtins.lc 331:6-331:16  Type->Type
 testdata/Builtins.lc 332:6-332:11  Type
+testdata/Builtins.lc 332:6-332:11  Type->Type
 testdata/Builtins.lc 334:27-334:31  Type
+testdata/Builtins.lc 334:35-334:39  Type->Type
 testdata/Builtins.lc 334:35-334:39  Type
 testdata/Builtins.lc 334:6-334:23  Type->Type
-testdata/Builtins.lc 335:27-336:101  Type
+testdata/Builtins.lc 335:26-336:102  Type->Type
+testdata/Builtins.lc 335:26-336:102  Type
 testdata/Builtins.lc 335:27-335:31  Type
 testdata/Builtins.lc 335:27-335:31  V7
 testdata/Builtins.lc 335:34-335:50  Type
@@ -1198,7 +1346,8 @@ testdata/Builtins.lc 335:34-335:43  'Nat -> Type->Type
 testdata/Builtins.lc 335:44-335:45  'Nat
 testdata/Builtins.lc 335:44-335:45  V5
 testdata/Builtins.lc 335:46-335:50  Type
-testdata/Builtins.lc 335:52-336:101  Type
+testdata/Builtins.lc 335:52-336:102  Type->Type
+testdata/Builtins.lc 335:52-336:102  Type
 testdata/Builtins.lc 335:52-335:57  Type
 testdata/Builtins.lc 335:52-335:57  V4
 testdata/Builtins.lc 335:60-335:73  Type
@@ -1206,47 +1355,60 @@ testdata/Builtins.lc 335:60-335:69  'Nat -> Type->Type
 testdata/Builtins.lc 335:70-335:71  'Nat
 testdata/Builtins.lc 335:72-335:73  Type
 testdata/Builtins.lc 335:72-335:73  V2
-testdata/Builtins.lc 335:75-336:101  Type
+testdata/Builtins.lc 335:75-336:102  Type->Type
+testdata/Builtins.lc 335:75-336:102  Type
 testdata/Builtins.lc 335:75-335:78  Type->Type
 testdata/Builtins.lc 335:79-335:80  Type
-testdata/Builtins.lc 335:85-336:101  Type
+testdata/Builtins.lc 335:85-336:102  Type->Type
+testdata/Builtins.lc 335:85-336:102  Type
 testdata/Builtins.lc 335:85-335:93  Type->Type
 testdata/Builtins.lc 335:94-335:95  Type
-testdata/Builtins.lc 335:99-336:101  Type
+testdata/Builtins.lc 335:99-336:102  Type->Type
+testdata/Builtins.lc 335:99-336:102  Type
 testdata/Builtins.lc 335:99-335:103  Type
-testdata/Builtins.lc 336:71-336:101  Type
+testdata/Builtins.lc 336:71-336:102  Type->Type
+testdata/Builtins.lc 336:71-336:102  Type
 testdata/Builtins.lc 336:71-336:88  Type->Type
-testdata/Builtins.lc 336:90-336:101  Type
+testdata/Builtins.lc 336:89-336:102  Type
 testdata/Builtins.lc 336:90-336:95  Type->Type
 testdata/Builtins.lc 336:96-336:101  Type
 testdata/Builtins.lc 335:3-335:10  {a} -> {b:'Nat} -> {c} -> {d} -> {e : a ~ 'VecScalar b 'Bool} -> {f : c ~ 'VecScalar b d} -> {g : 'Num d} -> 'Blending d -> a -> 'FragmentOperation ('Color c)
 testdata/Builtins.lc 337:26-337:44  Type
-testdata/Builtins.lc 337:48-337:101  Type
+testdata/Builtins.lc 337:48-337:102  Type->Type
+testdata/Builtins.lc 337:48-337:102  Type
 testdata/Builtins.lc 337:48-337:52  Type
-testdata/Builtins.lc 337:71-337:101  Type
+testdata/Builtins.lc 337:71-337:102  Type->Type
+testdata/Builtins.lc 337:71-337:102  Type
 testdata/Builtins.lc 337:71-337:88  Type->Type
-testdata/Builtins.lc 337:90-337:101  Type
+testdata/Builtins.lc 337:89-337:102  Type
 testdata/Builtins.lc 337:90-337:95  Type->Type
 testdata/Builtins.lc 337:96-337:101  Type
 testdata/Builtins.lc 337:3-337:10  'ComparisonFunction -> 'Bool -> 'FragmentOperation ('Depth 'Float)
 testdata/Builtins.lc 338:26-338:38  Type
-testdata/Builtins.lc 338:42-338:103  Type
+testdata/Builtins.lc 338:42-338:104  Type->Type
+testdata/Builtins.lc 338:42-338:104  Type
 testdata/Builtins.lc 338:42-338:52  Type
-testdata/Builtins.lc 338:56-338:103  Type
+testdata/Builtins.lc 338:56-338:104  Type->Type
+testdata/Builtins.lc 338:56-338:104  Type
 testdata/Builtins.lc 338:56-338:66  Type
-testdata/Builtins.lc 338:71-338:103  Type
+testdata/Builtins.lc 338:71-338:104  Type->Type
+testdata/Builtins.lc 338:71-338:104  Type
 testdata/Builtins.lc 338:71-338:88  Type->Type
-testdata/Builtins.lc 338:90-338:103  Type
+testdata/Builtins.lc 338:89-338:104  Type
 testdata/Builtins.lc 338:90-338:97  Type->Type
 testdata/Builtins.lc 338:98-338:103  Type
 testdata/Builtins.lc 338:3-338:12  'StencilTests -> 'StencilOps -> 'StencilOps -> 'FragmentOperation ('Stencil 'Int32)
 testdata/Builtins.lc 334:6-334:23  Type
-testdata/Builtins.lc 334:6-338:103  Type
-testdata/Builtins.lc 335:3-336:101  Type
+testdata/Builtins.lc 334:6-338:104  Type->Type
+testdata/Builtins.lc 334:6-338:104  Type
+testdata/Builtins.lc 335:3-336:102  Type->Type
+testdata/Builtins.lc 335:3-336:102  Type
 testdata/Builtins.lc 335:3-335:10  'FragmentOperation ('Color V6)
-testdata/Builtins.lc 337:3-337:101  Type
+testdata/Builtins.lc 337:3-337:102  Type->Type
+testdata/Builtins.lc 337:3-337:102  Type
 testdata/Builtins.lc 337:3-337:10  'FragmentOperation ('Depth 'Float)
-testdata/Builtins.lc 338:3-338:103  Type
+testdata/Builtins.lc 338:3-338:104  Type->Type
+testdata/Builtins.lc 338:3-338:104  Type
 testdata/Builtins.lc 338:3-338:12  'FragmentOperation ('Stencil 'Int32)
 testdata/Builtins.lc 341:32-345:146  Type->Type
 testdata/Builtins.lc 341:32-345:146  Type
@@ -1294,8 +1456,8 @@ testdata/Builtins.lc 345:139-345:141  Type
 testdata/Builtins.lc 345:143-345:145  Type
 testdata/Builtins.lc 345:14-345:122  Type
 testdata/Builtins.lc 341:5-341:12  Type->Type
-testdata/Builtins.lc 348:15-352:38  Type->Type
-testdata/Builtins.lc 348:15-352:38  Type
+testdata/Builtins.lc 348:15-352:39  Type->Type
+testdata/Builtins.lc 348:15-352:39  Type
 testdata/Builtins.lc 348:25-348:69  Type -> Type->Type
 testdata/Builtins.lc 348:25-348:69  Type->Type
 testdata/Builtins.lc 348:25-348:69  Type
@@ -1306,7 +1468,7 @@ testdata/Builtins.lc 348:48-348:68  Type
 testdata/Builtins.lc 348:48-348:65  Type->Type
 testdata/Builtins.lc 348:66-348:68  Type
 testdata/Builtins.lc 348:15-348:21  Type
-testdata/Builtins.lc 349:15-352:38  Type
+testdata/Builtins.lc 349:15-352:39  Type
 testdata/Builtins.lc 349:29-349:95  Type -> Type -> Type->Type
 testdata/Builtins.lc 349:29-349:95  Type -> Type->Type
 testdata/Builtins.lc 349:29-349:95  Type->Type
@@ -1321,7 +1483,7 @@ testdata/Builtins.lc 349:74-349:94  Type
 testdata/Builtins.lc 349:74-349:91  Type->Type
 testdata/Builtins.lc 349:92-349:94  Type
 testdata/Builtins.lc 349:15-349:25  Type
-testdata/Builtins.lc 350:15-352:38  Type
+testdata/Builtins.lc 350:15-352:39  Type
 testdata/Builtins.lc 350:34-350:122  Type -> Type -> Type -> Type->Type
 testdata/Builtins.lc 350:34-350:122  Type -> Type -> Type->Type
 testdata/Builtins.lc 350:34-350:122  Type -> Type->Type
@@ -1340,7 +1502,7 @@ testdata/Builtins.lc 350:101-350:121  Type
 testdata/Builtins.lc 350:101-350:118  Type->Type
 testdata/Builtins.lc 350:119-350:121  Type
 testdata/Builtins.lc 350:15-350:29  Type
-testdata/Builtins.lc 351:15-352:38  Type
+testdata/Builtins.lc 351:15-352:39  Type
 testdata/Builtins.lc 351:38-351:148  Type -> Type -> Type -> Type -> Type->Type
 testdata/Builtins.lc 351:38-351:148  Type -> Type -> Type -> Type->Type
 testdata/Builtins.lc 351:38-351:148  Type -> Type -> Type->Type
@@ -1363,123 +1525,152 @@ testdata/Builtins.lc 351:127-351:147  Type
 testdata/Builtins.lc 351:127-351:144  Type->Type
 testdata/Builtins.lc 351:145-351:147  Type
 testdata/Builtins.lc 351:15-351:33  Type
-testdata/Builtins.lc 352:19-352:38  Type
+testdata/Builtins.lc 352:18-352:39  Type
 testdata/Builtins.lc 352:19-352:36  Type->Type
 testdata/Builtins.lc 352:37-352:38  Type
 testdata/Builtins.lc 348:5-348:13  Type->Type
 testdata/Builtins.lc 354:6-354:12  Type->Type
 testdata/Builtins.lc 354:6-354:12  Type
-testdata/Builtins.lc 356:15-356:46  Type
+testdata/Builtins.lc 356:14-356:46  Type->Type
+testdata/Builtins.lc 356:14-356:46  Type
 testdata/Builtins.lc 356:15-356:16  V3
+testdata/Builtins.lc 356:20-356:21  Type->Type
 testdata/Builtins.lc 356:20-356:21  Type
 testdata/Builtins.lc 356:20-356:21  V2
+testdata/Builtins.lc 356:26-356:46  Type->Type
 testdata/Builtins.lc 356:26-356:46  Type
 testdata/Builtins.lc 356:26-356:32  Type->Type
 testdata/Builtins.lc 356:33-356:34  Type
+testdata/Builtins.lc 356:38-356:46  Type->Type
 testdata/Builtins.lc 356:38-356:46  Type
 testdata/Builtins.lc 356:38-356:44  Type->Type
 testdata/Builtins.lc 356:45-356:46  Type
 testdata/Builtins.lc 356:1-356:10  {a} -> {b} -> a->b -> 'Stream a -> 'Stream b
-testdata/Builtins.lc 357:21-357:59  Type
+testdata/Builtins.lc 357:20-357:59  Type->Type
+testdata/Builtins.lc 357:20-357:59  Type
 testdata/Builtins.lc 357:21-357:22  V3
+testdata/Builtins.lc 357:26-357:34  Type->Type
 testdata/Builtins.lc 357:26-357:34  Type
 testdata/Builtins.lc 357:26-357:32  Type->Type
 testdata/Builtins.lc 357:33-357:34  Type
 testdata/Builtins.lc 357:33-357:34  V2
+testdata/Builtins.lc 357:39-357:59  Type->Type
 testdata/Builtins.lc 357:39-357:59  Type
 testdata/Builtins.lc 357:39-357:45  Type->Type
 testdata/Builtins.lc 357:46-357:47  Type
+testdata/Builtins.lc 357:51-357:59  Type->Type
 testdata/Builtins.lc 357:51-357:59  Type
 testdata/Builtins.lc 357:51-357:57  Type->Type
 testdata/Builtins.lc 357:58-357:59  Type
 testdata/Builtins.lc 357:1-357:16  {a} -> {b} -> (a -> 'Stream b) -> 'Stream a -> 'Stream b
-testdata/Builtins.lc 358:18-358:52  Type
+testdata/Builtins.lc 358:17-358:52  Type->Type
+testdata/Builtins.lc 358:17-358:52  Type
 testdata/Builtins.lc 358:18-358:19  V1
+testdata/Builtins.lc 358:23-358:27  Type->Type
 testdata/Builtins.lc 358:23-358:27  Type
+testdata/Builtins.lc 358:32-358:52  Type->Type
 testdata/Builtins.lc 358:32-358:52  Type
 testdata/Builtins.lc 358:32-358:38  Type->Type
 testdata/Builtins.lc 358:39-358:40  Type
+testdata/Builtins.lc 358:44-358:52  Type->Type
 testdata/Builtins.lc 358:44-358:52  Type
 testdata/Builtins.lc 358:44-358:50  Type->Type
 testdata/Builtins.lc 358:51-358:52  Type
 testdata/Builtins.lc 358:1-358:13  {a} -> a->'Bool -> 'Stream a -> 'Stream a
 testdata/Builtins.lc 360:22-360:35  Type
 testdata/Builtins.lc 360:6-360:15  'PrimitiveType -> Type->Type
+testdata/Builtins.lc 360:6-360:15  Type->Type
 testdata/Builtins.lc 360:6-360:15  Type
 testdata/Builtins.lc 362:28-362:34  Type->Type
-testdata/Builtins.lc 362:36-362:49  Type
+testdata/Builtins.lc 362:35-362:50  Type
 testdata/Builtins.lc 362:36-362:45  'PrimitiveType -> Type->Type
 testdata/Builtins.lc 362:46-362:47  'PrimitiveType
 testdata/Builtins.lc 362:46-362:47  V3
 testdata/Builtins.lc 362:48-362:49  Type
 testdata/Builtins.lc 362:48-362:49  V1
 testdata/Builtins.lc 362:6-362:21  'PrimitiveType -> Type->Type
-testdata/Builtins.lc 364:18-364:59  Type
+testdata/Builtins.lc 364:17-364:59  Type->Type
+testdata/Builtins.lc 364:17-364:59  Type
 testdata/Builtins.lc 364:18-364:19  V5
+testdata/Builtins.lc 364:23-364:24  Type->Type
 testdata/Builtins.lc 364:23-364:24  Type
 testdata/Builtins.lc 364:23-364:24  V4
+testdata/Builtins.lc 364:29-364:59  Type->Type
 testdata/Builtins.lc 364:29-364:59  Type
 testdata/Builtins.lc 364:29-364:38  'PrimitiveType -> Type->Type
 testdata/Builtins.lc 364:39-364:40  'PrimitiveType
 testdata/Builtins.lc 364:39-364:40  V2
 testdata/Builtins.lc 364:41-364:42  Type
+testdata/Builtins.lc 364:46-364:59  Type->Type
 testdata/Builtins.lc 364:46-364:59  Type
 testdata/Builtins.lc 364:46-364:55  'PrimitiveType -> Type->Type
 testdata/Builtins.lc 364:56-364:57  'PrimitiveType
 testdata/Builtins.lc 364:58-364:59  Type
 testdata/Builtins.lc 364:1-364:13  {a} -> {b} -> {c:'PrimitiveType} -> a->b -> 'Primitive c a -> 'Primitive c b
-testdata/Builtins.lc 366:39-366:94  Type
+testdata/Builtins.lc 366:38-366:94  Type->Type
+testdata/Builtins.lc 366:38-366:94  Type
 testdata/Builtins.lc 366:39-366:53  Type->Type
 testdata/Builtins.lc 366:54-366:55  Type
 testdata/Builtins.lc 366:54-366:55  V1
+testdata/Builtins.lc 366:60-366:94  Type->Type
 testdata/Builtins.lc 366:60-366:94  Type
 testdata/Builtins.lc 366:60-366:66  Type
+testdata/Builtins.lc 366:70-366:94  Type->Type
 testdata/Builtins.lc 366:70-366:94  Type
 testdata/Builtins.lc 366:70-366:71  Type
+testdata/Builtins.lc 366:75-366:94  Type->Type
 testdata/Builtins.lc 366:75-366:94  Type
 testdata/Builtins.lc 366:75-366:90  'PrimitiveType -> Type->Type
 testdata/Builtins.lc 366:91-366:92  'PrimitiveType
 testdata/Builtins.lc 366:91-366:92  V5
 testdata/Builtins.lc 366:93-366:94  Type
 testdata/Builtins.lc 366:1-366:7  {a:'PrimitiveType} -> {b} -> {c:'Unit} -> 'String -> b -> 'Stream ('Primitive a b)
-testdata/Builtins.lc 367:42-367:104  Type
+testdata/Builtins.lc 367:41-367:104  Type->Type
+testdata/Builtins.lc 367:41-367:104  Type
 testdata/Builtins.lc 367:42-367:56  Type->Type
 testdata/Builtins.lc 367:57-367:58  Type
 testdata/Builtins.lc 367:57-367:58  V3
+testdata/Builtins.lc 367:60-367:104  Type->Type
 testdata/Builtins.lc 367:60-367:104  Type
 testdata/Builtins.lc 367:60-367:61  Type
 testdata/Builtins.lc 367:64-367:74  Type
 testdata/Builtins.lc 367:64-367:71  Type->Type
 testdata/Builtins.lc 367:72-367:74  Type
 testdata/Builtins.lc 367:72-367:74  V2
+testdata/Builtins.lc 367:79-367:104  Type->Type
 testdata/Builtins.lc 367:79-367:104  Type
 testdata/Builtins.lc 367:79-367:81  Type
+testdata/Builtins.lc 367:85-367:104  Type->Type
 testdata/Builtins.lc 367:85-367:104  Type
 testdata/Builtins.lc 367:85-367:100  'PrimitiveType -> Type->Type
 testdata/Builtins.lc 367:101-367:102  'PrimitiveType
 testdata/Builtins.lc 367:101-367:102  V6
 testdata/Builtins.lc 367:103-367:104  Type
 testdata/Builtins.lc 367:1-367:13  {a:'PrimitiveType} -> {b} -> {c} -> {d:'Unit} -> {e : b ~ 'FTRepr' c} -> c -> 'Stream ('Primitive a b)
-testdata/Builtins.lc 369:19-369:74  Type
+testdata/Builtins.lc 369:18-369:74  Type
+testdata/Builtins.lc 369:18-369:74  Type->Type
 testdata/Builtins.lc 369:19-369:21  V5
+testdata/Builtins.lc 369:25-369:26  Type->Type
 testdata/Builtins.lc 369:25-369:26  Type
 testdata/Builtins.lc 369:25-369:26  V4
+testdata/Builtins.lc 369:31-369:74  Type->Type
 testdata/Builtins.lc 369:31-369:74  Type
 testdata/Builtins.lc 369:31-369:46  'PrimitiveType -> Type->Type
 testdata/Builtins.lc 369:47-369:48  'PrimitiveType
 testdata/Builtins.lc 369:47-369:48  V2
 testdata/Builtins.lc 369:49-369:51  Type
+testdata/Builtins.lc 369:55-369:74  Type->Type
 testdata/Builtins.lc 369:55-369:74  Type
 testdata/Builtins.lc 369:55-369:70  'PrimitiveType -> Type->Type
 testdata/Builtins.lc 369:71-369:72  'PrimitiveType
 testdata/Builtins.lc 369:73-369:74  Type
-testdata/Builtins.lc 370:19-370:44  {a} -> {b} -> {c:'PrimitiveType} -> a->b -> 'Stream ('Primitive c a) -> 'Stream ('Primitive c b)
-testdata/Builtins.lc 370:19-370:44  {a} -> {b:'PrimitiveType} -> V2->a -> 'Stream ('Primitive b V3) -> 'Stream ('Primitive b a)
-testdata/Builtins.lc 370:19-370:44  {a:'PrimitiveType} -> V2->V2 -> 'Stream ('Primitive a V3) -> 'Stream ('Primitive a V3)
-testdata/Builtins.lc 370:19-370:44  V2->V2 -> 'Stream ('Primitive V1 V3) -> 'Stream ('Primitive V2 V3)
-testdata/Builtins.lc 370:19-370:44  'Stream ('Primitive V1 V3) -> 'Stream ('Primitive V2 V3)
+testdata/Builtins.lc 370:19-370:45  {a} -> {b} -> {c:'PrimitiveType} -> a->b -> 'Stream ('Primitive c a) -> 'Stream ('Primitive c b)
+testdata/Builtins.lc 370:19-370:45  {a} -> {b:'PrimitiveType} -> V2->a -> 'Stream ('Primitive b V3) -> 'Stream ('Primitive b a)
+testdata/Builtins.lc 370:19-370:45  {a:'PrimitiveType} -> V2->V2 -> 'Stream ('Primitive a V3) -> 'Stream ('Primitive a V3)
+testdata/Builtins.lc 370:19-370:45  V2->V2 -> 'Stream ('Primitive V1 V3) -> 'Stream ('Primitive V2 V3)
+testdata/Builtins.lc 370:19-370:45  'Stream ('Primitive V1 V3) -> 'Stream ('Primitive V2 V3)
 testdata/Builtins.lc 370:19-370:28  {a} -> {b} -> a->b -> 'Stream a -> 'Stream b
-testdata/Builtins.lc 370:30-370:44  V1->V1
+testdata/Builtins.lc 370:29-370:45  V1->V1
 testdata/Builtins.lc 370:30-370:42  {a} -> {b} -> {c:'PrimitiveType} -> a->b -> 'Primitive c a -> 'Primitive c b
 testdata/Builtins.lc 370:43-370:44  V2->V2
 testdata/Builtins.lc 370:43-370:44  V8->V8
@@ -1511,7 +1702,6 @@ testdata/Builtins.lc 378:39-383:44  Type->Type
 testdata/Builtins.lc 378:39-383:44  Type
 testdata/Builtins.lc 378:39-378:45  Type->Type
 testdata/Builtins.lc 378:39-378:45  Type
-testdata/Builtins.lc 378:39-378:45  Type -> Type->Type
 testdata/Builtins.lc 378:40-378:41  Type
 testdata/Builtins.lc 378:43-378:44  Type
 testdata/Builtins.lc 383:43-383:44  Type
@@ -1524,13 +1714,11 @@ testdata/Builtins.lc 379:48-384:58  Type->Type
 testdata/Builtins.lc 379:48-384:58  Type
 testdata/Builtins.lc 379:48-379:57  Type->Type
 testdata/Builtins.lc 379:48-379:57  Type
-testdata/Builtins.lc 379:48-379:57  Type -> Type -> Type->Type
 testdata/Builtins.lc 379:49-379:50  Type
 testdata/Builtins.lc 379:52-379:53  Type
 testdata/Builtins.lc 379:55-379:56  Type
 testdata/Builtins.lc 384:52-384:58  Type
 testdata/Builtins.lc 384:52-384:58  Type->Type
-testdata/Builtins.lc 384:52-384:58  Type -> Type->Type
 testdata/Builtins.lc 384:53-384:54  Type
 testdata/Builtins.lc 384:56-384:57  Type
 testdata/Builtins.lc 379:19-379:44  Type
@@ -1542,14 +1730,12 @@ testdata/Builtins.lc 380:57-385:70  Type->Type
 testdata/Builtins.lc 380:57-385:70  Type
 testdata/Builtins.lc 380:57-380:69  Type->Type
 testdata/Builtins.lc 380:57-380:69  Type
-testdata/Builtins.lc 380:57-380:69  Type -> Type -> Type -> Type->Type
 testdata/Builtins.lc 380:58-380:59  Type
 testdata/Builtins.lc 380:61-380:62  Type
 testdata/Builtins.lc 380:64-380:65  Type
 testdata/Builtins.lc 380:67-380:68  Type
 testdata/Builtins.lc 385:61-385:70  Type
 testdata/Builtins.lc 385:61-385:70  Type->Type
-testdata/Builtins.lc 385:61-385:70  Type -> Type -> Type->Type
 testdata/Builtins.lc 385:62-385:63  Type
 testdata/Builtins.lc 385:65-385:66  Type
 testdata/Builtins.lc 385:68-385:69  Type
@@ -1563,7 +1749,6 @@ testdata/Builtins.lc 381:66-386:82  Type->Type
 testdata/Builtins.lc 381:66-386:82  Type
 testdata/Builtins.lc 381:66-381:81  Type->Type
 testdata/Builtins.lc 381:66-381:81  Type
-testdata/Builtins.lc 381:66-381:81  Type -> Type -> Type -> Type -> Type->Type
 testdata/Builtins.lc 381:67-381:68  Type
 testdata/Builtins.lc 381:70-381:71  Type
 testdata/Builtins.lc 381:73-381:74  Type
@@ -1571,7 +1756,6 @@ testdata/Builtins.lc 381:76-381:77  Type
 testdata/Builtins.lc 381:79-381:80  Type
 testdata/Builtins.lc 386:70-386:82  Type
 testdata/Builtins.lc 386:70-386:82  Type->Type
-testdata/Builtins.lc 386:70-386:82  Type -> Type -> Type -> Type->Type
 testdata/Builtins.lc 386:71-386:72  Type
 testdata/Builtins.lc 386:74-386:75  Type
 testdata/Builtins.lc 386:77-386:78  Type
@@ -1583,162 +1767,186 @@ testdata/Builtins.lc 382:34-382:36  Type
 testdata/Builtins.lc 382:25-382:30  Type
 testdata/Builtins.lc 376:5-376:17  Type->Type
 testdata/Builtins.lc 389:18-389:21  Type
+testdata/Builtins.lc 389:25-389:37  Type->Type
 testdata/Builtins.lc 389:25-389:37  Type
 testdata/Builtins.lc 389:25-389:29  Type
+testdata/Builtins.lc 389:33-389:37  Type->Type
 testdata/Builtins.lc 389:33-389:37  Type
 testdata/Builtins.lc 389:6-389:14  'Nat -> Type->Type
+testdata/Builtins.lc 389:6-389:14  Type->Type
 testdata/Builtins.lc 389:6-389:14  Type
 testdata/Builtins.lc 391:27-391:33  Type->Type
-testdata/Builtins.lc 391:35-391:47  Type
+testdata/Builtins.lc 391:34-391:48  Type
 testdata/Builtins.lc 391:35-391:43  'Nat -> Type->Type
 testdata/Builtins.lc 391:44-391:45  'Nat
 testdata/Builtins.lc 391:44-391:45  V3
 testdata/Builtins.lc 391:46-391:47  Type
 testdata/Builtins.lc 391:46-391:47  V1
 testdata/Builtins.lc 391:6-391:20  'Nat -> Type->Type
-testdata/Builtins.lc 393:20-393:63  Type
+testdata/Builtins.lc 393:19-393:63  Type->Type
+testdata/Builtins.lc 393:19-393:63  Type
 testdata/Builtins.lc 393:20-393:21  V3
+testdata/Builtins.lc 393:25-393:30  Type->Type
 testdata/Builtins.lc 393:25-393:30  Type
+testdata/Builtins.lc 393:35-393:63  Type->Type
 testdata/Builtins.lc 393:35-393:63  Type
 testdata/Builtins.lc 393:35-393:43  'Nat -> Type->Type
 testdata/Builtins.lc 393:44-393:45  'Nat
 testdata/Builtins.lc 393:44-393:45  V2
 testdata/Builtins.lc 393:46-393:47  Type
+testdata/Builtins.lc 393:51-393:63  Type->Type
 testdata/Builtins.lc 393:51-393:63  Type
 testdata/Builtins.lc 393:51-393:59  'Nat -> Type->Type
 testdata/Builtins.lc 393:60-393:61  'Nat
 testdata/Builtins.lc 393:62-393:63  Type
 testdata/Builtins.lc 393:1-393:15  {a} -> {b:'Nat} -> a->'Float -> 'Fragment b a -> 'Fragment b a
 testdata/Builtins.lc 395:21-395:30  {a} -> {b} -> a->b -> 'Stream a -> 'Stream b
-testdata/Builtins.lc 395:32-395:48  V1->V1
+testdata/Builtins.lc 395:31-395:49  V1->V1
 testdata/Builtins.lc 395:32-395:46  {a} -> {b:'Nat} -> a->'Float -> 'Fragment b a -> 'Fragment b a
 testdata/Builtins.lc 395:47-395:48  V1->'Float
 testdata/Builtins.lc 395:47-395:48  V5
 testdata/Builtins.lc 395:1-395:16  {a} -> {b:'Nat} -> a->'Float -> 'Stream ('Fragment b a) -> 'Stream ('Fragment b a)
-testdata/Builtins.lc 397:21-401:55  Type
+testdata/Builtins.lc 397:20-401:55  Type->Type
+testdata/Builtins.lc 397:20-401:55  Type
 testdata/Builtins.lc 397:21-397:22  Type
 testdata/Builtins.lc 397:21-397:22  V7
 testdata/Builtins.lc 397:25-397:43  Type
 testdata/Builtins.lc 397:25-397:41  Type->Type
 testdata/Builtins.lc 397:42-397:43  Type
 testdata/Builtins.lc 397:42-397:43  V5
+testdata/Builtins.lc 397:45-401:55  Type->Type
 testdata/Builtins.lc 397:45-401:55  Type
 testdata/Builtins.lc 397:45-397:46  Type
 testdata/Builtins.lc 397:45-397:46  V4
 testdata/Builtins.lc 397:49-397:78  Type
 testdata/Builtins.lc 397:49-397:62  Type -> Type->Type
-testdata/Builtins.lc 397:64-397:75  Type
+testdata/Builtins.lc 397:63-397:76  Type
 testdata/Builtins.lc 397:64-397:67  'Nat -> Type->Type
+testdata/Builtins.lc 397:68-397:69  'Nat
 testdata/Builtins.lc 397:70-397:75  Type
 testdata/Builtins.lc 397:77-397:78  Type
-testdata/Builtins.lc 398:21-401:55  Type
+testdata/Builtins.lc 398:20-401:55  Type->Type
+testdata/Builtins.lc 398:20-401:55  Type
 testdata/Builtins.lc 398:21-398:22  Type
+testdata/Builtins.lc 398:26-398:31  Type->Type
 testdata/Builtins.lc 398:26-398:31  Type
+testdata/Builtins.lc 399:20-401:55  Type->Type
 testdata/Builtins.lc 399:20-401:55  Type
 testdata/Builtins.lc 399:20-399:21  Type
+testdata/Builtins.lc 400:20-401:55  Type->Type
 testdata/Builtins.lc 400:20-401:55  Type
 testdata/Builtins.lc 400:20-400:33  'PrimitiveType->Type
 testdata/Builtins.lc 400:34-400:35  'PrimitiveType
 testdata/Builtins.lc 400:34-400:35  V5
+testdata/Builtins.lc 401:20-401:55  Type->Type
 testdata/Builtins.lc 401:20-401:55  Type
 testdata/Builtins.lc 401:20-401:29  'PrimitiveType -> Type->Type
 testdata/Builtins.lc 401:30-401:31  'PrimitiveType
 testdata/Builtins.lc 401:32-401:33  Type
+testdata/Builtins.lc 401:37-401:55  Type->Type
 testdata/Builtins.lc 401:37-401:55  Type
 testdata/Builtins.lc 401:37-401:51  'Nat -> Type->Type
+testdata/Builtins.lc 401:52-401:53  'Nat
 testdata/Builtins.lc 401:54-401:55  Type
 testdata/Builtins.lc 397:1-397:11  {a} -> {b} -> {c} -> {d:'PrimitiveType} -> {e : a ~ 'InterpolatedType b} -> {f : c ~ 'JoinTupleType ('VecS 'Float (Succ (Succ (Succ (Succ Zero))))) a} -> c->'Float -> b -> 'RasterContext d -> 'Primitive d c -> 'Stream ('Fragment (Succ Zero) a)
-testdata/Builtins.lc 403:20-403:54  Type
+testdata/Builtins.lc 403:19-403:54  Type->Type
+testdata/Builtins.lc 403:19-403:54  Type
 testdata/Builtins.lc 403:20-403:21  V3
+testdata/Builtins.lc 403:25-403:29  Type->Type
 testdata/Builtins.lc 403:25-403:29  Type
+testdata/Builtins.lc 403:34-403:54  Type->Type
 testdata/Builtins.lc 403:34-403:54  Type
 testdata/Builtins.lc 403:34-403:42  'Nat -> Type->Type
 testdata/Builtins.lc 403:43-403:44  'Nat
 testdata/Builtins.lc 403:43-403:44  V2
 testdata/Builtins.lc 403:45-403:46  Type
+testdata/Builtins.lc 403:50-403:54  Type->Type
 testdata/Builtins.lc 403:50-403:54  Type
 testdata/Builtins.lc 403:1-403:15  {a} -> {b:'Nat} -> a->'Bool -> 'Fragment b a -> 'Bool
-testdata/Builtins.lc 405:21-405:78  Type
+testdata/Builtins.lc 405:20-405:79  Type
+testdata/Builtins.lc 405:20-405:79  Type->Type
 testdata/Builtins.lc 405:21-405:22  V3
+testdata/Builtins.lc 405:26-405:30  Type->Type
 testdata/Builtins.lc 405:26-405:30  Type
-testdata/Builtins.lc 405:36-405:78  Type
+testdata/Builtins.lc 405:35-405:79  Type->Type
+testdata/Builtins.lc 405:35-405:79  Type
 testdata/Builtins.lc 405:36-405:50  'Nat -> Type->Type
 testdata/Builtins.lc 405:51-405:52  'Nat
 testdata/Builtins.lc 405:51-405:52  V2
 testdata/Builtins.lc 405:53-405:54  Type
-testdata/Builtins.lc 405:60-405:78  Type
+testdata/Builtins.lc 405:59-405:79  Type->Type
+testdata/Builtins.lc 405:59-405:79  Type
 testdata/Builtins.lc 405:60-405:74  'Nat -> Type->Type
 testdata/Builtins.lc 405:75-405:76  'Nat
 testdata/Builtins.lc 405:77-405:78  Type
-testdata/Builtins.lc 406:21-406:51  {a} -> {b:'Nat} -> a->'Bool -> 'Stream ('Fragment b a) -> 'Stream ('Fragment b a)
-testdata/Builtins.lc 406:21-406:51  {a:'Nat} -> V1->'Bool -> 'Stream ('Fragment a V2) -> 'Stream ('Fragment a V3)
-testdata/Builtins.lc 406:21-406:51  V1->'Bool -> 'Stream ('Fragment V1 V2) -> 'Stream ('Fragment V2 V3)
-testdata/Builtins.lc 406:21-406:51  'Stream ('Fragment V1 V2) -> 'Stream ('Fragment V2 V3)
+testdata/Builtins.lc 406:21-406:52  {a} -> {b:'Nat} -> a->'Bool -> 'Stream ('Fragment b a) -> 'Stream ('Fragment b a)
+testdata/Builtins.lc 406:21-406:52  {a:'Nat} -> V1->'Bool -> 'Stream ('Fragment a V2) -> 'Stream ('Fragment a V3)
+testdata/Builtins.lc 406:21-406:52  V1->'Bool -> 'Stream ('Fragment V1 V2) -> 'Stream ('Fragment V2 V3)
+testdata/Builtins.lc 406:21-406:52  'Stream ('Fragment V1 V2) -> 'Stream ('Fragment V2 V3)
 testdata/Builtins.lc 406:21-406:33  {a} -> a->'Bool -> 'Stream a -> 'Stream a
-testdata/Builtins.lc 406:35-406:51  V0->'Bool
+testdata/Builtins.lc 406:34-406:52  V0->'Bool
 testdata/Builtins.lc 406:35-406:49  {a} -> {b:'Nat} -> a->'Bool -> 'Fragment b a -> 'Bool
 testdata/Builtins.lc 406:50-406:51  V1->'Bool
 testdata/Builtins.lc 406:50-406:51  V5->'Bool
 testdata/Builtins.lc 406:1-406:16  {a} -> {b:'Nat} -> a->'Bool -> 'Stream ('Fragment b a) -> 'Stream ('Fragment b a)
-testdata/Builtins.lc 408:17-408:56  Type
+testdata/Builtins.lc 408:16-408:56  Type->Type
+testdata/Builtins.lc 408:16-408:56  Type
 testdata/Builtins.lc 408:17-408:18  V5
+testdata/Builtins.lc 408:22-408:23  Type->Type
 testdata/Builtins.lc 408:22-408:23  Type
 testdata/Builtins.lc 408:22-408:23  V4
+testdata/Builtins.lc 408:28-408:56  Type->Type
 testdata/Builtins.lc 408:28-408:56  Type
 testdata/Builtins.lc 408:28-408:36  'Nat -> Type->Type
 testdata/Builtins.lc 408:37-408:38  'Nat
 testdata/Builtins.lc 408:37-408:38  V2
 testdata/Builtins.lc 408:39-408:40  Type
+testdata/Builtins.lc 408:44-408:56  Type->Type
 testdata/Builtins.lc 408:44-408:56  Type
 testdata/Builtins.lc 408:44-408:52  'Nat -> Type->Type
 testdata/Builtins.lc 408:53-408:54  'Nat
 testdata/Builtins.lc 408:55-408:56  Type
 testdata/Builtins.lc 408:1-408:12  {a} -> {b} -> {c:'Nat} -> a->b -> 'Fragment c a -> 'Fragment c b
 testdata/Builtins.lc 410:18-410:27  {a} -> {b} -> a->b -> 'Stream a -> 'Stream b
-testdata/Builtins.lc 410:29-410:42  V1->V1
+testdata/Builtins.lc 410:28-410:43  V1->V1
 testdata/Builtins.lc 410:29-410:40  {a} -> {b} -> {c:'Nat} -> a->b -> 'Fragment c a -> 'Fragment c b
 testdata/Builtins.lc 410:41-410:42  V2->V2
 testdata/Builtins.lc 410:41-410:42  V6
 testdata/Builtins.lc 410:1-410:13  {a} -> {b} -> {c:'Nat} -> a->b -> 'Stream ('Fragment c a) -> 'Stream ('Fragment c b)
 testdata/Builtins.lc 415:13-415:26  Type->Type
 testdata/Builtins.lc 420:13-420:28  Type->Type
-testdata/Builtins.lc 423:10-424:36  Type->Type
-testdata/Builtins.lc 423:10-424:36  Type
-testdata/Builtins.lc 423:10-423:23  Type->Type
-testdata/Builtins.lc 423:10-423:23  Type
-testdata/Builtins.lc 423:10-423:23  Type -> 'Nat->Type
-testdata/Builtins.lc 423:10-423:23  'Nat->Type
+testdata/Builtins.lc 423:37-424:36  Type->Type
+testdata/Builtins.lc 423:37-424:36  Type
 testdata/Builtins.lc 423:37-423:44  Type
-testdata/Builtins.lc 424:10-424:36  Type
-testdata/Builtins.lc 424:10-424:23  Type->Type
-testdata/Builtins.lc 424:10-424:23  Type
 testdata/Builtins.lc 424:31-424:36  Type
 testdata/Builtins.lc 422:7-422:20  Type->Type
 testdata/Builtins.lc 422:7-422:65  Type
+testdata/Builtins.lc 422:7-422:65  Type->Type
+testdata/Builtins.lc 422:46-422:65  Type->Type
 testdata/Builtins.lc 422:46-422:65  Type
 testdata/Builtins.lc 422:46-422:63  Type->Type
 testdata/Builtins.lc 422:64-422:65  Type
 testdata/Builtins.lc 423:37-424:77  {a} -> {b : 'DefaultFragOp a} -> 'FragmentOperation a
 testdata/Builtins.lc 423:37-424:77  {a : 'DefaultFragOp V0} -> 'FragmentOperation V1
-testdata/Builtins.lc 423:69-423:111  a:Type -> {b : 'DefaultFragOp ('Color a)} -> 'FragmentOperation ('Color a)
-testdata/Builtins.lc 423:69-423:111  {a : 'DefaultFragOp ('Color V0)} -> 'FragmentOperation ('Color V1)
-testdata/Builtins.lc 423:69-423:111  a:Type -> b:'Nat -> {c : 'DefaultFragOp ('Color ('VecS a b))} -> 'FragmentOperation ('Color ('VecS a b))
-testdata/Builtins.lc 423:69-423:111  a:'Nat -> {b : 'DefaultFragOp ('Color ('VecS V1 a))} -> 'FragmentOperation ('Color ('VecS V2 a))
-testdata/Builtins.lc 423:69-423:111  {a : 'DefaultFragOp ('Color ('VecS V1 V0))} -> 'FragmentOperation ('Color ('VecS V2 V1))
-testdata/Builtins.lc 423:69-423:111  {a : 'DefaultFragOp ('Color ('VecS 'Float V0))} -> 'FragmentOperation ('Color ('VecS 'Float V1))
-testdata/Builtins.lc 423:69-423:111  a:'Nat -> {b : 'DefaultFragOp ('Color ('VecS 'Float (Succ a)))} -> 'FragmentOperation ('Color ('VecS 'Float (Succ a)))
-testdata/Builtins.lc 423:69-423:111  {a : 'DefaultFragOp ('Color ('VecS 'Float (Succ V0)))} -> 'FragmentOperation ('Color ('VecS 'Float (Succ V1)))
-testdata/Builtins.lc 423:69-423:111  a:'Nat -> {b : 'DefaultFragOp ('Color ('VecS 'Float (Succ (Succ a))))} -> 'FragmentOperation ('Color ('VecS 'Float (Succ (Succ a))))
-testdata/Builtins.lc 423:69-423:111  {a : 'DefaultFragOp ('Color ('VecS 'Float (Succ (Succ V0))))} -> 'FragmentOperation ('Color ('VecS 'Float (Succ (Succ V1))))
-testdata/Builtins.lc 423:69-423:111  a:'Nat -> {b : 'DefaultFragOp ('Color ('VecS 'Float (Succ (Succ (Succ a)))))} -> 'FragmentOperation ('Color ('VecS 'Float (Succ (Succ (Succ a)))))
-testdata/Builtins.lc 423:69-423:111  {a : 'DefaultFragOp ('Color ('VecS 'Float (Succ (Succ (Succ V0)))))} -> 'FragmentOperation ('Color ('VecS 'Float (Succ (Succ (Succ V1)))))
-testdata/Builtins.lc 423:69-423:111  a:'Nat -> {b : 'DefaultFragOp ('Color ('VecS 'Float (Succ (Succ (Succ (Succ a))))))} -> 'FragmentOperation ('Color ('VecS 'Float (Succ (Succ (Succ (Succ a))))))
-testdata/Builtins.lc 423:69-423:111  {a : 'DefaultFragOp ('Color ('VecS 'Float (Succ (Succ (Succ (Succ V0))))))} -> 'FragmentOperation ('Color ('VecS 'Float (Succ (Succ (Succ (Succ V1))))))
-testdata/Builtins.lc 423:69-423:111  {a:'Unit} -> 'FragmentOperation ('Color ('VecS 'Float (Succ (Succ (Succ (Succ Zero))))))
+testdata/Builtins.lc 423:69-423:112  a:Type -> {b : 'DefaultFragOp ('Color a)} -> 'FragmentOperation ('Color a)
+testdata/Builtins.lc 423:69-423:112  {a : 'DefaultFragOp ('Color V0)} -> 'FragmentOperation ('Color V1)
+testdata/Builtins.lc 423:69-423:112  a:Type -> b:'Nat -> {c : 'DefaultFragOp ('Color ('VecS a b))} -> 'FragmentOperation ('Color ('VecS a b))
+testdata/Builtins.lc 423:69-423:112  a:'Nat -> {b : 'DefaultFragOp ('Color ('VecS V1 a))} -> 'FragmentOperation ('Color ('VecS V2 a))
+testdata/Builtins.lc 423:69-423:112  {a : 'DefaultFragOp ('Color ('VecS V1 V0))} -> 'FragmentOperation ('Color ('VecS V2 V1))
+testdata/Builtins.lc 423:69-423:112  {a : 'DefaultFragOp ('Color ('VecS 'Float V0))} -> 'FragmentOperation ('Color ('VecS 'Float V1))
+testdata/Builtins.lc 423:69-423:112  a:'Nat -> {b : 'DefaultFragOp ('Color ('VecS 'Float (Succ a)))} -> 'FragmentOperation ('Color ('VecS 'Float (Succ a)))
+testdata/Builtins.lc 423:69-423:112  {a : 'DefaultFragOp ('Color ('VecS 'Float (Succ V0)))} -> 'FragmentOperation ('Color ('VecS 'Float (Succ V1)))
+testdata/Builtins.lc 423:69-423:112  a:'Nat -> {b : 'DefaultFragOp ('Color ('VecS 'Float (Succ (Succ a))))} -> 'FragmentOperation ('Color ('VecS 'Float (Succ (Succ a))))
+testdata/Builtins.lc 423:69-423:112  {a : 'DefaultFragOp ('Color ('VecS 'Float (Succ (Succ V0))))} -> 'FragmentOperation ('Color ('VecS 'Float (Succ (Succ V1))))
+testdata/Builtins.lc 423:69-423:112  a:'Nat -> {b : 'DefaultFragOp ('Color ('VecS 'Float (Succ (Succ (Succ a)))))} -> 'FragmentOperation ('Color ('VecS 'Float (Succ (Succ (Succ a)))))
+testdata/Builtins.lc 423:69-423:112  {a : 'DefaultFragOp ('Color ('VecS 'Float (Succ (Succ (Succ V0)))))} -> 'FragmentOperation ('Color ('VecS 'Float (Succ (Succ (Succ V1)))))
+testdata/Builtins.lc 423:69-423:112  a:'Nat -> {b : 'DefaultFragOp ('Color ('VecS 'Float (Succ (Succ (Succ (Succ a))))))} -> 'FragmentOperation ('Color ('VecS 'Float (Succ (Succ (Succ (Succ a))))))
+testdata/Builtins.lc 423:69-423:112  {a : 'DefaultFragOp ('Color ('VecS 'Float (Succ (Succ (Succ (Succ V0))))))} -> 'FragmentOperation ('Color ('VecS 'Float (Succ (Succ (Succ (Succ V1))))))
+testdata/Builtins.lc 423:69-423:112  {a:'Unit} -> 'FragmentOperation ('Color ('VecS 'Float (Succ (Succ (Succ (Succ Zero))))))
 testdata/Builtins.lc 423:69-423:76  {a} -> {b:'Nat} -> {c} -> {d} -> {e : a ~ 'VecScalar b 'Bool} -> {f : c ~ 'VecScalar b d} -> {g : 'Num d} -> 'Blending d -> a -> 'FragmentOperation ('Color c)
 testdata/Builtins.lc 423:77-423:87  'Blending V1
 testdata/Builtins.lc 423:77-423:87  {a} -> 'Blending a
-testdata/Builtins.lc 423:89-423:111  'VecScalar V2 'Bool
+testdata/Builtins.lc 423:88-423:112  'VecScalar V2 'Bool
 testdata/Builtins.lc 423:89-423:91  {a} -> a -> a -> a -> a -> 'VecS a (Succ (Succ (Succ (Succ Zero))))
 testdata/Builtins.lc 423:92-423:96  V0
 testdata/Builtins.lc 423:92-423:96  'Bool
@@ -1755,31 +1963,38 @@ testdata/Builtins.lc 424:73-424:77  'Bool
 testdata/Builtins.lc 422:29-422:42  {a} -> {b} -> {c : 'DefaultFragOp b} -> 'FragmentOperation b
 testdata/Builtins.lc 431:24-431:27  Type
 testdata/Builtins.lc 431:6-431:17  'Nat -> Type->Type
+testdata/Builtins.lc 432:19-432:106  Type->Type
 testdata/Builtins.lc 432:19-432:106  Type
 testdata/Builtins.lc 432:19-432:27  Type->Type
 testdata/Builtins.lc 432:28-432:29  Type
-testdata/Builtins.lc 432:34-432:106  Type
+testdata/Builtins.lc 432:33-432:106  Type->Type
+testdata/Builtins.lc 432:33-432:106  Type
 testdata/Builtins.lc 432:34-432:48  'Nat -> Type->Type
 testdata/Builtins.lc 432:49-432:50  'Nat
-testdata/Builtins.lc 432:52-432:66  Type
+testdata/Builtins.lc 432:51-432:67  Type
 testdata/Builtins.lc 432:52-432:64  Type->Type
 testdata/Builtins.lc 432:65-432:66  Type
+testdata/Builtins.lc 432:72-432:106  Type->Type
 testdata/Builtins.lc 432:72-432:106  Type
 testdata/Builtins.lc 432:72-432:83  'Nat -> Type->Type
 testdata/Builtins.lc 432:84-432:85  'Nat
 testdata/Builtins.lc 432:86-432:87  Type
+testdata/Builtins.lc 432:91-432:106  Type->Type
 testdata/Builtins.lc 432:91-432:106  Type
 testdata/Builtins.lc 432:91-432:102  'Nat -> Type->Type
 testdata/Builtins.lc 432:103-432:104  'Nat
 testdata/Builtins.lc 432:105-432:106  Type
 testdata/Builtins.lc 432:3-432:13  {a:'Nat} -> {b} -> 'FragOps' b -> 'Stream ('Fragment a ('RemSemantics b)) -> 'FrameBuffer a b -> 'FrameBuffer a b
-testdata/Builtins.lc 433:20-433:117  Type
+testdata/Builtins.lc 433:19-433:117  Type->Type
+testdata/Builtins.lc 433:19-433:117  Type
 testdata/Builtins.lc 433:20-433:36  Type->Type
 testdata/Builtins.lc 433:37-433:38  Type
+testdata/Builtins.lc 433:40-433:117  Type->Type
 testdata/Builtins.lc 433:40-433:117  Type
 testdata/Builtins.lc 433:40-433:55  Type->Type
 testdata/Builtins.lc 433:56-433:57  Type
 testdata/Builtins.lc 433:56-433:57  V2
+testdata/Builtins.lc 433:59-433:117  Type->Type
 testdata/Builtins.lc 433:59-433:117  Type
 testdata/Builtins.lc 433:59-433:74  Type
 testdata/Builtins.lc 433:59-433:70  'Nat -> Type->Type
@@ -1788,23 +2003,29 @@ testdata/Builtins.lc 433:73-433:74  Type
 testdata/Builtins.lc 433:77-433:92  Type
 testdata/Builtins.lc 433:77-433:90  Type->Type
 testdata/Builtins.lc 433:91-433:92  Type
+testdata/Builtins.lc 433:97-433:117  Type->Type
 testdata/Builtins.lc 433:97-433:117  Type
 testdata/Builtins.lc 433:97-433:98  Type
+testdata/Builtins.lc 433:102-433:117  Type->Type
 testdata/Builtins.lc 433:102-433:117  Type
 testdata/Builtins.lc 433:102-433:113  'Nat -> Type->Type
 testdata/Builtins.lc 433:114-433:115  'Nat
 testdata/Builtins.lc 433:116-433:117  Type
 testdata/Builtins.lc 433:3-433:14  {a:'Nat} -> {b} -> {c} -> {d : 'SameLayerCounts c} -> {e : 'FrameBuffer a b ~ 'TFFrameBuffer c} -> c -> 'FrameBuffer a b
+testdata/Builtins.lc 431:6-433:14  Type->Type
 testdata/Builtins.lc 431:6-433:14  Type
+testdata/Builtins.lc 432:3-432:13  Type->Type
 testdata/Builtins.lc 432:3-432:13  Type
 testdata/Builtins.lc 432:3-432:13  'FrameBuffer V5 V4
+testdata/Builtins.lc 433:3-433:14  Type->Type
 testdata/Builtins.lc 433:3-433:14  Type
 testdata/Builtins.lc 433:3-433:14  'FrameBuffer V7 V6
+testdata/Builtins.lc 431:6-431:17  Type->Type
 testdata/Builtins.lc 431:6-431:17  Type
 testdata/Builtins.lc 435:34-435:44  {a:'Nat} -> {b} -> 'FragOps' b -> 'Stream ('Fragment a ('RemSemantics b)) -> 'FrameBuffer a b -> 'FrameBuffer a b
 testdata/Builtins.lc 435:45-435:48  'FragOps' V0
 testdata/Builtins.lc 435:45-435:48  V9
-testdata/Builtins.lc 435:50-435:75  'Stream ('Fragment V1 ('RemSemantics V0))
+testdata/Builtins.lc 435:49-435:76  'Stream ('Fragment V1 ('RemSemantics V0))
 testdata/Builtins.lc 435:50-435:62  {a} -> {b} -> {c:'Nat} -> a->b -> 'Stream ('Fragment c a) -> 'Stream ('Fragment c b)
 testdata/Builtins.lc 435:63-435:70  V2->V2
 testdata/Builtins.lc 435:63-435:70  V10
@@ -1816,15 +2037,19 @@ testdata/Builtins.lc 435:1-435:11  {a:'Nat} -> {b} -> {c} -> 'FragOps' b -> (c -
 testdata/Builtins.lc 437:25-437:26  V1
 testdata/Builtins.lc 437:1-437:20  {a} -> a->a
 testdata/Builtins.lc 439:15-439:18  Type
+testdata/Builtins.lc 439:22-439:34  Type->Type
 testdata/Builtins.lc 439:22-439:34  Type
 testdata/Builtins.lc 439:22-439:26  Type
+testdata/Builtins.lc 439:30-439:34  Type->Type
 testdata/Builtins.lc 439:30-439:34  Type
 testdata/Builtins.lc 439:6-439:11  'Nat -> Type->Type
-testdata/Builtins.lc 440:48-441:56  Type
+testdata/Builtins.lc 440:47-441:57  Type->Type
+testdata/Builtins.lc 440:47-441:57  Type
 testdata/Builtins.lc 440:48-440:51  Type->Type
 testdata/Builtins.lc 440:52-440:53  Type
 testdata/Builtins.lc 440:52-440:53  V3
-testdata/Builtins.lc 440:55-441:56  Type
+testdata/Builtins.lc 440:55-441:57  Type->Type
+testdata/Builtins.lc 440:55-441:57  Type
 testdata/Builtins.lc 440:55-440:60  Type
 testdata/Builtins.lc 440:55-440:60  V2
 testdata/Builtins.lc 440:63-440:76  Type
@@ -1832,123 +2057,160 @@ testdata/Builtins.lc 440:63-440:72  'Nat -> Type->Type
 testdata/Builtins.lc 440:73-440:74  'Nat
 testdata/Builtins.lc 440:73-440:74  V4
 testdata/Builtins.lc 440:75-440:76  Type
-testdata/Builtins.lc 441:26-441:56  Type
+testdata/Builtins.lc 441:26-441:57  Type->Type
+testdata/Builtins.lc 441:26-441:57  Type
 testdata/Builtins.lc 441:26-441:31  Type
-testdata/Builtins.lc 441:36-441:56  Type
+testdata/Builtins.lc 441:36-441:57  Type->Type
+testdata/Builtins.lc 441:36-441:57  Type
 testdata/Builtins.lc 441:36-441:41  'Nat -> Type->Type
 testdata/Builtins.lc 441:42-441:43  'Nat
 testdata/Builtins.lc 441:42-441:43  V7
-testdata/Builtins.lc 441:45-441:56  Type
+testdata/Builtins.lc 441:44-441:57  Type
 testdata/Builtins.lc 441:45-441:50  Type->Type
 testdata/Builtins.lc 441:51-441:56  Type
 testdata/Builtins.lc 440:3-440:13  {a:'Nat} -> {b:'Nat} -> {c} -> {d} -> {e : 'Num c} -> {f : d ~ 'VecScalar b c} -> d -> 'Image a ('Color d)
-testdata/Builtins.lc 442:37-442:67  Type
+testdata/Builtins.lc 442:37-442:68  Type->Type
+testdata/Builtins.lc 442:37-442:68  Type
 testdata/Builtins.lc 442:37-442:42  Type
-testdata/Builtins.lc 442:47-442:67  Type
+testdata/Builtins.lc 442:47-442:68  Type->Type
+testdata/Builtins.lc 442:47-442:68  Type
 testdata/Builtins.lc 442:47-442:52  'Nat -> Type->Type
 testdata/Builtins.lc 442:53-442:54  'Nat
 testdata/Builtins.lc 442:53-442:54  V2
-testdata/Builtins.lc 442:56-442:67  Type
+testdata/Builtins.lc 442:55-442:68  Type
 testdata/Builtins.lc 442:56-442:61  Type->Type
 testdata/Builtins.lc 442:62-442:67  Type
 testdata/Builtins.lc 442:3-442:13  {a:'Nat} -> 'Float -> 'Image a ('Depth 'Float)
-testdata/Builtins.lc 443:37-443:67  Type
+testdata/Builtins.lc 443:37-443:68  Type->Type
+testdata/Builtins.lc 443:37-443:68  Type
 testdata/Builtins.lc 443:37-443:40  Type
-testdata/Builtins.lc 443:47-443:67  Type
+testdata/Builtins.lc 443:47-443:68  Type->Type
+testdata/Builtins.lc 443:47-443:68  Type
 testdata/Builtins.lc 443:47-443:52  'Nat -> Type->Type
 testdata/Builtins.lc 443:53-443:54  'Nat
 testdata/Builtins.lc 443:53-443:54  V2
-testdata/Builtins.lc 443:56-443:67  Type
+testdata/Builtins.lc 443:55-443:68  Type
 testdata/Builtins.lc 443:56-443:63  Type->Type
 testdata/Builtins.lc 443:64-443:67  Type
 testdata/Builtins.lc 443:3-443:15  {a:'Nat} -> 'Int -> 'Image a ('Stencil 'Int)
+testdata/Builtins.lc 446:26-446:54  Type->Type
 testdata/Builtins.lc 446:26-446:54  Type
 testdata/Builtins.lc 446:26-446:37  'Nat -> Type->Type
+testdata/Builtins.lc 446:38-446:39  'Nat
 testdata/Builtins.lc 446:40-446:41  Type
 testdata/Builtins.lc 446:40-446:41  V1
+testdata/Builtins.lc 446:45-446:54  Type->Type
 testdata/Builtins.lc 446:45-446:54  Type
 testdata/Builtins.lc 446:45-446:50  'Nat -> Type->Type
+testdata/Builtins.lc 446:51-446:52  'Nat
 testdata/Builtins.lc 446:53-446:54  Type
 testdata/Builtins.lc 446:3-446:11  {a} -> 'FrameBuffer (Succ Zero) a -> 'Image (Succ Zero) a
 testdata/Builtins.lc 447:26-447:37  'Nat -> Type->Type
+testdata/Builtins.lc 447:38-447:39  'Nat
 testdata/Builtins.lc 447:40-447:74  Type
-testdata/Builtins.lc 447:40-447:74  Type -> Type->Type
 testdata/Builtins.lc 447:41-447:52  Type
 testdata/Builtins.lc 447:41-447:46  Type->Type
 testdata/Builtins.lc 447:47-447:52  Type
-testdata/Builtins.lc 447:54-447:72  Type
+testdata/Builtins.lc 447:54-447:73  Type
 testdata/Builtins.lc 447:54-447:59  Type->Type
-testdata/Builtins.lc 447:61-447:72  Type
+testdata/Builtins.lc 447:60-447:73  Type
 testdata/Builtins.lc 447:61-447:64  'Nat -> Type->Type
+testdata/Builtins.lc 447:65-447:66  'Nat
 testdata/Builtins.lc 447:67-447:72  Type
-testdata/Builtins.lc 447:78-447:105  Type
+testdata/Builtins.lc 447:78-447:107  Type->Type
+testdata/Builtins.lc 447:78-447:107  Type
 testdata/Builtins.lc 447:78-447:83  'Nat -> Type->Type
-testdata/Builtins.lc 447:87-447:105  Type
+testdata/Builtins.lc 447:84-447:85  'Nat
+testdata/Builtins.lc 447:86-447:107  Type
 testdata/Builtins.lc 447:87-447:92  Type->Type
-testdata/Builtins.lc 447:94-447:105  Type
+testdata/Builtins.lc 447:93-447:106  Type
 testdata/Builtins.lc 447:94-447:97  'Nat -> Type->Type
+testdata/Builtins.lc 447:98-447:99  'Nat
 testdata/Builtins.lc 447:100-447:105  Type
 testdata/Builtins.lc 447:3-447:16  'FrameBuffer (Succ Zero) ('Tuple2 ('Depth 'Float) ('Color ('VecS 'Float (Succ (Succ (Succ (Succ Zero))))))) -> 'Image (Succ Zero) ('Color ('VecS 'Float (Succ (Succ (Succ (Succ Zero))))))
+testdata/Builtins.lc 439:6-439:11  Type->Type
 testdata/Builtins.lc 439:6-439:11  Type
-testdata/Builtins.lc 439:6-447:105  Type
-testdata/Builtins.lc 440:3-441:56  Type
+testdata/Builtins.lc 439:6-447:107  Type->Type
+testdata/Builtins.lc 439:6-447:107  Type
+testdata/Builtins.lc 440:3-441:57  Type->Type
+testdata/Builtins.lc 440:3-441:57  Type
 testdata/Builtins.lc 440:3-440:13  'Image V6 ('Color V3)
-testdata/Builtins.lc 442:3-442:67  Type
+testdata/Builtins.lc 442:3-442:68  Type->Type
+testdata/Builtins.lc 442:3-442:68  Type
 testdata/Builtins.lc 442:3-442:13  'Image V1 ('Depth 'Float)
-testdata/Builtins.lc 443:3-443:67  Type
+testdata/Builtins.lc 443:3-443:68  Type->Type
+testdata/Builtins.lc 443:3-443:68  Type
 testdata/Builtins.lc 443:3-443:15  'Image V1 ('Stencil 'Int)
+testdata/Builtins.lc 446:3-446:54  Type->Type
 testdata/Builtins.lc 446:3-446:54  Type
 testdata/Builtins.lc 446:3-446:11  'Image (Succ Zero) V1
-testdata/Builtins.lc 447:3-447:105  Type
+testdata/Builtins.lc 447:3-447:107  Type->Type
+testdata/Builtins.lc 447:3-447:107  Type
 testdata/Builtins.lc 447:3-447:16  'Image (Succ Zero) ('Color ('VecS 'Float (Succ (Succ (Succ (Succ Zero))))))
 testdata/Builtins.lc 449:6-449:12  Type
+testdata/Builtins.lc 450:26-450:51  Type->Type
 testdata/Builtins.lc 450:26-450:51  Type
 testdata/Builtins.lc 450:26-450:37  'Nat -> Type->Type
 testdata/Builtins.lc 450:38-450:39  'Nat
 testdata/Builtins.lc 450:38-450:39  V3
 testdata/Builtins.lc 450:40-450:41  Type
 testdata/Builtins.lc 450:40-450:41  V1
+testdata/Builtins.lc 450:45-450:51  Type->Type
 testdata/Builtins.lc 450:45-450:51  Type
 testdata/Builtins.lc 450:3-450:12  {a:'Nat} -> {b} -> 'FrameBuffer a b -> 'Output
+testdata/Builtins.lc 449:6-450:12  Type->Type
 testdata/Builtins.lc 449:6-450:12  Type
+testdata/Builtins.lc 450:3-450:12  Type->Type
 testdata/Builtins.lc 450:3-450:12  Type
 testdata/Builtins.lc 450:3-450:12  'Output
+testdata/Builtins.lc 449:6-449:12  Type->Type
+testdata/Builtins.lc 456:34-456:73  Type->Type
 testdata/Builtins.lc 456:34-456:73  Type
 testdata/Builtins.lc 456:34-456:37  Type->Type
-testdata/Builtins.lc 456:39-456:57  Type
+testdata/Builtins.lc 456:38-456:58  Type
 testdata/Builtins.lc 456:39-456:55  Type->Type
 testdata/Builtins.lc 456:56-456:57  Type
 testdata/Builtins.lc 456:56-456:57  V1
+testdata/Builtins.lc 456:62-456:73  Type->Type
 testdata/Builtins.lc 456:62-456:73  Type
 testdata/Builtins.lc 456:62-456:63  Type
+testdata/Builtins.lc 456:67-456:73  Type->Type
 testdata/Builtins.lc 456:67-456:73  Type
 testdata/Builtins.lc 456:67-456:68  Type
+testdata/Builtins.lc 456:72-456:73  Type->Type
 testdata/Builtins.lc 456:72-456:73  Type
 testdata/Builtins.lc 456:1-456:8  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> a->a
 testdata/Builtins.lc 456:10-456:17  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> a->a
 testdata/Builtins.lc 456:19-456:26  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> a->a
-testdata/Builtins.lc 457:35-457:80  Type
+testdata/Builtins.lc 457:34-457:80  Type->Type
+testdata/Builtins.lc 457:34-457:80  Type
 testdata/Builtins.lc 457:35-457:36  Type
 testdata/Builtins.lc 457:35-457:36  V3
 testdata/Builtins.lc 457:39-457:57  Type
 testdata/Builtins.lc 457:39-457:55  Type->Type
 testdata/Builtins.lc 457:56-457:57  Type
 testdata/Builtins.lc 457:56-457:57  V1
+testdata/Builtins.lc 457:59-457:80  Type->Type
 testdata/Builtins.lc 457:59-457:80  Type
 testdata/Builtins.lc 457:59-457:62  Type->Type
 testdata/Builtins.lc 457:63-457:64  Type
+testdata/Builtins.lc 457:69-457:80  Type->Type
 testdata/Builtins.lc 457:69-457:80  Type
 testdata/Builtins.lc 457:69-457:70  Type
+testdata/Builtins.lc 457:74-457:80  Type->Type
 testdata/Builtins.lc 457:74-457:80  Type
 testdata/Builtins.lc 457:74-457:75  Type
+testdata/Builtins.lc 457:79-457:80  Type->Type
 testdata/Builtins.lc 457:79-457:80  Type
 testdata/Builtins.lc 457:1-457:9  {a} -> {b} -> {c : a ~ 'MatVecScalarElem b} -> {d : 'Num a} -> b -> a->b
 testdata/Builtins.lc 457:11-457:19  {a} -> {b} -> {c : a ~ 'MatVecScalarElem b} -> {d : 'Num a} -> b -> a->b
 testdata/Builtins.lc 457:21-457:29  {a} -> {b} -> {c : a ~ 'MatVecScalarElem b} -> {d : 'Num a} -> b -> a->b
-testdata/Builtins.lc 458:35-458:75  Type
+testdata/Builtins.lc 458:34-458:75  Type->Type
+testdata/Builtins.lc 458:34-458:75  Type
 testdata/Builtins.lc 458:35-458:38  Type->Type
 testdata/Builtins.lc 458:39-458:40  Type
 testdata/Builtins.lc 458:39-458:40  V5
+testdata/Builtins.lc 458:42-458:75  Type->Type
 testdata/Builtins.lc 458:42-458:75  Type
 testdata/Builtins.lc 458:42-458:43  Type
 testdata/Builtins.lc 458:42-458:43  V4
@@ -1957,17 +2219,22 @@ testdata/Builtins.lc 458:46-458:55  'Nat -> Type->Type
 testdata/Builtins.lc 458:56-458:57  'Nat
 testdata/Builtins.lc 458:56-458:57  V2
 testdata/Builtins.lc 458:58-458:59  Type
+testdata/Builtins.lc 458:64-458:75  Type->Type
 testdata/Builtins.lc 458:64-458:75  Type
 testdata/Builtins.lc 458:64-458:65  Type
+testdata/Builtins.lc 458:69-458:75  Type->Type
 testdata/Builtins.lc 458:69-458:75  Type
 testdata/Builtins.lc 458:69-458:70  Type
+testdata/Builtins.lc 458:74-458:75  Type->Type
 testdata/Builtins.lc 458:74-458:75  Type
 testdata/Builtins.lc 458:1-458:8  {a} -> {b} -> {c:'Nat} -> {d : 'Num a} -> {e : b ~ 'VecScalar c a} -> b -> b->b
 testdata/Builtins.lc 458:10-458:17  {a} -> {b} -> {c:'Nat} -> {d : 'Num a} -> {e : b ~ 'VecScalar c a} -> b -> b->b
-testdata/Builtins.lc 459:35-459:75  Type
+testdata/Builtins.lc 459:34-459:75  Type->Type
+testdata/Builtins.lc 459:34-459:75  Type
 testdata/Builtins.lc 459:35-459:38  Type->Type
 testdata/Builtins.lc 459:39-459:40  Type
 testdata/Builtins.lc 459:39-459:40  V5
+testdata/Builtins.lc 459:42-459:75  Type->Type
 testdata/Builtins.lc 459:42-459:75  Type
 testdata/Builtins.lc 459:42-459:43  Type
 testdata/Builtins.lc 459:42-459:43  V4
@@ -1976,27 +2243,35 @@ testdata/Builtins.lc 459:46-459:55  'Nat -> Type->Type
 testdata/Builtins.lc 459:56-459:57  'Nat
 testdata/Builtins.lc 459:56-459:57  V2
 testdata/Builtins.lc 459:58-459:59  Type
+testdata/Builtins.lc 459:64-459:75  Type->Type
 testdata/Builtins.lc 459:64-459:75  Type
 testdata/Builtins.lc 459:64-459:65  Type
+testdata/Builtins.lc 459:69-459:75  Type->Type
 testdata/Builtins.lc 459:69-459:75  Type
 testdata/Builtins.lc 459:69-459:70  Type
+testdata/Builtins.lc 459:74-459:75  Type->Type
 testdata/Builtins.lc 459:74-459:75  Type
 testdata/Builtins.lc 459:1-459:9  {a} -> {b} -> {c:'Nat} -> {d : 'Num a} -> {e : b ~ 'VecScalar c a} -> b -> a->b
 testdata/Builtins.lc 459:11-459:19  {a} -> {b} -> {c:'Nat} -> {d : 'Num a} -> {e : b ~ 'VecScalar c a} -> b -> a->b
+testdata/Builtins.lc 460:34-460:71  Type->Type
 testdata/Builtins.lc 460:34-460:71  Type
 testdata/Builtins.lc 460:34-460:40  Type->Type
-testdata/Builtins.lc 460:42-460:60  Type
+testdata/Builtins.lc 460:41-460:61  Type
 testdata/Builtins.lc 460:42-460:58  Type->Type
 testdata/Builtins.lc 460:59-460:60  Type
 testdata/Builtins.lc 460:59-460:60  V1
+testdata/Builtins.lc 460:65-460:71  Type->Type
 testdata/Builtins.lc 460:65-460:71  Type
 testdata/Builtins.lc 460:65-460:66  Type
+testdata/Builtins.lc 460:70-460:71  Type->Type
 testdata/Builtins.lc 460:70-460:71  Type
 testdata/Builtins.lc 460:1-460:8  {a} -> {b : 'Signed ('MatVecScalarElem a)} -> a->a
-testdata/Builtins.lc 462:35-462:80  Type
+testdata/Builtins.lc 462:34-462:80  Type->Type
+testdata/Builtins.lc 462:34-462:80  Type
 testdata/Builtins.lc 462:35-462:43  Type->Type
 testdata/Builtins.lc 462:44-462:45  Type
 testdata/Builtins.lc 462:44-462:45  V5
+testdata/Builtins.lc 462:47-462:80  Type->Type
 testdata/Builtins.lc 462:47-462:80  Type
 testdata/Builtins.lc 462:47-462:48  Type
 testdata/Builtins.lc 462:47-462:48  V4
@@ -2005,18 +2280,23 @@ testdata/Builtins.lc 462:51-462:60  'Nat -> Type->Type
 testdata/Builtins.lc 462:61-462:62  'Nat
 testdata/Builtins.lc 462:61-462:62  V2
 testdata/Builtins.lc 462:63-462:64  Type
+testdata/Builtins.lc 462:69-462:80  Type->Type
 testdata/Builtins.lc 462:69-462:80  Type
 testdata/Builtins.lc 462:69-462:70  Type
+testdata/Builtins.lc 462:74-462:80  Type->Type
 testdata/Builtins.lc 462:74-462:80  Type
 testdata/Builtins.lc 462:74-462:75  Type
+testdata/Builtins.lc 462:79-462:80  Type->Type
 testdata/Builtins.lc 462:79-462:80  Type
 testdata/Builtins.lc 462:1-462:9  {a} -> {b} -> {c:'Nat} -> {d : 'Integral a} -> {e : b ~ 'VecScalar c a} -> b -> b->b
 testdata/Builtins.lc 462:11-462:18  {a} -> {b} -> {c:'Nat} -> {d : 'Integral a} -> {e : b ~ 'VecScalar c a} -> b -> b->b
 testdata/Builtins.lc 462:20-462:28  {a} -> {b} -> {c:'Nat} -> {d : 'Integral a} -> {e : b ~ 'VecScalar c a} -> b -> b->b
-testdata/Builtins.lc 463:35-463:80  Type
+testdata/Builtins.lc 463:34-463:80  Type->Type
+testdata/Builtins.lc 463:34-463:80  Type
 testdata/Builtins.lc 463:35-463:43  Type->Type
 testdata/Builtins.lc 463:44-463:45  Type
 testdata/Builtins.lc 463:44-463:45  V5
+testdata/Builtins.lc 463:47-463:80  Type->Type
 testdata/Builtins.lc 463:47-463:80  Type
 testdata/Builtins.lc 463:47-463:48  Type
 testdata/Builtins.lc 463:47-463:48  V4
@@ -2025,18 +2305,23 @@ testdata/Builtins.lc 463:51-463:60  'Nat -> Type->Type
 testdata/Builtins.lc 463:61-463:62  'Nat
 testdata/Builtins.lc 463:61-463:62  V2
 testdata/Builtins.lc 463:63-463:64  Type
+testdata/Builtins.lc 463:69-463:80  Type->Type
 testdata/Builtins.lc 463:69-463:80  Type
 testdata/Builtins.lc 463:69-463:70  Type
+testdata/Builtins.lc 463:74-463:80  Type->Type
 testdata/Builtins.lc 463:74-463:80  Type
 testdata/Builtins.lc 463:74-463:75  Type
+testdata/Builtins.lc 463:79-463:80  Type->Type
 testdata/Builtins.lc 463:79-463:80  Type
 testdata/Builtins.lc 463:1-463:10  {a} -> {b} -> {c:'Nat} -> {d : 'Integral a} -> {e : b ~ 'VecScalar c a} -> b -> a->b
 testdata/Builtins.lc 463:12-463:20  {a} -> {b} -> {c:'Nat} -> {d : 'Integral a} -> {e : b ~ 'VecScalar c a} -> b -> a->b
 testdata/Builtins.lc 463:22-463:31  {a} -> {b} -> {c:'Nat} -> {d : 'Integral a} -> {e : b ~ 'VecScalar c a} -> b -> a->b
-testdata/Builtins.lc 464:35-464:75  Type
+testdata/Builtins.lc 464:34-464:75  Type->Type
+testdata/Builtins.lc 464:34-464:75  Type
 testdata/Builtins.lc 464:35-464:43  Type->Type
 testdata/Builtins.lc 464:44-464:45  Type
 testdata/Builtins.lc 464:44-464:45  V5
+testdata/Builtins.lc 464:47-464:75  Type->Type
 testdata/Builtins.lc 464:47-464:75  Type
 testdata/Builtins.lc 464:47-464:48  Type
 testdata/Builtins.lc 464:47-464:48  V4
@@ -2045,14 +2330,18 @@ testdata/Builtins.lc 464:51-464:60  'Nat -> Type->Type
 testdata/Builtins.lc 464:61-464:62  'Nat
 testdata/Builtins.lc 464:61-464:62  V2
 testdata/Builtins.lc 464:63-464:64  Type
+testdata/Builtins.lc 464:69-464:75  Type->Type
 testdata/Builtins.lc 464:69-464:75  Type
 testdata/Builtins.lc 464:69-464:70  Type
+testdata/Builtins.lc 464:74-464:75  Type->Type
 testdata/Builtins.lc 464:74-464:75  Type
 testdata/Builtins.lc 464:1-464:9  {a} -> {b} -> {c:'Nat} -> {d : 'Integral a} -> {e : b ~ 'VecScalar c a} -> b->b
-testdata/Builtins.lc 465:35-465:102  Type
+testdata/Builtins.lc 465:34-465:102  Type->Type
+testdata/Builtins.lc 465:34-465:102  Type
 testdata/Builtins.lc 465:35-465:43  Type->Type
 testdata/Builtins.lc 465:44-465:45  Type
 testdata/Builtins.lc 465:44-465:45  V7
+testdata/Builtins.lc 465:47-465:102  Type->Type
 testdata/Builtins.lc 465:47-465:102  Type
 testdata/Builtins.lc 465:47-465:48  Type
 testdata/Builtins.lc 465:47-465:48  V6
@@ -2061,6 +2350,7 @@ testdata/Builtins.lc 465:51-465:60  'Nat -> Type->Type
 testdata/Builtins.lc 465:61-465:62  'Nat
 testdata/Builtins.lc 465:61-465:62  V4
 testdata/Builtins.lc 465:63-465:64  Type
+testdata/Builtins.lc 465:66-465:102  Type->Type
 testdata/Builtins.lc 465:66-465:102  Type
 testdata/Builtins.lc 465:66-465:67  Type
 testdata/Builtins.lc 465:66-465:67  V3
@@ -2068,17 +2358,22 @@ testdata/Builtins.lc 465:70-465:86  Type
 testdata/Builtins.lc 465:70-465:79  'Nat -> Type->Type
 testdata/Builtins.lc 465:80-465:81  'Nat
 testdata/Builtins.lc 465:82-465:86  Type
+testdata/Builtins.lc 465:91-465:102  Type->Type
 testdata/Builtins.lc 465:91-465:102  Type
 testdata/Builtins.lc 465:91-465:92  Type
+testdata/Builtins.lc 465:96-465:102  Type->Type
 testdata/Builtins.lc 465:96-465:102  Type
 testdata/Builtins.lc 465:96-465:97  Type
+testdata/Builtins.lc 465:101-465:102  Type->Type
 testdata/Builtins.lc 465:101-465:102  Type
 testdata/Builtins.lc 465:1-465:12  {a} -> {b} -> {c:'Nat} -> {d} -> {e : 'Integral a} -> {f : b ~ 'VecScalar c a} -> {g : d ~ 'VecScalar c 'Word} -> b -> d->b
 testdata/Builtins.lc 465:14-465:25  {a} -> {b} -> {c:'Nat} -> {d} -> {e : 'Integral a} -> {f : b ~ 'VecScalar c a} -> {g : d ~ 'VecScalar c 'Word} -> b -> d->b
-testdata/Builtins.lc 466:35-466:83  Type
+testdata/Builtins.lc 466:34-466:83  Type->Type
+testdata/Builtins.lc 466:34-466:83  Type
 testdata/Builtins.lc 466:35-466:43  Type->Type
 testdata/Builtins.lc 466:44-466:45  Type
 testdata/Builtins.lc 466:44-466:45  V5
+testdata/Builtins.lc 466:47-466:83  Type->Type
 testdata/Builtins.lc 466:47-466:83  Type
 testdata/Builtins.lc 466:47-466:48  Type
 testdata/Builtins.lc 466:47-466:48  V4
@@ -2087,21 +2382,27 @@ testdata/Builtins.lc 466:51-466:60  'Nat -> Type->Type
 testdata/Builtins.lc 466:61-466:62  'Nat
 testdata/Builtins.lc 466:61-466:62  V2
 testdata/Builtins.lc 466:63-466:64  Type
+testdata/Builtins.lc 466:69-466:83  Type->Type
 testdata/Builtins.lc 466:69-466:83  Type
 testdata/Builtins.lc 466:69-466:70  Type
+testdata/Builtins.lc 466:74-466:83  Type->Type
 testdata/Builtins.lc 466:74-466:83  Type
 testdata/Builtins.lc 466:74-466:78  Type
+testdata/Builtins.lc 466:82-466:83  Type->Type
 testdata/Builtins.lc 466:82-466:83  Type
 testdata/Builtins.lc 466:1-466:13  {a} -> {b} -> {c:'Nat} -> {d : 'Integral a} -> {e : b ~ 'VecScalar c a} -> b -> 'Word->b
 testdata/Builtins.lc 466:15-466:27  {a} -> {b} -> {c:'Nat} -> {d : 'Integral a} -> {e : b ~ 'VecScalar c a} -> b -> 'Word->b
 testdata/Builtins.lc 468:34-468:38  Type
+testdata/Builtins.lc 468:42-468:54  Type->Type
 testdata/Builtins.lc 468:42-468:54  Type
 testdata/Builtins.lc 468:42-468:46  Type
+testdata/Builtins.lc 468:50-468:54  Type->Type
 testdata/Builtins.lc 468:50-468:54  Type
 testdata/Builtins.lc 468:1-468:8  'Bool -> 'Bool->'Bool
 testdata/Builtins.lc 468:10-468:16  'Bool -> 'Bool->'Bool
 testdata/Builtins.lc 468:18-468:25  'Bool -> 'Bool->'Bool
-testdata/Builtins.lc 469:35-469:66  Type
+testdata/Builtins.lc 469:34-469:66  Type->Type
+testdata/Builtins.lc 469:34-469:66  Type
 testdata/Builtins.lc 469:35-469:36  Type
 testdata/Builtins.lc 469:35-469:36  V3
 testdata/Builtins.lc 469:39-469:55  Type
@@ -2109,19 +2410,24 @@ testdata/Builtins.lc 469:39-469:48  'Nat -> Type->Type
 testdata/Builtins.lc 469:49-469:50  'Nat
 testdata/Builtins.lc 469:49-469:50  V1
 testdata/Builtins.lc 469:51-469:55  Type
+testdata/Builtins.lc 469:60-469:66  Type->Type
 testdata/Builtins.lc 469:60-469:66  Type
 testdata/Builtins.lc 469:60-469:61  Type
+testdata/Builtins.lc 469:65-469:66  Type->Type
 testdata/Builtins.lc 469:65-469:66  Type
 testdata/Builtins.lc 469:1-469:8  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Bool} -> a->a
+testdata/Builtins.lc 470:34-470:58  Type->Type
 testdata/Builtins.lc 470:34-470:58  Type
 testdata/Builtins.lc 470:34-470:43  'Nat -> Type->Type
 testdata/Builtins.lc 470:44-470:45  'Nat
 testdata/Builtins.lc 470:44-470:45  V1
 testdata/Builtins.lc 470:46-470:50  Type
+testdata/Builtins.lc 470:54-470:58  Type->Type
 testdata/Builtins.lc 470:54-470:58  Type
 testdata/Builtins.lc 470:1-470:8  {a:'Nat} -> 'VecScalar a 'Bool -> 'Bool
 testdata/Builtins.lc 470:10-470:17  {a:'Nat} -> 'VecScalar a 'Bool -> 'Bool
-testdata/Builtins.lc 474:35-474:67  Type
+testdata/Builtins.lc 474:34-474:67  Type->Type
+testdata/Builtins.lc 474:34-474:67  Type
 testdata/Builtins.lc 474:35-474:36  Type
 testdata/Builtins.lc 474:35-474:36  V3
 testdata/Builtins.lc 474:39-474:56  Type
@@ -2129,8 +2435,10 @@ testdata/Builtins.lc 474:39-474:48  'Nat -> Type->Type
 testdata/Builtins.lc 474:49-474:50  'Nat
 testdata/Builtins.lc 474:49-474:50  V1
 testdata/Builtins.lc 474:51-474:56  Type
+testdata/Builtins.lc 474:61-474:67  Type->Type
 testdata/Builtins.lc 474:61-474:67  Type
 testdata/Builtins.lc 474:61-474:62  Type
+testdata/Builtins.lc 474:66-474:67  Type->Type
 testdata/Builtins.lc 474:66-474:67  Type
 testdata/Builtins.lc 473:1-473:9  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
 testdata/Builtins.lc 473:11-473:20  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
@@ -2152,7 +2460,8 @@ testdata/Builtins.lc 473:165-473:173  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b '
 testdata/Builtins.lc 473:175-473:183  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
 testdata/Builtins.lc 473:185-473:193  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
 testdata/Builtins.lc 473:195-473:206  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
-testdata/Builtins.lc 475:35-475:72  Type
+testdata/Builtins.lc 475:34-475:72  Type->Type
+testdata/Builtins.lc 475:34-475:72  Type
 testdata/Builtins.lc 475:35-475:36  Type
 testdata/Builtins.lc 475:35-475:36  V3
 testdata/Builtins.lc 475:39-475:56  Type
@@ -2160,14 +2469,18 @@ testdata/Builtins.lc 475:39-475:48  'Nat -> Type->Type
 testdata/Builtins.lc 475:49-475:50  'Nat
 testdata/Builtins.lc 475:49-475:50  V1
 testdata/Builtins.lc 475:51-475:56  Type
+testdata/Builtins.lc 475:61-475:72  Type->Type
 testdata/Builtins.lc 475:61-475:72  Type
 testdata/Builtins.lc 475:61-475:62  Type
+testdata/Builtins.lc 475:66-475:72  Type->Type
 testdata/Builtins.lc 475:66-475:72  Type
 testdata/Builtins.lc 475:66-475:67  Type
+testdata/Builtins.lc 475:71-475:72  Type->Type
 testdata/Builtins.lc 475:71-475:72  Type
 testdata/Builtins.lc 475:1-475:8  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a -> a->a
 testdata/Builtins.lc 475:10-475:19  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a -> a->a
-testdata/Builtins.lc 478:35-478:67  Type
+testdata/Builtins.lc 478:34-478:67  Type->Type
+testdata/Builtins.lc 478:34-478:67  Type
 testdata/Builtins.lc 478:35-478:36  Type
 testdata/Builtins.lc 478:35-478:36  V3
 testdata/Builtins.lc 478:39-478:56  Type
@@ -2175,8 +2488,10 @@ testdata/Builtins.lc 478:39-478:48  'Nat -> Type->Type
 testdata/Builtins.lc 478:49-478:50  'Nat
 testdata/Builtins.lc 478:49-478:50  V1
 testdata/Builtins.lc 478:51-478:56  Type
+testdata/Builtins.lc 478:61-478:67  Type->Type
 testdata/Builtins.lc 478:61-478:67  Type
 testdata/Builtins.lc 478:61-478:62  Type
+testdata/Builtins.lc 478:66-478:67  Type->Type
 testdata/Builtins.lc 478:66-478:67  Type
 testdata/Builtins.lc 477:1-477:10  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
 testdata/Builtins.lc 477:12-477:21  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
@@ -2184,10 +2499,12 @@ testdata/Builtins.lc 477:23-477:32  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Fl
 testdata/Builtins.lc 477:34-477:47  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
 testdata/Builtins.lc 477:49-477:57  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
 testdata/Builtins.lc 477:59-477:68  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
-testdata/Builtins.lc 479:35-479:75  Type
+testdata/Builtins.lc 479:34-479:75  Type->Type
+testdata/Builtins.lc 479:34-479:75  Type
 testdata/Builtins.lc 479:35-479:38  Type->Type
 testdata/Builtins.lc 479:39-479:40  Type
 testdata/Builtins.lc 479:39-479:40  V5
+testdata/Builtins.lc 479:42-479:75  Type->Type
 testdata/Builtins.lc 479:42-479:75  Type
 testdata/Builtins.lc 479:42-479:43  Type
 testdata/Builtins.lc 479:42-479:43  V4
@@ -2196,17 +2513,22 @@ testdata/Builtins.lc 479:46-479:55  'Nat -> Type->Type
 testdata/Builtins.lc 479:56-479:57  'Nat
 testdata/Builtins.lc 479:56-479:57  V2
 testdata/Builtins.lc 479:58-479:59  Type
+testdata/Builtins.lc 479:64-479:75  Type->Type
 testdata/Builtins.lc 479:64-479:75  Type
 testdata/Builtins.lc 479:64-479:65  Type
+testdata/Builtins.lc 479:69-479:75  Type->Type
 testdata/Builtins.lc 479:69-479:75  Type
 testdata/Builtins.lc 479:69-479:70  Type
+testdata/Builtins.lc 479:74-479:75  Type->Type
 testdata/Builtins.lc 479:74-479:75  Type
 testdata/Builtins.lc 479:1-479:8  {a} -> {b} -> {c:'Nat} -> {d : 'Num a} -> {e : b ~ 'VecScalar c a} -> b -> b->b
 testdata/Builtins.lc 479:10-479:17  {a} -> {b} -> {c:'Nat} -> {d : 'Num a} -> {e : b ~ 'VecScalar c a} -> b -> b->b
-testdata/Builtins.lc 480:35-480:75  Type
+testdata/Builtins.lc 480:34-480:75  Type->Type
+testdata/Builtins.lc 480:34-480:75  Type
 testdata/Builtins.lc 480:35-480:38  Type->Type
 testdata/Builtins.lc 480:39-480:40  Type
 testdata/Builtins.lc 480:39-480:40  V5
+testdata/Builtins.lc 480:42-480:75  Type->Type
 testdata/Builtins.lc 480:42-480:75  Type
 testdata/Builtins.lc 480:42-480:43  Type
 testdata/Builtins.lc 480:42-480:43  V4
@@ -2215,14 +2537,18 @@ testdata/Builtins.lc 480:46-480:55  'Nat -> Type->Type
 testdata/Builtins.lc 480:56-480:57  'Nat
 testdata/Builtins.lc 480:56-480:57  V2
 testdata/Builtins.lc 480:58-480:59  Type
+testdata/Builtins.lc 480:64-480:75  Type->Type
 testdata/Builtins.lc 480:64-480:75  Type
 testdata/Builtins.lc 480:64-480:65  Type
+testdata/Builtins.lc 480:69-480:75  Type->Type
 testdata/Builtins.lc 480:69-480:75  Type
 testdata/Builtins.lc 480:69-480:70  Type
+testdata/Builtins.lc 480:74-480:75  Type->Type
 testdata/Builtins.lc 480:74-480:75  Type
 testdata/Builtins.lc 480:1-480:9  {a} -> {b} -> {c:'Nat} -> {d : 'Num a} -> {e : b ~ 'VecScalar c a} -> b -> a->b
 testdata/Builtins.lc 480:11-480:19  {a} -> {b} -> {c:'Nat} -> {d : 'Num a} -> {e : b ~ 'VecScalar c a} -> b -> a->b
-testdata/Builtins.lc 481:35-481:89  Type
+testdata/Builtins.lc 481:34-481:89  Type->Type
+testdata/Builtins.lc 481:34-481:89  Type
 testdata/Builtins.lc 481:35-481:36  Type
 testdata/Builtins.lc 481:35-481:36  V5
 testdata/Builtins.lc 481:39-481:56  Type
@@ -2230,6 +2556,7 @@ testdata/Builtins.lc 481:39-481:48  'Nat -> Type->Type
 testdata/Builtins.lc 481:49-481:50  'Nat
 testdata/Builtins.lc 481:49-481:50  V3
 testdata/Builtins.lc 481:51-481:56  Type
+testdata/Builtins.lc 481:58-481:89  Type->Type
 testdata/Builtins.lc 481:58-481:89  Type
 testdata/Builtins.lc 481:58-481:59  Type
 testdata/Builtins.lc 481:58-481:59  V2
@@ -2237,15 +2564,19 @@ testdata/Builtins.lc 481:62-481:78  Type
 testdata/Builtins.lc 481:62-481:71  'Nat -> Type->Type
 testdata/Builtins.lc 481:72-481:73  'Nat
 testdata/Builtins.lc 481:74-481:78  Type
+testdata/Builtins.lc 481:83-481:89  Type->Type
 testdata/Builtins.lc 481:83-481:89  Type
 testdata/Builtins.lc 481:83-481:84  Type
+testdata/Builtins.lc 481:88-481:89  Type->Type
 testdata/Builtins.lc 481:88-481:89  Type
 testdata/Builtins.lc 481:1-481:10  {a} -> {b:'Nat} -> {c} -> {d : a ~ 'VecScalar b 'Float} -> {e : c ~ 'VecScalar b 'Bool} -> a->c
 testdata/Builtins.lc 481:12-481:21  {a} -> {b:'Nat} -> {c} -> {d : a ~ 'VecScalar b 'Float} -> {e : c ~ 'VecScalar b 'Bool} -> a->c
-testdata/Builtins.lc 482:35-482:73  Type
+testdata/Builtins.lc 482:34-482:73  Type->Type
+testdata/Builtins.lc 482:34-482:73  Type
 testdata/Builtins.lc 482:35-482:41  Type->Type
 testdata/Builtins.lc 482:42-482:43  Type
 testdata/Builtins.lc 482:42-482:43  V5
+testdata/Builtins.lc 482:45-482:73  Type->Type
 testdata/Builtins.lc 482:45-482:73  Type
 testdata/Builtins.lc 482:45-482:46  Type
 testdata/Builtins.lc 482:45-482:46  V4
@@ -2254,12 +2585,15 @@ testdata/Builtins.lc 482:49-482:58  'Nat -> Type->Type
 testdata/Builtins.lc 482:59-482:60  'Nat
 testdata/Builtins.lc 482:59-482:60  V2
 testdata/Builtins.lc 482:61-482:62  Type
+testdata/Builtins.lc 482:67-482:73  Type->Type
 testdata/Builtins.lc 482:67-482:73  Type
 testdata/Builtins.lc 482:67-482:68  Type
+testdata/Builtins.lc 482:72-482:73  Type->Type
 testdata/Builtins.lc 482:72-482:73  Type
 testdata/Builtins.lc 482:1-482:8  {a} -> {b} -> {c:'Nat} -> {d : 'Signed a} -> {e : b ~ 'VecScalar c a} -> b->b
 testdata/Builtins.lc 482:10-482:18  {a} -> {b} -> {c:'Nat} -> {d : 'Signed a} -> {e : b ~ 'VecScalar c a} -> b->b
-testdata/Builtins.lc 483:35-483:72  Type
+testdata/Builtins.lc 483:34-483:72  Type->Type
+testdata/Builtins.lc 483:34-483:72  Type
 testdata/Builtins.lc 483:35-483:36  Type
 testdata/Builtins.lc 483:35-483:36  V3
 testdata/Builtins.lc 483:39-483:56  Type
@@ -2267,17 +2601,20 @@ testdata/Builtins.lc 483:39-483:48  'Nat -> Type->Type
 testdata/Builtins.lc 483:49-483:50  'Nat
 testdata/Builtins.lc 483:49-483:50  V1
 testdata/Builtins.lc 483:51-483:56  Type
+testdata/Builtins.lc 483:61-483:72  Type->Type
 testdata/Builtins.lc 483:61-483:72  Type
 testdata/Builtins.lc 483:61-483:62  Type
+testdata/Builtins.lc 483:66-483:72  Type->Type
 testdata/Builtins.lc 483:66-483:72  Type
-testdata/Builtins.lc 483:66-483:72  Type -> Type->Type
 testdata/Builtins.lc 483:67-483:68  Type
 testdata/Builtins.lc 483:70-483:71  Type
 testdata/Builtins.lc 483:1-483:9  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a -> 'Tuple2 a a
-testdata/Builtins.lc 484:35-484:80  Type
+testdata/Builtins.lc 484:34-484:80  Type->Type
+testdata/Builtins.lc 484:34-484:80  Type
 testdata/Builtins.lc 484:35-484:38  Type->Type
 testdata/Builtins.lc 484:39-484:40  Type
 testdata/Builtins.lc 484:39-484:40  V5
+testdata/Builtins.lc 484:42-484:80  Type->Type
 testdata/Builtins.lc 484:42-484:80  Type
 testdata/Builtins.lc 484:42-484:43  Type
 testdata/Builtins.lc 484:42-484:43  V4
@@ -2286,18 +2623,24 @@ testdata/Builtins.lc 484:46-484:55  'Nat -> Type->Type
 testdata/Builtins.lc 484:56-484:57  'Nat
 testdata/Builtins.lc 484:56-484:57  V2
 testdata/Builtins.lc 484:58-484:59  Type
+testdata/Builtins.lc 484:64-484:80  Type->Type
 testdata/Builtins.lc 484:64-484:80  Type
 testdata/Builtins.lc 484:64-484:65  Type
+testdata/Builtins.lc 484:69-484:80  Type->Type
 testdata/Builtins.lc 484:69-484:80  Type
 testdata/Builtins.lc 484:69-484:70  Type
+testdata/Builtins.lc 484:74-484:80  Type->Type
 testdata/Builtins.lc 484:74-484:80  Type
 testdata/Builtins.lc 484:74-484:75  Type
+testdata/Builtins.lc 484:79-484:80  Type->Type
 testdata/Builtins.lc 484:79-484:80  Type
 testdata/Builtins.lc 484:1-484:10  {a} -> {b} -> {c:'Nat} -> {d : 'Num a} -> {e : b ~ 'VecScalar c a} -> b -> b -> b->b
-testdata/Builtins.lc 485:35-485:80  Type
+testdata/Builtins.lc 485:34-485:80  Type->Type
+testdata/Builtins.lc 485:34-485:80  Type
 testdata/Builtins.lc 485:35-485:38  Type->Type
 testdata/Builtins.lc 485:39-485:40  Type
 testdata/Builtins.lc 485:39-485:40  V5
+testdata/Builtins.lc 485:42-485:80  Type->Type
 testdata/Builtins.lc 485:42-485:80  Type
 testdata/Builtins.lc 485:42-485:43  Type
 testdata/Builtins.lc 485:42-485:43  V4
@@ -2306,15 +2649,20 @@ testdata/Builtins.lc 485:46-485:55  'Nat -> Type->Type
 testdata/Builtins.lc 485:56-485:57  'Nat
 testdata/Builtins.lc 485:56-485:57  V2
 testdata/Builtins.lc 485:58-485:59  Type
+testdata/Builtins.lc 485:64-485:80  Type->Type
 testdata/Builtins.lc 485:64-485:80  Type
 testdata/Builtins.lc 485:64-485:65  Type
+testdata/Builtins.lc 485:69-485:80  Type->Type
 testdata/Builtins.lc 485:69-485:80  Type
 testdata/Builtins.lc 485:69-485:70  Type
+testdata/Builtins.lc 485:74-485:80  Type->Type
 testdata/Builtins.lc 485:74-485:80  Type
 testdata/Builtins.lc 485:74-485:75  Type
+testdata/Builtins.lc 485:79-485:80  Type->Type
 testdata/Builtins.lc 485:79-485:80  Type
 testdata/Builtins.lc 485:1-485:11  {a} -> {b} -> {c:'Nat} -> {d : 'Num a} -> {e : b ~ 'VecScalar c a} -> b -> a -> a->b
-testdata/Builtins.lc 486:35-486:77  Type
+testdata/Builtins.lc 486:34-486:77  Type->Type
+testdata/Builtins.lc 486:34-486:77  Type
 testdata/Builtins.lc 486:35-486:36  Type
 testdata/Builtins.lc 486:35-486:36  V3
 testdata/Builtins.lc 486:39-486:56  Type
@@ -2322,15 +2670,20 @@ testdata/Builtins.lc 486:39-486:48  'Nat -> Type->Type
 testdata/Builtins.lc 486:49-486:50  'Nat
 testdata/Builtins.lc 486:49-486:50  V1
 testdata/Builtins.lc 486:51-486:56  Type
+testdata/Builtins.lc 486:61-486:77  Type->Type
 testdata/Builtins.lc 486:61-486:77  Type
 testdata/Builtins.lc 486:61-486:62  Type
+testdata/Builtins.lc 486:66-486:77  Type->Type
 testdata/Builtins.lc 486:66-486:77  Type
 testdata/Builtins.lc 486:66-486:67  Type
+testdata/Builtins.lc 486:71-486:77  Type->Type
 testdata/Builtins.lc 486:71-486:77  Type
 testdata/Builtins.lc 486:71-486:72  Type
+testdata/Builtins.lc 486:76-486:77  Type->Type
 testdata/Builtins.lc 486:76-486:77  Type
 testdata/Builtins.lc 486:1-486:8  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a -> a -> a->a
-testdata/Builtins.lc 487:35-487:81  Type
+testdata/Builtins.lc 487:34-487:81  Type->Type
+testdata/Builtins.lc 487:34-487:81  Type
 testdata/Builtins.lc 487:35-487:36  Type
 testdata/Builtins.lc 487:35-487:36  V3
 testdata/Builtins.lc 487:39-487:56  Type
@@ -2338,15 +2691,20 @@ testdata/Builtins.lc 487:39-487:48  'Nat -> Type->Type
 testdata/Builtins.lc 487:49-487:50  'Nat
 testdata/Builtins.lc 487:49-487:50  V1
 testdata/Builtins.lc 487:51-487:56  Type
+testdata/Builtins.lc 487:61-487:81  Type->Type
 testdata/Builtins.lc 487:61-487:81  Type
 testdata/Builtins.lc 487:61-487:62  Type
+testdata/Builtins.lc 487:66-487:81  Type->Type
 testdata/Builtins.lc 487:66-487:81  Type
 testdata/Builtins.lc 487:66-487:67  Type
+testdata/Builtins.lc 487:71-487:81  Type->Type
 testdata/Builtins.lc 487:71-487:81  Type
 testdata/Builtins.lc 487:71-487:76  Type
+testdata/Builtins.lc 487:80-487:81  Type->Type
 testdata/Builtins.lc 487:80-487:81  Type
 testdata/Builtins.lc 487:1-487:9  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a -> a -> 'Float->a
-testdata/Builtins.lc 488:35-488:99  Type
+testdata/Builtins.lc 488:34-488:99  Type->Type
+testdata/Builtins.lc 488:34-488:99  Type
 testdata/Builtins.lc 488:35-488:36  Type
 testdata/Builtins.lc 488:35-488:36  V5
 testdata/Builtins.lc 488:39-488:56  Type
@@ -2354,6 +2712,7 @@ testdata/Builtins.lc 488:39-488:48  'Nat -> Type->Type
 testdata/Builtins.lc 488:49-488:50  'Nat
 testdata/Builtins.lc 488:49-488:50  V3
 testdata/Builtins.lc 488:51-488:56  Type
+testdata/Builtins.lc 488:58-488:99  Type->Type
 testdata/Builtins.lc 488:58-488:99  Type
 testdata/Builtins.lc 488:58-488:59  Type
 testdata/Builtins.lc 488:58-488:59  V2
@@ -2361,15 +2720,20 @@ testdata/Builtins.lc 488:62-488:78  Type
 testdata/Builtins.lc 488:62-488:71  'Nat -> Type->Type
 testdata/Builtins.lc 488:72-488:73  'Nat
 testdata/Builtins.lc 488:74-488:78  Type
+testdata/Builtins.lc 488:83-488:99  Type->Type
 testdata/Builtins.lc 488:83-488:99  Type
 testdata/Builtins.lc 488:83-488:84  Type
+testdata/Builtins.lc 488:88-488:99  Type->Type
 testdata/Builtins.lc 488:88-488:99  Type
 testdata/Builtins.lc 488:88-488:89  Type
+testdata/Builtins.lc 488:93-488:99  Type->Type
 testdata/Builtins.lc 488:93-488:99  Type
 testdata/Builtins.lc 488:93-488:94  Type
+testdata/Builtins.lc 488:98-488:99  Type->Type
 testdata/Builtins.lc 488:98-488:99  Type
 testdata/Builtins.lc 488:1-488:9  {a} -> {b:'Nat} -> {c} -> {d : a ~ 'VecScalar b 'Float} -> {e : c ~ 'VecScalar b 'Bool} -> a -> a -> c->a
-testdata/Builtins.lc 489:35-489:68  Type
+testdata/Builtins.lc 489:34-489:68  Type->Type
+testdata/Builtins.lc 489:34-489:68  Type
 testdata/Builtins.lc 489:35-489:36  Type
 testdata/Builtins.lc 489:35-489:36  V3
 testdata/Builtins.lc 489:39-489:52  Type
@@ -2377,13 +2741,17 @@ testdata/Builtins.lc 489:39-489:44  'Nat -> Type->Type
 testdata/Builtins.lc 489:45-489:46  'Nat
 testdata/Builtins.lc 489:45-489:46  V1
 testdata/Builtins.lc 489:47-489:52  Type
+testdata/Builtins.lc 489:57-489:68  Type->Type
 testdata/Builtins.lc 489:57-489:68  Type
 testdata/Builtins.lc 489:57-489:58  Type
+testdata/Builtins.lc 489:62-489:68  Type->Type
 testdata/Builtins.lc 489:62-489:68  Type
 testdata/Builtins.lc 489:62-489:63  Type
+testdata/Builtins.lc 489:67-489:68  Type->Type
 testdata/Builtins.lc 489:67-489:68  Type
 testdata/Builtins.lc 489:1-489:9  {a} -> {b:'Nat} -> {c : a ~ 'VecS 'Float b} -> a -> a->a
-testdata/Builtins.lc 490:35-490:76  Type
+testdata/Builtins.lc 490:34-490:76  Type->Type
+testdata/Builtins.lc 490:34-490:76  Type
 testdata/Builtins.lc 490:35-490:36  Type
 testdata/Builtins.lc 490:35-490:36  V3
 testdata/Builtins.lc 490:39-490:56  Type
@@ -2391,13 +2759,17 @@ testdata/Builtins.lc 490:39-490:48  'Nat -> Type->Type
 testdata/Builtins.lc 490:49-490:50  'Nat
 testdata/Builtins.lc 490:49-490:50  V1
 testdata/Builtins.lc 490:51-490:56  Type
+testdata/Builtins.lc 490:61-490:76  Type->Type
 testdata/Builtins.lc 490:61-490:76  Type
 testdata/Builtins.lc 490:61-490:66  Type
+testdata/Builtins.lc 490:70-490:76  Type->Type
 testdata/Builtins.lc 490:70-490:76  Type
 testdata/Builtins.lc 490:70-490:71  Type
+testdata/Builtins.lc 490:75-490:76  Type->Type
 testdata/Builtins.lc 490:75-490:76  Type
 testdata/Builtins.lc 490:1-490:10  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> 'Float -> a->a
-testdata/Builtins.lc 491:35-491:73  Type
+testdata/Builtins.lc 491:34-491:73  Type->Type
+testdata/Builtins.lc 491:34-491:73  Type
 testdata/Builtins.lc 491:35-491:36  Type
 testdata/Builtins.lc 491:35-491:36  V3
 testdata/Builtins.lc 491:39-491:52  Type
@@ -2405,15 +2777,20 @@ testdata/Builtins.lc 491:39-491:44  'Nat -> Type->Type
 testdata/Builtins.lc 491:45-491:46  'Nat
 testdata/Builtins.lc 491:45-491:46  V1
 testdata/Builtins.lc 491:47-491:52  Type
+testdata/Builtins.lc 491:57-491:73  Type->Type
 testdata/Builtins.lc 491:57-491:73  Type
 testdata/Builtins.lc 491:57-491:58  Type
+testdata/Builtins.lc 491:62-491:73  Type->Type
 testdata/Builtins.lc 491:62-491:73  Type
 testdata/Builtins.lc 491:62-491:63  Type
+testdata/Builtins.lc 491:67-491:73  Type->Type
 testdata/Builtins.lc 491:67-491:73  Type
 testdata/Builtins.lc 491:67-491:68  Type
+testdata/Builtins.lc 491:72-491:73  Type->Type
 testdata/Builtins.lc 491:72-491:73  Type
 testdata/Builtins.lc 491:1-491:15  {a} -> {b:'Nat} -> {c : a ~ 'VecS 'Float b} -> a -> a -> a->a
-testdata/Builtins.lc 492:35-492:85  Type
+testdata/Builtins.lc 492:34-492:85  Type->Type
+testdata/Builtins.lc 492:34-492:85  Type
 testdata/Builtins.lc 492:35-492:36  Type
 testdata/Builtins.lc 492:35-492:36  V3
 testdata/Builtins.lc 492:39-492:56  Type
@@ -2421,55 +2798,68 @@ testdata/Builtins.lc 492:39-492:48  'Nat -> Type->Type
 testdata/Builtins.lc 492:49-492:50  'Nat
 testdata/Builtins.lc 492:49-492:50  V1
 testdata/Builtins.lc 492:51-492:56  Type
+testdata/Builtins.lc 492:61-492:85  Type->Type
 testdata/Builtins.lc 492:61-492:85  Type
 testdata/Builtins.lc 492:61-492:66  Type
+testdata/Builtins.lc 492:70-492:85  Type->Type
 testdata/Builtins.lc 492:70-492:85  Type
 testdata/Builtins.lc 492:70-492:75  Type
+testdata/Builtins.lc 492:79-492:85  Type->Type
 testdata/Builtins.lc 492:79-492:85  Type
 testdata/Builtins.lc 492:79-492:80  Type
+testdata/Builtins.lc 492:84-492:85  Type->Type
 testdata/Builtins.lc 492:84-492:85  Type
 testdata/Builtins.lc 492:1-492:16  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> 'Float -> 'Float -> a->a
+testdata/Builtins.lc 495:34-495:70  Type->Type
 testdata/Builtins.lc 495:34-495:70  Type
 testdata/Builtins.lc 495:34-495:43  'Nat -> Type->Type
 testdata/Builtins.lc 495:44-495:45  'Nat
 testdata/Builtins.lc 495:44-495:45  V1
 testdata/Builtins.lc 495:46-495:51  Type
+testdata/Builtins.lc 495:55-495:70  Type->Type
 testdata/Builtins.lc 495:55-495:70  Type
 testdata/Builtins.lc 495:55-495:64  'Nat -> Type->Type
 testdata/Builtins.lc 495:65-495:66  'Nat
 testdata/Builtins.lc 495:67-495:70  Type
 testdata/Builtins.lc 495:1-495:19  {a:'Nat} -> 'VecScalar a 'Float -> 'VecScalar a 'Int
+testdata/Builtins.lc 496:34-496:71  Type->Type
 testdata/Builtins.lc 496:34-496:71  Type
 testdata/Builtins.lc 496:34-496:43  'Nat -> Type->Type
 testdata/Builtins.lc 496:44-496:45  'Nat
 testdata/Builtins.lc 496:44-496:45  V1
 testdata/Builtins.lc 496:46-496:51  Type
+testdata/Builtins.lc 496:55-496:71  Type->Type
 testdata/Builtins.lc 496:55-496:71  Type
 testdata/Builtins.lc 496:55-496:64  'Nat -> Type->Type
 testdata/Builtins.lc 496:65-496:66  'Nat
 testdata/Builtins.lc 496:67-496:71  Type
 testdata/Builtins.lc 496:1-496:20  {a:'Nat} -> 'VecScalar a 'Float -> 'VecScalar a 'Word
+testdata/Builtins.lc 497:34-497:72  Type->Type
 testdata/Builtins.lc 497:34-497:72  Type
 testdata/Builtins.lc 497:34-497:43  'Nat -> Type->Type
 testdata/Builtins.lc 497:44-497:45  'Nat
 testdata/Builtins.lc 497:44-497:45  V1
 testdata/Builtins.lc 497:46-497:49  Type
+testdata/Builtins.lc 497:55-497:72  Type->Type
 testdata/Builtins.lc 497:55-497:72  Type
 testdata/Builtins.lc 497:55-497:64  'Nat -> Type->Type
 testdata/Builtins.lc 497:65-497:66  'Nat
 testdata/Builtins.lc 497:67-497:72  Type
 testdata/Builtins.lc 497:1-497:19  {a:'Nat} -> 'VecScalar a 'Int -> 'VecScalar a 'Float
+testdata/Builtins.lc 498:34-498:72  Type->Type
 testdata/Builtins.lc 498:34-498:72  Type
 testdata/Builtins.lc 498:34-498:43  'Nat -> Type->Type
 testdata/Builtins.lc 498:44-498:45  'Nat
 testdata/Builtins.lc 498:44-498:45  V1
 testdata/Builtins.lc 498:46-498:50  Type
+testdata/Builtins.lc 498:55-498:72  Type->Type
 testdata/Builtins.lc 498:55-498:72  Type
 testdata/Builtins.lc 498:55-498:64  'Nat -> Type->Type
 testdata/Builtins.lc 498:65-498:66  'Nat
 testdata/Builtins.lc 498:67-498:72  Type
 testdata/Builtins.lc 498:1-498:20  {a:'Nat} -> 'VecScalar a 'Word -> 'VecScalar a 'Float
-testdata/Builtins.lc 500:35-500:71  Type
+testdata/Builtins.lc 500:34-500:71  Type->Type
+testdata/Builtins.lc 500:34-500:71  Type
 testdata/Builtins.lc 500:35-500:36  Type
 testdata/Builtins.lc 500:35-500:36  V3
 testdata/Builtins.lc 500:39-500:56  Type
@@ -2477,11 +2867,14 @@ testdata/Builtins.lc 500:39-500:48  'Nat -> Type->Type
 testdata/Builtins.lc 500:49-500:50  'Nat
 testdata/Builtins.lc 500:49-500:50  V1
 testdata/Builtins.lc 500:51-500:56  Type
+testdata/Builtins.lc 500:61-500:71  Type->Type
 testdata/Builtins.lc 500:61-500:71  Type
 testdata/Builtins.lc 500:61-500:62  Type
+testdata/Builtins.lc 500:66-500:71  Type->Type
 testdata/Builtins.lc 500:66-500:71  Type
 testdata/Builtins.lc 500:1-500:11  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->'Float
-testdata/Builtins.lc 501:35-501:76  Type
+testdata/Builtins.lc 501:34-501:76  Type->Type
+testdata/Builtins.lc 501:34-501:76  Type
 testdata/Builtins.lc 501:35-501:36  Type
 testdata/Builtins.lc 501:35-501:36  V3
 testdata/Builtins.lc 501:39-501:56  Type
@@ -2489,26 +2882,35 @@ testdata/Builtins.lc 501:39-501:48  'Nat -> Type->Type
 testdata/Builtins.lc 501:49-501:50  'Nat
 testdata/Builtins.lc 501:49-501:50  V1
 testdata/Builtins.lc 501:51-501:56  Type
+testdata/Builtins.lc 501:61-501:76  Type->Type
 testdata/Builtins.lc 501:61-501:76  Type
 testdata/Builtins.lc 501:61-501:62  Type
+testdata/Builtins.lc 501:66-501:76  Type->Type
 testdata/Builtins.lc 501:66-501:76  Type
 testdata/Builtins.lc 501:66-501:67  Type
+testdata/Builtins.lc 501:71-501:76  Type->Type
 testdata/Builtins.lc 501:71-501:76  Type
 testdata/Builtins.lc 501:1-501:13  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a -> a->'Float
 testdata/Builtins.lc 501:15-501:22  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a -> a->'Float
-testdata/Builtins.lc 502:35-502:72  Type
+testdata/Builtins.lc 502:34-502:72  Type->Type
+testdata/Builtins.lc 502:34-502:72  Type
 testdata/Builtins.lc 502:35-502:36  Type
 testdata/Builtins.lc 502:35-502:36  V1
 testdata/Builtins.lc 502:39-502:56  Type
 testdata/Builtins.lc 502:39-502:48  'Nat -> Type->Type
+testdata/Builtins.lc 502:49-502:50  'Nat
 testdata/Builtins.lc 502:51-502:56  Type
+testdata/Builtins.lc 502:61-502:72  Type->Type
 testdata/Builtins.lc 502:61-502:72  Type
 testdata/Builtins.lc 502:61-502:62  Type
+testdata/Builtins.lc 502:66-502:72  Type->Type
 testdata/Builtins.lc 502:66-502:72  Type
 testdata/Builtins.lc 502:66-502:67  Type
+testdata/Builtins.lc 502:71-502:72  Type->Type
 testdata/Builtins.lc 502:71-502:72  Type
 testdata/Builtins.lc 502:1-502:10  {a} -> {b : a ~ 'VecS 'Float (Succ (Succ (Succ Zero)))} -> a -> a->a
-testdata/Builtins.lc 503:35-503:67  Type
+testdata/Builtins.lc 503:34-503:67  Type->Type
+testdata/Builtins.lc 503:34-503:67  Type
 testdata/Builtins.lc 503:35-503:36  Type
 testdata/Builtins.lc 503:35-503:36  V3
 testdata/Builtins.lc 503:39-503:56  Type
@@ -2516,11 +2918,14 @@ testdata/Builtins.lc 503:39-503:48  'Nat -> Type->Type
 testdata/Builtins.lc 503:49-503:50  'Nat
 testdata/Builtins.lc 503:49-503:50  V1
 testdata/Builtins.lc 503:51-503:56  Type
+testdata/Builtins.lc 503:61-503:67  Type->Type
 testdata/Builtins.lc 503:61-503:67  Type
 testdata/Builtins.lc 503:61-503:62  Type
+testdata/Builtins.lc 503:66-503:67  Type->Type
 testdata/Builtins.lc 503:66-503:67  Type
 testdata/Builtins.lc 503:1-503:14  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
-testdata/Builtins.lc 504:35-504:77  Type
+testdata/Builtins.lc 504:34-504:77  Type->Type
+testdata/Builtins.lc 504:34-504:77  Type
 testdata/Builtins.lc 504:35-504:36  Type
 testdata/Builtins.lc 504:35-504:36  V3
 testdata/Builtins.lc 504:39-504:56  Type
@@ -2528,16 +2933,21 @@ testdata/Builtins.lc 504:39-504:48  'Nat -> Type->Type
 testdata/Builtins.lc 504:49-504:50  'Nat
 testdata/Builtins.lc 504:49-504:50  V1
 testdata/Builtins.lc 504:51-504:56  Type
+testdata/Builtins.lc 504:61-504:77  Type->Type
 testdata/Builtins.lc 504:61-504:77  Type
 testdata/Builtins.lc 504:61-504:62  Type
+testdata/Builtins.lc 504:66-504:77  Type->Type
 testdata/Builtins.lc 504:66-504:77  Type
 testdata/Builtins.lc 504:66-504:67  Type
+testdata/Builtins.lc 504:71-504:77  Type->Type
 testdata/Builtins.lc 504:71-504:77  Type
 testdata/Builtins.lc 504:71-504:72  Type
+testdata/Builtins.lc 504:76-504:77  Type->Type
 testdata/Builtins.lc 504:76-504:77  Type
 testdata/Builtins.lc 504:1-504:16  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a -> a -> a->a
 testdata/Builtins.lc 504:18-504:29  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a -> a -> a->a
-testdata/Builtins.lc 505:35-505:72  Type
+testdata/Builtins.lc 505:34-505:72  Type->Type
+testdata/Builtins.lc 505:34-505:72  Type
 testdata/Builtins.lc 505:35-505:36  Type
 testdata/Builtins.lc 505:35-505:36  V3
 testdata/Builtins.lc 505:39-505:56  Type
@@ -2545,12 +2955,16 @@ testdata/Builtins.lc 505:39-505:48  'Nat -> Type->Type
 testdata/Builtins.lc 505:49-505:50  'Nat
 testdata/Builtins.lc 505:49-505:50  V1
 testdata/Builtins.lc 505:51-505:56  Type
+testdata/Builtins.lc 505:61-505:72  Type->Type
 testdata/Builtins.lc 505:61-505:72  Type
 testdata/Builtins.lc 505:61-505:62  Type
+testdata/Builtins.lc 505:66-505:72  Type->Type
 testdata/Builtins.lc 505:66-505:72  Type
 testdata/Builtins.lc 505:66-505:67  Type
+testdata/Builtins.lc 505:71-505:72  Type->Type
 testdata/Builtins.lc 505:71-505:72  Type
 testdata/Builtins.lc 505:1-505:12  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a -> a->a
+testdata/Builtins.lc 507:34-507:56  Type->Type
 testdata/Builtins.lc 507:34-507:56  Type
 testdata/Builtins.lc 507:34-507:37  'Nat -> 'Nat -> Type->Type
 testdata/Builtins.lc 507:38-507:39  'Nat
@@ -2559,12 +2973,14 @@ testdata/Builtins.lc 507:40-507:41  'Nat
 testdata/Builtins.lc 507:40-507:41  V3
 testdata/Builtins.lc 507:42-507:43  Type
 testdata/Builtins.lc 507:42-507:43  V1
+testdata/Builtins.lc 507:47-507:56  Type->Type
 testdata/Builtins.lc 507:47-507:56  Type
 testdata/Builtins.lc 507:47-507:50  'Nat -> 'Nat -> Type->Type
 testdata/Builtins.lc 507:51-507:52  'Nat
 testdata/Builtins.lc 507:53-507:54  'Nat
 testdata/Builtins.lc 507:55-507:56  Type
 testdata/Builtins.lc 507:1-507:14  {a:'Nat} -> {b:'Nat} -> {c} -> 'Mat a b c -> 'Mat b a c
+testdata/Builtins.lc 508:34-508:52  Type->Type
 testdata/Builtins.lc 508:34-508:52  Type
 testdata/Builtins.lc 508:34-508:37  'Nat -> 'Nat -> Type->Type
 testdata/Builtins.lc 508:38-508:39  'Nat
@@ -2572,8 +2988,10 @@ testdata/Builtins.lc 508:38-508:39  V3
 testdata/Builtins.lc 508:40-508:41  'Nat
 testdata/Builtins.lc 508:42-508:43  Type
 testdata/Builtins.lc 508:42-508:43  V1
+testdata/Builtins.lc 508:47-508:52  Type->Type
 testdata/Builtins.lc 508:47-508:52  Type
 testdata/Builtins.lc 508:1-508:16  {a:'Nat} -> {b} -> 'Mat a a b -> 'Float
+testdata/Builtins.lc 509:34-509:56  Type->Type
 testdata/Builtins.lc 509:34-509:56  Type
 testdata/Builtins.lc 509:34-509:37  'Nat -> 'Nat -> Type->Type
 testdata/Builtins.lc 509:38-509:39  'Nat
@@ -2581,29 +2999,34 @@ testdata/Builtins.lc 509:38-509:39  V3
 testdata/Builtins.lc 509:40-509:41  'Nat
 testdata/Builtins.lc 509:42-509:43  Type
 testdata/Builtins.lc 509:42-509:43  V1
+testdata/Builtins.lc 509:47-509:56  Type->Type
 testdata/Builtins.lc 509:47-509:56  Type
 testdata/Builtins.lc 509:47-509:50  'Nat -> 'Nat -> Type->Type
 testdata/Builtins.lc 509:51-509:52  'Nat
 testdata/Builtins.lc 509:53-509:54  'Nat
 testdata/Builtins.lc 509:55-509:56  Type
 testdata/Builtins.lc 509:1-509:12  {a:'Nat} -> {b} -> 'Mat a a b -> 'Mat a a b
+testdata/Builtins.lc 510:34-510:69  Type->Type
 testdata/Builtins.lc 510:34-510:69  Type
 testdata/Builtins.lc 510:34-510:37  'Nat -> Type->Type
 testdata/Builtins.lc 510:38-510:39  'Nat
 testdata/Builtins.lc 510:38-510:39  V5
 testdata/Builtins.lc 510:40-510:41  Type
 testdata/Builtins.lc 510:40-510:41  V3
+testdata/Builtins.lc 510:47-510:69  Type->Type
 testdata/Builtins.lc 510:47-510:69  Type
 testdata/Builtins.lc 510:47-510:50  'Nat -> Type->Type
 testdata/Builtins.lc 510:51-510:52  'Nat
 testdata/Builtins.lc 510:51-510:52  V2
 testdata/Builtins.lc 510:53-510:54  Type
+testdata/Builtins.lc 510:60-510:69  Type->Type
 testdata/Builtins.lc 510:60-510:69  Type
 testdata/Builtins.lc 510:60-510:63  'Nat -> 'Nat -> Type->Type
 testdata/Builtins.lc 510:64-510:65  'Nat
 testdata/Builtins.lc 510:66-510:67  'Nat
 testdata/Builtins.lc 510:68-510:69  Type
 testdata/Builtins.lc 510:1-510:17  {a:'Nat} -> {b} -> {c:'Nat} -> 'VecS b a -> 'VecS b c -> 'Mat c a b
+testdata/Builtins.lc 511:34-511:67  Type->Type
 testdata/Builtins.lc 511:34-511:67  Type
 testdata/Builtins.lc 511:34-511:37  'Nat -> 'Nat -> Type->Type
 testdata/Builtins.lc 511:38-511:39  'Nat
@@ -2612,32 +3035,38 @@ testdata/Builtins.lc 511:40-511:41  'Nat
 testdata/Builtins.lc 511:40-511:41  V3
 testdata/Builtins.lc 511:42-511:43  Type
 testdata/Builtins.lc 511:42-511:43  V1
+testdata/Builtins.lc 511:47-511:67  Type->Type
 testdata/Builtins.lc 511:47-511:67  Type
 testdata/Builtins.lc 511:47-511:50  'Nat -> Type->Type
 testdata/Builtins.lc 511:51-511:52  'Nat
 testdata/Builtins.lc 511:53-511:54  Type
+testdata/Builtins.lc 511:60-511:67  Type->Type
 testdata/Builtins.lc 511:60-511:67  Type
 testdata/Builtins.lc 511:60-511:63  'Nat -> Type->Type
 testdata/Builtins.lc 511:64-511:65  'Nat
 testdata/Builtins.lc 511:66-511:67  Type
 testdata/Builtins.lc 511:1-511:14  {a:'Nat} -> {b:'Nat} -> {c} -> 'Mat a b c -> 'VecS c b -> 'VecS c a
+testdata/Builtins.lc 512:34-512:67  Type->Type
 testdata/Builtins.lc 512:34-512:67  Type
 testdata/Builtins.lc 512:34-512:37  'Nat -> Type->Type
 testdata/Builtins.lc 512:38-512:39  'Nat
 testdata/Builtins.lc 512:38-512:39  V5
 testdata/Builtins.lc 512:40-512:41  Type
 testdata/Builtins.lc 512:40-512:41  V3
+testdata/Builtins.lc 512:47-512:67  Type->Type
 testdata/Builtins.lc 512:47-512:67  Type
 testdata/Builtins.lc 512:47-512:50  'Nat -> 'Nat -> Type->Type
 testdata/Builtins.lc 512:51-512:52  'Nat
 testdata/Builtins.lc 512:53-512:54  'Nat
 testdata/Builtins.lc 512:53-512:54  V2
 testdata/Builtins.lc 512:55-512:56  Type
+testdata/Builtins.lc 512:60-512:67  Type->Type
 testdata/Builtins.lc 512:60-512:67  Type
 testdata/Builtins.lc 512:60-512:63  'Nat -> Type->Type
 testdata/Builtins.lc 512:64-512:65  'Nat
 testdata/Builtins.lc 512:66-512:67  Type
 testdata/Builtins.lc 512:1-512:14  {a:'Nat} -> {b} -> {c:'Nat} -> 'VecS b a -> 'Mat a c b -> 'VecS b c
+testdata/Builtins.lc 513:34-513:69  Type->Type
 testdata/Builtins.lc 513:34-513:69  Type
 testdata/Builtins.lc 513:34-513:37  'Nat -> 'Nat -> Type->Type
 testdata/Builtins.lc 513:38-513:39  'Nat
@@ -2646,22 +3075,26 @@ testdata/Builtins.lc 513:40-513:41  'Nat
 testdata/Builtins.lc 513:40-513:41  V5
 testdata/Builtins.lc 513:42-513:43  Type
 testdata/Builtins.lc 513:42-513:43  V3
+testdata/Builtins.lc 513:47-513:69  Type->Type
 testdata/Builtins.lc 513:47-513:69  Type
 testdata/Builtins.lc 513:47-513:50  'Nat -> 'Nat -> Type->Type
 testdata/Builtins.lc 513:51-513:52  'Nat
 testdata/Builtins.lc 513:53-513:54  'Nat
 testdata/Builtins.lc 513:53-513:54  V2
 testdata/Builtins.lc 513:55-513:56  Type
+testdata/Builtins.lc 513:60-513:69  Type->Type
 testdata/Builtins.lc 513:60-513:69  Type
 testdata/Builtins.lc 513:60-513:63  'Nat -> 'Nat -> Type->Type
 testdata/Builtins.lc 513:64-513:65  'Nat
 testdata/Builtins.lc 513:66-513:67  'Nat
 testdata/Builtins.lc 513:68-513:69  Type
 testdata/Builtins.lc 513:1-513:14  {a:'Nat} -> {b:'Nat} -> {c} -> {d:'Nat} -> 'Mat a b c -> 'Mat b d c -> 'Mat a d c
-testdata/Builtins.lc 516:35-516:97  Type
+testdata/Builtins.lc 516:34-516:97  Type->Type
+testdata/Builtins.lc 516:34-516:97  Type
 testdata/Builtins.lc 516:35-516:38  Type->Type
 testdata/Builtins.lc 516:39-516:40  Type
 testdata/Builtins.lc 516:39-516:40  V7
+testdata/Builtins.lc 516:42-516:97  Type->Type
 testdata/Builtins.lc 516:42-516:97  Type
 testdata/Builtins.lc 516:42-516:43  Type
 testdata/Builtins.lc 516:42-516:43  V6
@@ -2670,6 +3103,7 @@ testdata/Builtins.lc 516:46-516:55  'Nat -> Type->Type
 testdata/Builtins.lc 516:56-516:57  'Nat
 testdata/Builtins.lc 516:56-516:57  V4
 testdata/Builtins.lc 516:58-516:59  Type
+testdata/Builtins.lc 516:61-516:97  Type->Type
 testdata/Builtins.lc 516:61-516:97  Type
 testdata/Builtins.lc 516:61-516:62  Type
 testdata/Builtins.lc 516:61-516:62  V3
@@ -2677,10 +3111,13 @@ testdata/Builtins.lc 516:65-516:81  Type
 testdata/Builtins.lc 516:65-516:74  'Nat -> Type->Type
 testdata/Builtins.lc 516:75-516:76  'Nat
 testdata/Builtins.lc 516:77-516:81  Type
+testdata/Builtins.lc 516:86-516:97  Type->Type
 testdata/Builtins.lc 516:86-516:97  Type
 testdata/Builtins.lc 516:86-516:87  Type
+testdata/Builtins.lc 516:91-516:97  Type->Type
 testdata/Builtins.lc 516:91-516:97  Type
 testdata/Builtins.lc 516:91-516:92  Type
+testdata/Builtins.lc 516:96-516:97  Type->Type
 testdata/Builtins.lc 516:96-516:97  Type
 testdata/Builtins.lc 515:1-515:13  {a} -> {b} -> {c:'Nat} -> {d} -> {e : 'Num a} -> {f : b ~ 'VecScalar c a} -> {g : d ~ 'VecScalar c 'Bool} -> b -> b->d
 testdata/Builtins.lc 515:15-515:32  {a} -> {b} -> {c:'Nat} -> {d} -> {e : 'Num a} -> {f : b ~ 'VecScalar c a} -> {g : d ~ 'VecScalar c 'Bool} -> b -> b->d
@@ -2688,21 +3125,26 @@ testdata/Builtins.lc 515:34-515:49  {a} -> {b} -> {c:'Nat} -> {d} -> {e : 'Num a
 testdata/Builtins.lc 515:51-515:71  {a} -> {b} -> {c:'Nat} -> {d} -> {e : 'Num a} -> {f : b ~ 'VecScalar c a} -> {g : d ~ 'VecScalar c 'Bool} -> b -> b->d
 testdata/Builtins.lc 515:73-515:83  {a} -> {b} -> {c:'Nat} -> {d} -> {e : 'Num a} -> {f : b ~ 'VecScalar c a} -> {g : d ~ 'VecScalar c 'Bool} -> b -> b->d
 testdata/Builtins.lc 515:85-515:98  {a} -> {b} -> {c:'Nat} -> {d} -> {e : 'Num a} -> {f : b ~ 'VecScalar c a} -> {g : d ~ 'VecScalar c 'Bool} -> b -> b->d
-testdata/Builtins.lc 517:35-517:76  Type
+testdata/Builtins.lc 517:34-517:76  Type->Type
+testdata/Builtins.lc 517:34-517:76  Type
 testdata/Builtins.lc 517:35-517:36  Type
 testdata/Builtins.lc 517:35-517:36  V3
 testdata/Builtins.lc 517:39-517:57  Type
 testdata/Builtins.lc 517:39-517:55  Type->Type
 testdata/Builtins.lc 517:56-517:57  Type
 testdata/Builtins.lc 517:56-517:57  V1
+testdata/Builtins.lc 517:62-517:76  Type->Type
 testdata/Builtins.lc 517:62-517:76  Type
 testdata/Builtins.lc 517:62-517:63  Type
+testdata/Builtins.lc 517:67-517:76  Type->Type
 testdata/Builtins.lc 517:67-517:76  Type
 testdata/Builtins.lc 517:67-517:68  Type
+testdata/Builtins.lc 517:72-517:76  Type->Type
 testdata/Builtins.lc 517:72-517:76  Type
 testdata/Builtins.lc 517:1-517:10  {a} -> {b} -> {c : a ~ 'MatVecScalarElem b} -> b -> b->'Bool
 testdata/Builtins.lc 517:12-517:24  {a} -> {b} -> {c : a ~ 'MatVecScalarElem b} -> b -> b->'Bool
-testdata/Builtins.lc 520:35-520:67  Type
+testdata/Builtins.lc 520:34-520:67  Type->Type
+testdata/Builtins.lc 520:34-520:67  Type
 testdata/Builtins.lc 520:35-520:36  Type
 testdata/Builtins.lc 520:35-520:36  V3
 testdata/Builtins.lc 520:39-520:56  Type
@@ -2710,105 +3152,139 @@ testdata/Builtins.lc 520:39-520:48  'Nat -> Type->Type
 testdata/Builtins.lc 520:49-520:50  'Nat
 testdata/Builtins.lc 520:49-520:50  V1
 testdata/Builtins.lc 520:51-520:56  Type
+testdata/Builtins.lc 520:61-520:67  Type->Type
 testdata/Builtins.lc 520:61-520:67  Type
 testdata/Builtins.lc 520:61-520:62  Type
+testdata/Builtins.lc 520:66-520:67  Type->Type
 testdata/Builtins.lc 520:66-520:67  Type
 testdata/Builtins.lc 519:1-519:9  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
 testdata/Builtins.lc 519:11-519:19  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
 testdata/Builtins.lc 519:21-519:31  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
+testdata/Builtins.lc 522:34-522:60  Type->Type
 testdata/Builtins.lc 522:34-522:60  Type
 testdata/Builtins.lc 522:34-522:43  'Nat -> Type->Type
 testdata/Builtins.lc 522:44-522:45  'Nat
 testdata/Builtins.lc 522:44-522:45  V1
 testdata/Builtins.lc 522:46-522:51  Type
+testdata/Builtins.lc 522:55-522:60  Type->Type
 testdata/Builtins.lc 522:55-522:60  Type
 testdata/Builtins.lc 522:1-522:11  {a:'Nat} -> 'VecScalar a 'Float -> 'Float
+testdata/Builtins.lc 523:34-523:66  Type->Type
 testdata/Builtins.lc 523:34-523:66  Type
 testdata/Builtins.lc 523:34-523:43  'Nat -> Type->Type
 testdata/Builtins.lc 523:44-523:45  'Nat
 testdata/Builtins.lc 523:44-523:45  V1
 testdata/Builtins.lc 523:46-523:51  Type
+testdata/Builtins.lc 523:55-523:66  Type->Type
 testdata/Builtins.lc 523:55-523:66  Type
 testdata/Builtins.lc 523:55-523:58  'Nat -> Type->Type
+testdata/Builtins.lc 523:59-523:60  'Nat
 testdata/Builtins.lc 523:61-523:66  Type
 testdata/Builtins.lc 523:1-523:11  {a:'Nat} -> 'VecScalar a 'Float -> 'VecS 'Float (Succ (Succ Zero))
+testdata/Builtins.lc 524:34-524:66  Type->Type
 testdata/Builtins.lc 524:34-524:66  Type
 testdata/Builtins.lc 524:34-524:43  'Nat -> Type->Type
 testdata/Builtins.lc 524:44-524:45  'Nat
 testdata/Builtins.lc 524:44-524:45  V1
 testdata/Builtins.lc 524:46-524:51  Type
+testdata/Builtins.lc 524:55-524:66  Type->Type
 testdata/Builtins.lc 524:55-524:66  Type
 testdata/Builtins.lc 524:55-524:58  'Nat -> Type->Type
+testdata/Builtins.lc 524:59-524:60  'Nat
 testdata/Builtins.lc 524:61-524:66  Type
 testdata/Builtins.lc 524:1-524:11  {a:'Nat} -> 'VecScalar a 'Float -> 'VecS 'Float (Succ (Succ (Succ Zero)))
+testdata/Builtins.lc 525:34-525:66  Type->Type
 testdata/Builtins.lc 525:34-525:66  Type
 testdata/Builtins.lc 525:34-525:43  'Nat -> Type->Type
 testdata/Builtins.lc 525:44-525:45  'Nat
 testdata/Builtins.lc 525:44-525:45  V1
 testdata/Builtins.lc 525:46-525:51  Type
+testdata/Builtins.lc 525:55-525:66  Type->Type
 testdata/Builtins.lc 525:55-525:66  Type
 testdata/Builtins.lc 525:55-525:58  'Nat -> Type->Type
+testdata/Builtins.lc 525:59-525:60  'Nat
 testdata/Builtins.lc 525:61-525:66  Type
 testdata/Builtins.lc 525:1-525:11  {a:'Nat} -> 'VecScalar a 'Float -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
 testdata/Builtins.lc 541:6-541:13  Type
 testdata/Builtins.lc 542:20-542:26  Type
+testdata/Builtins.lc 543:20-543:27  Type->Type
 testdata/Builtins.lc 543:20-543:27  Type
 testdata/Builtins.lc 542:3-542:16  'String->'Texture
 testdata/Builtins.lc 545:20-545:23  'Nat -> Type->Type
+testdata/Builtins.lc 545:24-545:25  'Nat
 testdata/Builtins.lc 545:26-545:29  Type
+testdata/Builtins.lc 546:20-547:27  Type->Type
 testdata/Builtins.lc 546:20-547:27  Type
 testdata/Builtins.lc 546:20-546:25  'Nat -> Type->Type
-testdata/Builtins.lc 546:29-546:47  Type
+testdata/Builtins.lc 546:26-546:27  'Nat
+testdata/Builtins.lc 546:28-546:49  Type
 testdata/Builtins.lc 546:29-546:34  Type->Type
-testdata/Builtins.lc 546:36-546:47  Type
+testdata/Builtins.lc 546:35-546:48  Type
 testdata/Builtins.lc 546:36-546:39  'Nat -> Type->Type
+testdata/Builtins.lc 546:40-546:41  'Nat
 testdata/Builtins.lc 546:42-546:47  Type
+testdata/Builtins.lc 547:20-547:27  Type->Type
 testdata/Builtins.lc 547:20-547:27  Type
 testdata/Builtins.lc 545:3-545:12  'VecS 'Int (Succ (Succ Zero)) -> 'Image (Succ Zero) ('Color ('VecS 'Float (Succ (Succ (Succ (Succ Zero)))))) -> 'Texture
+testdata/Builtins.lc 541:6-545:12  Type->Type
 testdata/Builtins.lc 541:6-545:12  Type
+testdata/Builtins.lc 542:3-542:16  Type->Type
 testdata/Builtins.lc 542:3-542:16  Type
 testdata/Builtins.lc 542:3-542:16  'Texture
+testdata/Builtins.lc 545:3-545:12  Type->Type
 testdata/Builtins.lc 545:3-545:12  Type
 testdata/Builtins.lc 545:3-545:12  'Texture
+testdata/Builtins.lc 541:6-541:13  Type->Type
 testdata/Builtins.lc 549:6-549:12  Type
 testdata/Builtins.lc 550:5-550:16  'Filter
 testdata/Builtins.lc 551:5-551:17  'Filter
+testdata/Builtins.lc 549:6-551:17  Type->Type
 testdata/Builtins.lc 549:6-551:17  Type
+testdata/Builtins.lc 549:6-549:12  Type->Type
 testdata/Builtins.lc 553:6-553:14  Type
 testdata/Builtins.lc 554:5-554:11  'EdgeMode
 testdata/Builtins.lc 555:5-555:19  'EdgeMode
 testdata/Builtins.lc 556:5-556:16  'EdgeMode
+testdata/Builtins.lc 553:6-556:16  Type->Type
 testdata/Builtins.lc 553:6-556:16  Type
+testdata/Builtins.lc 553:6-553:14  Type->Type
 testdata/Builtins.lc 558:6-558:13  Type
 testdata/Builtins.lc 558:24-558:30  Type
+testdata/Builtins.lc 558:6-558:47  Type->Type
 testdata/Builtins.lc 558:6-558:47  Type
 testdata/Builtins.lc 558:31-558:39  Type
 testdata/Builtins.lc 558:40-558:47  Type
+testdata/Builtins.lc 558:6-558:13  Type->Type
 testdata/Builtins.lc 558:16-558:23  'Filter -> 'EdgeMode -> 'Texture->'Sampler
+testdata/Builtins.lc 558:6-558:23  Type->Type
 testdata/Builtins.lc 558:6-558:23  Type
+testdata/Builtins.lc 558:16-558:23  Type->Type
 testdata/Builtins.lc 558:16-558:23  Type
 testdata/Builtins.lc 558:16-558:23  'Sampler
 testdata/Builtins.lc 561:14-561:21  Type
+testdata/Builtins.lc 561:25-561:51  Type->Type
 testdata/Builtins.lc 561:25-561:51  Type
 testdata/Builtins.lc 561:25-561:28  'Nat -> Type->Type
+testdata/Builtins.lc 561:29-561:30  'Nat
 testdata/Builtins.lc 561:31-561:36  Type
+testdata/Builtins.lc 561:40-561:51  Type->Type
 testdata/Builtins.lc 561:40-561:51  Type
 testdata/Builtins.lc 561:40-561:43  'Nat -> Type->Type
+testdata/Builtins.lc 561:44-561:45  'Nat
 testdata/Builtins.lc 561:46-561:51  Type
 testdata/Builtins.lc 561:1-561:10  'Sampler -> 'VecS 'Float (Succ (Succ Zero)) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
 testdata/Builtins.lc 564:30-564:45  {a} -> {b} -> (a -> 'Stream b) -> 'Stream a -> 'Stream b
-testdata/Builtins.lc 564:47-564:74  V1 -> 'Stream V1
+testdata/Builtins.lc 564:46-564:75  V1 -> 'Stream V1
 testdata/Builtins.lc 564:47-564:57  {a} -> {b} -> {c} -> {d:'PrimitiveType} -> {e : a ~ 'InterpolatedType b} -> {f : c ~ 'JoinTupleType ('VecS 'Float (Succ (Succ (Succ (Succ Zero))))) a} -> c->'Float -> b -> 'RasterContext d -> 'Primitive d c -> 'Stream ('Fragment (Succ Zero) a)
-testdata/Builtins.lc 564:59-564:66  'JoinTupleType ('VecS 'Float (Succ (Succ (Succ (Succ Zero))))) ('InterpolatedType V1) -> 'Float
+testdata/Builtins.lc 564:58-564:67  'JoinTupleType ('VecS 'Float (Succ (Succ (Succ (Succ Zero))))) ('InterpolatedType V1) -> 'Float
 testdata/Builtins.lc 564:65-564:66  'Float
-testdata/Builtins.lc 564:65-564:66  'Int
 testdata/Builtins.lc 564:68-564:70  V1
 testdata/Builtins.lc 564:68-564:70  V5
 testdata/Builtins.lc 564:71-564:74  'RasterContext V0
 testdata/Builtins.lc 564:71-564:74  V4
 testdata/Builtins.lc 564:1-564:20  {a} -> {b:'PrimitiveType} -> 'RasterContext b -> a -> 'Stream ('Primitive b ('JoinTupleType ('VecS 'Float (Succ (Succ (Succ (Succ Zero))))) ('InterpolatedType a))) -> 'Stream ('Fragment (Succ Zero) ('InterpolatedType a))
 testdata/Builtins.lc 565:46-565:61  {a} -> {b} -> (a -> 'Stream b) -> 'Stream a -> 'Stream b
-testdata/Builtins.lc 565:63-565:83  V1 -> 'Stream V1
+testdata/Builtins.lc 565:62-565:84  V1 -> 'Stream V1
 testdata/Builtins.lc 565:63-565:73  {a} -> {b} -> {c} -> {d:'PrimitiveType} -> {e : a ~ 'InterpolatedType b} -> {f : c ~ 'JoinTupleType ('VecS 'Float (Succ (Succ (Succ (Succ Zero))))) a} -> c->'Float -> b -> 'RasterContext d -> 'Primitive d c -> 'Stream ('Fragment (Succ Zero) a)
 testdata/Builtins.lc 565:74-565:76  'JoinTupleType ('VecS 'Float (Succ (Succ (Succ (Succ Zero))))) ('InterpolatedType V1) -> 'Float
 testdata/Builtins.lc 565:74-565:76  V7
@@ -2817,7 +3293,6 @@ testdata/Builtins.lc 565:77-565:79  V5
 testdata/Builtins.lc 565:80-565:83  'RasterContext V0
 testdata/Builtins.lc 565:80-565:83  V5
 testdata/Builtins.lc 565:1-565:33  {a} -> {b:'PrimitiveType} -> 'RasterContext b -> ('JoinTupleType ('VecS 'Float (Succ (Succ (Succ (Succ Zero))))) ('InterpolatedType a) -> 'Float) -> a -> 'Stream ('Primitive b ('JoinTupleType ('VecS 'Float (Succ (Succ (Succ (Succ Zero))))) ('InterpolatedType a))) -> 'Stream ('Fragment (Succ Zero) ('InterpolatedType a))
-testdata/Builtins.lc 566:24-566:32  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/Builtins.lc 566:25-566:28  V1
 testdata/Builtins.lc 566:25-566:28  V5
 testdata/Builtins.lc 566:30-566:31  V0
@@ -2841,6 +3316,8 @@ testdata/Builtins.lc 568:1-568:12  {a:'Nat} -> {b} -> 'FrameBuffer a b -> 'Outpu
 testdata/Builtins.lc 569:14-569:25  {a:'Nat} -> {b} -> {c} -> {d : 'SameLayerCounts c} -> {e : 'FrameBuffer a b ~ 'TFFrameBuffer c} -> c -> 'FrameBuffer a b
 testdata/Builtins.lc 569:1-569:11  {a:'Nat} -> {b} -> {c} -> {d : 'SameLayerCounts c} -> {e : 'FrameBuffer a b ~ 'TFFrameBuffer c} -> c -> 'FrameBuffer a b
 testdata/Builtins.lc 570:19-570:29  {a:'Nat} -> 'Float -> 'Image a ('Depth 'Float)
+testdata/Builtins.lc 570:31-570:32  'Nat
 testdata/Builtins.lc 570:1-570:16  'Float -> 'Image (Succ Zero) ('Depth 'Float)
 testdata/Builtins.lc 571:19-571:29  {a:'Nat} -> {b:'Nat} -> {c} -> {d} -> {e : 'Num c} -> {f : d ~ 'VecScalar b c} -> d -> 'Image a ('Color d)
+testdata/Builtins.lc 571:31-571:32  'Nat
 testdata/Builtins.lc 571:1-571:16  {a:'Nat} -> {b} -> {c} -> {d : 'Num b} -> {e : c ~ 'VecScalar a b} -> c -> 'Image (Succ Zero) ('Color c)
diff --git a/testdata/Internals.out b/testdata/Internals.out
index d879bffd..414b8176 100644
--- a/testdata/Internals.out
+++ b/testdata/Internals.out
@@ -1,166 +1,235 @@
 main is not found
 tooltips:
 testdata/Internals.lc 5:27-5:31  Type
+testdata/Internals.lc 5:35-5:36  Type->Type
 testdata/Internals.lc 5:35-5:36  Type
 testdata/Internals.lc 5:1-5:10  {a}->a
 testdata/Internals.lc 7:25-7:29  Type
-testdata/Internals.lc 7:34-7:46  Type
+testdata/Internals.lc 7:33-7:46  Type->Type
+testdata/Internals.lc 7:33-7:46  Type
 testdata/Internals.lc 7:34-7:35  Type
+testdata/Internals.lc 7:39-7:40  Type->Type
 testdata/Internals.lc 7:39-7:40  Type
+testdata/Internals.lc 7:45-7:46  Type->Type
 testdata/Internals.lc 7:45-7:46  Type
 testdata/Internals.lc 7:1-7:8  {a} -> a->a -> a
 testdata/Internals.lc 9:6-9:10  Type
 testdata/Internals.lc 9:13-9:15  'Unit
+testdata/Internals.lc 9:6-9:15  Type->Type
 testdata/Internals.lc 9:6-9:15  Type
+testdata/Internals.lc 9:6-9:10  Type->Type
 testdata/Internals.lc 10:6-10:12  Type
+testdata/Internals.lc 10:6-10:12  Type->Type
 testdata/Internals.lc 11:18-11:24  Type
 testdata/Internals.lc 11:6-11:11  'String->Type
+testdata/Internals.lc 11:6-11:11  Type->Type
 testdata/Internals.lc 11:6-11:11  Type
 testdata/Internals.lc 14:6-14:12  Type
 testdata/Internals.lc 14:15-14:21  'Tuple0
+testdata/Internals.lc 14:6-14:21  Type->Type
 testdata/Internals.lc 14:6-14:21  Type
+testdata/Internals.lc 14:6-14:12  Type->Type
 testdata/Internals.lc 15:6-15:12  Type->Type
+testdata/Internals.lc 15:6-15:25  Type->Type
 testdata/Internals.lc 15:6-15:25  Type
 testdata/Internals.lc 15:24-15:25  Type
 testdata/Internals.lc 15:6-15:12  Type
 testdata/Internals.lc 15:17-15:23  {a} -> a -> 'Tuple1 a
+testdata/Internals.lc 15:6-15:23  Type->Type
 testdata/Internals.lc 15:6-15:23  Type
+testdata/Internals.lc 15:17-15:23  Type->Type
 testdata/Internals.lc 15:17-15:23  Type
 testdata/Internals.lc 15:17-15:23  'Tuple1 V2
 testdata/Internals.lc 16:6-16:12  Type -> Type->Type
+testdata/Internals.lc 16:6-16:29  Type->Type
 testdata/Internals.lc 16:6-16:29  Type
 testdata/Internals.lc 16:26-16:27  Type
 testdata/Internals.lc 16:28-16:29  Type
+testdata/Internals.lc 16:6-16:12  Type->Type
 testdata/Internals.lc 16:6-16:12  Type
 testdata/Internals.lc 16:19-16:25  {a} -> {b} -> a -> b -> 'Tuple2 a b
+testdata/Internals.lc 16:6-16:25  Type->Type
 testdata/Internals.lc 16:6-16:25  Type
+testdata/Internals.lc 16:19-16:25  Type->Type
 testdata/Internals.lc 16:19-16:25  Type
 testdata/Internals.lc 16:19-16:25  'Tuple2 V4 V3
 testdata/Internals.lc 17:6-17:12  Type -> Type -> Type->Type
+testdata/Internals.lc 17:6-17:33  Type->Type
 testdata/Internals.lc 17:6-17:33  Type
 testdata/Internals.lc 17:28-17:29  Type
 testdata/Internals.lc 17:30-17:31  Type
 testdata/Internals.lc 17:32-17:33  Type
+testdata/Internals.lc 17:6-17:12  Type->Type
 testdata/Internals.lc 17:6-17:12  Type
 testdata/Internals.lc 17:21-17:27  {a} -> {b} -> {c} -> a -> b -> c -> 'Tuple3 a b c
+testdata/Internals.lc 17:6-17:27  Type->Type
 testdata/Internals.lc 17:6-17:27  Type
+testdata/Internals.lc 17:21-17:27  Type->Type
 testdata/Internals.lc 17:21-17:27  Type
 testdata/Internals.lc 17:21-17:27  'Tuple3 V6 V5 V4
 testdata/Internals.lc 18:6-18:12  Type -> Type -> Type -> Type->Type
+testdata/Internals.lc 18:6-18:37  Type->Type
 testdata/Internals.lc 18:6-18:37  Type
 testdata/Internals.lc 18:30-18:31  Type
 testdata/Internals.lc 18:32-18:33  Type
 testdata/Internals.lc 18:34-18:35  Type
 testdata/Internals.lc 18:36-18:37  Type
+testdata/Internals.lc 18:6-18:12  Type->Type
 testdata/Internals.lc 18:6-18:12  Type
 testdata/Internals.lc 18:23-18:29  {a} -> {b} -> {c} -> {d} -> a -> b -> c -> d -> 'Tuple4 a b c d
+testdata/Internals.lc 18:6-18:29  Type->Type
 testdata/Internals.lc 18:6-18:29  Type
+testdata/Internals.lc 18:23-18:29  Type->Type
 testdata/Internals.lc 18:23-18:29  Type
 testdata/Internals.lc 18:23-18:29  'Tuple4 V8 V7 V6 V5
 testdata/Internals.lc 19:6-19:12  Type -> Type -> Type -> Type -> Type->Type
+testdata/Internals.lc 19:6-19:41  Type->Type
 testdata/Internals.lc 19:6-19:41  Type
 testdata/Internals.lc 19:32-19:33  Type
 testdata/Internals.lc 19:34-19:35  Type
 testdata/Internals.lc 19:36-19:37  Type
 testdata/Internals.lc 19:38-19:39  Type
 testdata/Internals.lc 19:40-19:41  Type
+testdata/Internals.lc 19:6-19:12  Type->Type
 testdata/Internals.lc 19:6-19:12  Type
 testdata/Internals.lc 19:25-19:31  {a} -> {b} -> {c} -> {d} -> {e} -> a -> b -> c -> d -> e -> 'Tuple5 a b c d e
+testdata/Internals.lc 19:6-19:31  Type->Type
 testdata/Internals.lc 19:6-19:31  Type
+testdata/Internals.lc 19:25-19:31  Type->Type
 testdata/Internals.lc 19:25-19:31  Type
 testdata/Internals.lc 19:25-19:31  'Tuple5 V10 V9 V8 V7 V6
+testdata/Internals.lc 25:24-25:35  Type->Type
 testdata/Internals.lc 25:24-25:35  Type
 testdata/Internals.lc 25:24-25:25  V1
+testdata/Internals.lc 25:29-25:35  Type->Type
 testdata/Internals.lc 25:29-25:35  Type
 testdata/Internals.lc 25:29-25:30  Type
+testdata/Internals.lc 25:34-25:35  Type->Type
 testdata/Internals.lc 25:34-25:35  Type
 testdata/Internals.lc 25:1-25:8  a:Type -> a -> a->a
 testdata/Internals.lc 27:24-27:28  Type
+testdata/Internals.lc 27:36-27:46  Type->Type
 testdata/Internals.lc 27:36-27:46  Type
 testdata/Internals.lc 27:36-27:37  Type
+testdata/Internals.lc 27:45-27:46  Type->Type
 testdata/Internals.lc 27:45-27:46  Type
 testdata/Internals.lc 27:13-27:17  a:Type -> a -> a->Type
 testdata/Internals.lc 28:13-28:15  Type -> Type->Type
 testdata/Internals.lc 31:8-31:12  Type
+testdata/Internals.lc 31:16-31:28  Type->Type
 testdata/Internals.lc 31:16-31:28  Type
 testdata/Internals.lc 31:16-31:20  Type
+testdata/Internals.lc 31:24-31:28  Type->Type
 testdata/Internals.lc 31:24-31:28  Type
 testdata/Internals.lc 31:1-31:4  'Unit -> 'Unit->'Unit
 testdata/Internals.lc 34:6-34:9  Type
+testdata/Internals.lc 34:6-34:9  Type->Type
 testdata/Internals.lc 35:6-35:10  Type
+testdata/Internals.lc 35:6-35:10  Type->Type
 testdata/Internals.lc 36:6-36:11  Type
+testdata/Internals.lc 36:6-36:11  Type->Type
 testdata/Internals.lc 37:6-37:10  Type
+testdata/Internals.lc 37:6-37:10  Type->Type
 testdata/Internals.lc 39:6-39:10  Type
 testdata/Internals.lc 39:13-39:18  'Bool
 testdata/Internals.lc 39:21-39:25  'Bool
+testdata/Internals.lc 39:6-39:25  Type->Type
 testdata/Internals.lc 39:6-39:25  Type
+testdata/Internals.lc 39:6-39:10  Type->Type
 testdata/Internals.lc 41:6-41:14  Type
 testdata/Internals.lc 41:17-41:19  'Ordering
 testdata/Internals.lc 41:22-41:24  'Ordering
 testdata/Internals.lc 41:27-41:29  'Ordering
+testdata/Internals.lc 41:6-41:29  Type->Type
 testdata/Internals.lc 41:6-41:29  Type
+testdata/Internals.lc 41:6-41:14  Type->Type
 testdata/Internals.lc 44:24-44:27  Type
+testdata/Internals.lc 44:33-44:37  Type->Type
 testdata/Internals.lc 44:33-44:37  Type
 testdata/Internals.lc 44:1-44:14  'Int->'Word
 testdata/Internals.lc 45:24-45:27  Type
+testdata/Internals.lc 45:33-45:38  Type->Type
 testdata/Internals.lc 45:33-45:38  Type
 testdata/Internals.lc 45:1-45:15  'Int->'Float
 testdata/Internals.lc 46:24-46:27  Type
+testdata/Internals.lc 46:33-46:50  Type->Type
 testdata/Internals.lc 46:33-46:50  Type
 testdata/Internals.lc 46:33-46:36  Type
+testdata/Internals.lc 46:42-46:50  Type->Type
 testdata/Internals.lc 46:42-46:50  Type
 testdata/Internals.lc 46:1-46:15  'Int -> 'Int->'Ordering
 testdata/Internals.lc 47:24-47:28  Type
+testdata/Internals.lc 47:33-47:50  Type->Type
 testdata/Internals.lc 47:33-47:50  Type
 testdata/Internals.lc 47:33-47:37  Type
+testdata/Internals.lc 47:42-47:50  Type->Type
 testdata/Internals.lc 47:42-47:50  Type
 testdata/Internals.lc 47:1-47:16  'Word -> 'Word->'Ordering
 testdata/Internals.lc 48:24-48:29  Type
+testdata/Internals.lc 48:33-48:50  Type->Type
 testdata/Internals.lc 48:33-48:50  Type
 testdata/Internals.lc 48:33-48:38  Type
+testdata/Internals.lc 48:42-48:50  Type->Type
 testdata/Internals.lc 48:42-48:50  Type
 testdata/Internals.lc 48:1-48:17  'Float -> 'Float->'Ordering
 testdata/Internals.lc 49:24-49:30  Type
+testdata/Internals.lc 49:34-49:52  Type->Type
 testdata/Internals.lc 49:34-49:52  Type
 testdata/Internals.lc 49:34-49:40  Type
+testdata/Internals.lc 49:44-49:52  Type->Type
 testdata/Internals.lc 49:44-49:52  Type
 testdata/Internals.lc 49:1-49:18  'String -> 'String->'Ordering
 testdata/Internals.lc 50:24-50:27  Type
+testdata/Internals.lc 50:33-50:36  Type->Type
 testdata/Internals.lc 50:33-50:36  Type
 testdata/Internals.lc 50:1-50:14  'Int->'Int
 testdata/Internals.lc 51:24-51:28  Type
+testdata/Internals.lc 51:33-51:37  Type->Type
 testdata/Internals.lc 51:33-51:37  Type
 testdata/Internals.lc 51:1-51:15  'Word->'Word
 testdata/Internals.lc 52:24-52:29  Type
+testdata/Internals.lc 52:33-52:38  Type->Type
 testdata/Internals.lc 52:33-52:38  Type
 testdata/Internals.lc 52:1-52:16  'Float->'Float
 testdata/Internals.lc 53:24-53:27  Type
+testdata/Internals.lc 53:33-53:45  Type->Type
 testdata/Internals.lc 53:33-53:45  Type
 testdata/Internals.lc 53:33-53:36  Type
+testdata/Internals.lc 53:42-53:45  Type->Type
 testdata/Internals.lc 53:42-53:45  Type
 testdata/Internals.lc 53:1-53:11  'Int -> 'Int->'Int
 testdata/Internals.lc 54:24-54:27  Type
+testdata/Internals.lc 54:33-54:45  Type->Type
 testdata/Internals.lc 54:33-54:45  Type
 testdata/Internals.lc 54:33-54:36  Type
+testdata/Internals.lc 54:42-54:45  Type->Type
 testdata/Internals.lc 54:42-54:45  Type
 testdata/Internals.lc 54:1-54:11  'Int -> 'Int->'Int
 testdata/Internals.lc 55:24-55:27  Type
+testdata/Internals.lc 55:33-55:45  Type->Type
 testdata/Internals.lc 55:33-55:45  Type
 testdata/Internals.lc 55:33-55:36  Type
+testdata/Internals.lc 55:42-55:45  Type->Type
 testdata/Internals.lc 55:42-55:45  Type
 testdata/Internals.lc 55:1-55:11  'Int -> 'Int->'Int
 testdata/Internals.lc 56:24-56:29  Type
+testdata/Internals.lc 56:33-56:38  Type->Type
 testdata/Internals.lc 56:33-56:38  Type
 testdata/Internals.lc 56:1-56:14  'Float->'Float
 testdata/Internals.lc 57:24-57:29  Type
+testdata/Internals.lc 57:33-57:36  Type->Type
 testdata/Internals.lc 57:33-57:36  Type
 testdata/Internals.lc 57:1-57:10  'Float->'Int
 testdata/Internals.lc 60:19-60:38  Type
+testdata/Internals.lc 60:19-60:38  Type->Type
 testdata/Internals.lc 60:19-60:23  Type
+testdata/Internals.lc 60:27-60:38  Type->Type
 testdata/Internals.lc 60:27-60:38  Type
 testdata/Internals.lc 60:27-60:28  V2
+testdata/Internals.lc 60:32-60:38  Type->Type
 testdata/Internals.lc 60:32-60:38  Type
 testdata/Internals.lc 60:32-60:33  Type
+testdata/Internals.lc 60:37-60:38  Type->Type
 testdata/Internals.lc 60:37-60:38  Type
 testdata/Internals.lc 61:16-62:29  {a} -> 'Bool -> a -> a->a
 testdata/Internals.lc 61:16-62:29  'Bool -> V1 -> V2->V3
@@ -172,20 +241,19 @@ testdata/Internals.lc 62:28-62:29  V4
 testdata/Internals.lc 61:28-61:29  V3
 testdata/Internals.lc 61:16-61:20  'Bool
 testdata/Internals.lc 61:1-61:15  {a} -> 'Bool -> a -> a->a
-testdata/Internals.lc 70:10-78:19  Type->Type
-testdata/Internals.lc 70:10-78:19  Type
-testdata/Internals.lc 70:10-70:13  Type
+testdata/Internals.lc 70:14-78:19  Type->Type
+testdata/Internals.lc 70:14-78:19  Type
 testdata/Internals.lc 70:14-70:17  Type
-testdata/Internals.lc 74:10-78:19  Type
-testdata/Internals.lc 74:10-74:13  Type
+testdata/Internals.lc 74:14-78:19  Type
 testdata/Internals.lc 74:14-74:18  Type
-testdata/Internals.lc 78:10-78:19  Type
-testdata/Internals.lc 78:10-78:13  Type
 testdata/Internals.lc 78:14-78:19  Type
 testdata/Internals.lc 65:7-65:10  Type->Type
 testdata/Internals.lc 65:7-66:22  Type
+testdata/Internals.lc 65:7-66:22  Type->Type
+testdata/Internals.lc 66:14-66:22  Type->Type
 testdata/Internals.lc 66:14-66:22  Type
 testdata/Internals.lc 66:14-66:17  Type
+testdata/Internals.lc 66:21-66:22  Type->Type
 testdata/Internals.lc 66:21-66:22  Type
 testdata/Internals.lc 70:14-79:27  {a} -> {b : 'Num a} -> 'Int->a
 testdata/Internals.lc 70:14-79:27  {a : 'Num V0} -> 'Int->V2
@@ -200,10 +268,14 @@ testdata/Internals.lc 79:13-79:27  {a:'Unit} -> 'Int->'Float
 testdata/Internals.lc 79:13-79:27  'Int->'Float
 testdata/Internals.lc 66:3-66:10  {a} -> {b : 'Num a} -> 'Int->a
 testdata/Internals.lc 65:7-67:32  Type
+testdata/Internals.lc 65:7-67:32  Type->Type
+testdata/Internals.lc 67:14-67:32  Type->Type
 testdata/Internals.lc 67:14-67:32  Type
 testdata/Internals.lc 67:14-67:15  Type
+testdata/Internals.lc 67:19-67:32  Type->Type
 testdata/Internals.lc 67:19-67:32  Type
 testdata/Internals.lc 67:19-67:20  Type
+testdata/Internals.lc 67:24-67:32  Type->Type
 testdata/Internals.lc 67:24-67:32  Type
 testdata/Internals.lc 70:14-80:29  {a} -> {b : 'Num a} -> a -> a->'Ordering
 testdata/Internals.lc 70:14-80:29  {a : 'Num V0} -> V1 -> V2->'Ordering
@@ -217,8 +289,11 @@ testdata/Internals.lc 80:13-80:29  {a:'Unit} -> 'Float -> 'Float->'Ordering
 testdata/Internals.lc 80:13-80:29  'Float -> 'Float->'Ordering
 testdata/Internals.lc 67:3-67:10  {a} -> {b : 'Num a} -> a -> a->'Ordering
 testdata/Internals.lc 65:7-68:19  Type
+testdata/Internals.lc 65:7-68:19  Type->Type
+testdata/Internals.lc 68:13-68:19  Type->Type
 testdata/Internals.lc 68:13-68:19  Type
 testdata/Internals.lc 68:13-68:14  Type
+testdata/Internals.lc 68:18-68:19  Type->Type
 testdata/Internals.lc 68:18-68:19  Type
 testdata/Internals.lc 70:14-81:28  {a} -> {b : 'Num a} -> a->a
 testdata/Internals.lc 70:14-81:28  {a : 'Num V0} -> V1->V2
diff --git a/testdata/Material.out b/testdata/Material.out
index 4919e496..f4bf781f 100644
--- a/testdata/Material.out
+++ b/testdata/Material.out
@@ -2,20 +2,27 @@ main is not found
 tooltips:
 testdata/Material.lc 7:18-7:23  Type
 testdata/Material.lc 8:17-8:18  'Float
-testdata/Material.lc 8:17-8:18  'Int
 testdata/Material.lc 8:1-8:14  'Float
 testdata/Material.lc 10:6-10:12  Type
 testdata/Material.lc 12:28-12:31  'Nat -> Type->Type
+testdata/Material.lc 12:32-12:33  'Nat
 testdata/Material.lc 12:34-12:39  Type
+testdata/Material.lc 10:6-15:39  Type->Type
 testdata/Material.lc 10:6-15:39  Type
 testdata/Material.lc 13:28-13:31  'Nat -> Type->Type
+testdata/Material.lc 13:32-13:33  'Nat
 testdata/Material.lc 13:34-13:39  Type
 testdata/Material.lc 14:28-14:31  'Nat -> Type->Type
+testdata/Material.lc 14:32-14:33  'Nat
 testdata/Material.lc 14:34-14:39  Type
 testdata/Material.lc 15:28-15:31  'Nat -> Type->Type
+testdata/Material.lc 15:32-15:33  'Nat
 testdata/Material.lc 15:34-15:39  Type
+testdata/Material.lc 10:6-10:12  Type->Type
 testdata/Material.lc 11:7-11:13  'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'VecS 'Float (Succ (Succ (Succ Zero))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'Entity
+testdata/Material.lc 10:6-11:13  Type->Type
 testdata/Material.lc 10:6-11:13  Type
+testdata/Material.lc 11:7-11:13  Type->Type
 testdata/Material.lc 11:7-11:13  Type
 testdata/Material.lc 11:7-11:13  'Entity
 testdata/Material.lc 11:7-11:13  'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'VecS 'Float (Succ (Succ (Succ Zero))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> V4
@@ -37,32 +44,43 @@ testdata/Material.lc 21:7-21:16  'WaveType
 testdata/Material.lc 22:7-22:18  'WaveType
 testdata/Material.lc 23:7-23:25  'WaveType
 testdata/Material.lc 24:7-24:15  'WaveType
+testdata/Material.lc 18:6-24:15  Type->Type
 testdata/Material.lc 18:6-24:15  Type
+testdata/Material.lc 18:6-18:14  Type->Type
 testdata/Material.lc 27:6-27:10  Type
 testdata/Material.lc 27:18-27:26  Type
+testdata/Material.lc 27:6-27:50  Type->Type
 testdata/Material.lc 27:6-27:50  Type
 testdata/Material.lc 27:27-27:32  Type
 testdata/Material.lc 27:33-27:38  Type
 testdata/Material.lc 27:39-27:44  Type
 testdata/Material.lc 27:45-27:50  Type
+testdata/Material.lc 27:6-27:10  Type->Type
 testdata/Material.lc 27:13-27:17  'WaveType -> 'Float -> 'Float -> 'Float -> 'Float->'Wave
+testdata/Material.lc 27:6-27:17  Type->Type
 testdata/Material.lc 27:6-27:17  Type
+testdata/Material.lc 27:13-27:17  Type->Type
 testdata/Material.lc 27:13-27:17  Type
 testdata/Material.lc 27:13-27:17  'Wave
 testdata/Material.lc 29:6-29:12  Type
 testdata/Material.lc 30:7-30:19  'Deform
 testdata/Material.lc 31:7-31:20  'Deform
 testdata/Material.lc 32:15-32:20  Type
+testdata/Material.lc 29:6-32:32  Type->Type
 testdata/Material.lc 29:6-32:32  Type
 testdata/Material.lc 32:21-32:26  Type
 testdata/Material.lc 32:27-32:32  Type
+testdata/Material.lc 29:6-29:12  Type->Type
 testdata/Material.lc 32:7-32:14  'Float -> 'Float -> 'Float->'Deform
 testdata/Material.lc 33:15-33:18  'Nat -> Type->Type
+testdata/Material.lc 33:19-33:20  'Nat
 testdata/Material.lc 33:21-33:26  Type
+testdata/Material.lc 29:6-33:32  Type->Type
 testdata/Material.lc 29:6-33:32  Type
 testdata/Material.lc 33:28-33:32  Type
 testdata/Material.lc 33:7-33:13  'VecS 'Float (Succ (Succ (Succ Zero))) -> 'Wave->'Deform
 testdata/Material.lc 34:16-34:21  Type
+testdata/Material.lc 29:6-34:27  Type->Type
 testdata/Material.lc 29:6-34:27  Type
 testdata/Material.lc 34:22-34:27  Type
 testdata/Material.lc 34:7-34:15  'Float -> 'Float->'Deform
@@ -76,23 +94,31 @@ testdata/Material.lc 41:7-41:14  'Deform
 testdata/Material.lc 42:7-42:14  'Deform
 testdata/Material.lc 43:7-43:14  'Deform
 testdata/Material.lc 44:14-44:19  Type
+testdata/Material.lc 29:6-44:24  Type->Type
 testdata/Material.lc 29:6-44:24  Type
 testdata/Material.lc 44:20-44:24  Type
 testdata/Material.lc 44:7-44:13  'Float -> 'Wave->'Deform
+testdata/Material.lc 29:6-44:13  Type->Type
 testdata/Material.lc 29:6-44:13  Type
+testdata/Material.lc 32:7-32:14  Type->Type
 testdata/Material.lc 32:7-32:14  Type
 testdata/Material.lc 32:7-32:14  'Deform
+testdata/Material.lc 33:7-33:13  Type->Type
 testdata/Material.lc 33:7-33:13  Type
 testdata/Material.lc 33:7-33:13  'Deform
+testdata/Material.lc 34:7-34:15  Type->Type
 testdata/Material.lc 34:7-34:15  Type
 testdata/Material.lc 34:7-34:15  'Deform
+testdata/Material.lc 44:7-44:13  Type->Type
 testdata/Material.lc 44:7-44:13  Type
 testdata/Material.lc 44:7-44:13  'Deform
 testdata/Material.lc 47:6-47:14  Type
 testdata/Material.lc 48:7-48:20  'CullType
 testdata/Material.lc 49:7-49:19  'CullType
 testdata/Material.lc 50:7-50:18  'CullType
+testdata/Material.lc 47:6-50:18  Type->Type
 testdata/Material.lc 47:6-50:18  Type
+testdata/Material.lc 47:6-47:14  Type->Type
 testdata/Material.lc 53:6-53:15  Type
 testdata/Material.lc 54:7-54:17  'Blending'
 testdata/Material.lc 55:7-55:17  'Blending'
@@ -105,11 +131,15 @@ testdata/Material.lc 61:7-61:17  'Blending'
 testdata/Material.lc 62:7-62:25  'Blending'
 testdata/Material.lc 63:7-63:17  'Blending'
 testdata/Material.lc 64:7-64:13  'Blending'
+testdata/Material.lc 53:6-64:13  Type->Type
 testdata/Material.lc 53:6-64:13  Type
+testdata/Material.lc 53:6-53:15  Type->Type
 testdata/Material.lc 67:6-67:12  Type
 testdata/Material.lc 68:16-68:20  Type
+testdata/Material.lc 67:6-67:12  Type->Type
 testdata/Material.lc 68:7-68:15  'Wave->'RGBGen
 testdata/Material.lc 69:17-69:22  Type
+testdata/Material.lc 67:6-69:34  Type->Type
 testdata/Material.lc 67:6-69:34  Type
 testdata/Material.lc 69:23-69:28  Type
 testdata/Material.lc 69:29-69:34  Type
@@ -123,13 +153,17 @@ testdata/Material.lc 75:7-75:17  'RGBGen
 testdata/Material.lc 76:7-76:26  'RGBGen
 testdata/Material.lc 77:7-77:25  'RGBGen
 testdata/Material.lc 78:7-78:20  'RGBGen
+testdata/Material.lc 67:6-78:20  Type->Type
 testdata/Material.lc 67:6-78:20  Type
+testdata/Material.lc 68:7-68:15  Type->Type
 testdata/Material.lc 68:7-68:15  Type
 testdata/Material.lc 68:7-68:15  'RGBGen
+testdata/Material.lc 69:7-69:16  Type->Type
 testdata/Material.lc 69:7-69:16  Type
 testdata/Material.lc 69:7-69:16  'RGBGen
 testdata/Material.lc 81:6-81:14  Type
 testdata/Material.lc 82:14-82:18  Type
+testdata/Material.lc 81:6-81:14  Type->Type
 testdata/Material.lc 82:7-82:13  'Wave->'AlphaGen
 testdata/Material.lc 83:15-83:20  Type
 testdata/Material.lc 83:7-83:14  'Float->'AlphaGen
@@ -140,9 +174,12 @@ testdata/Material.lc 87:7-87:23  'AlphaGen
 testdata/Material.lc 88:7-88:15  'AlphaGen
 testdata/Material.lc 89:7-89:25  'AlphaGen
 testdata/Material.lc 90:7-90:23  'AlphaGen
+testdata/Material.lc 81:6-90:23  Type->Type
 testdata/Material.lc 81:6-90:23  Type
+testdata/Material.lc 82:7-82:13  Type->Type
 testdata/Material.lc 82:7-82:13  Type
 testdata/Material.lc 82:7-82:13  'AlphaGen
+testdata/Material.lc 83:7-83:14  Type->Type
 testdata/Material.lc 83:7-83:14  Type
 testdata/Material.lc 83:7-83:14  'AlphaGen
 testdata/Material.lc 93:6-93:11  Type
@@ -150,30 +187,40 @@ testdata/Material.lc 94:7-94:14  'TCGen
 testdata/Material.lc 95:7-95:18  'TCGen
 testdata/Material.lc 96:7-96:21  'TCGen
 testdata/Material.lc 97:18-97:21  'Nat -> Type->Type
+testdata/Material.lc 97:22-97:23  'Nat
 testdata/Material.lc 97:24-97:29  Type
-testdata/Material.lc 93:6-97:43  Type
+testdata/Material.lc 93:6-97:44  Type->Type
+testdata/Material.lc 93:6-97:44  Type
 testdata/Material.lc 97:32-97:35  'Nat -> Type->Type
+testdata/Material.lc 97:36-97:37  'Nat
 testdata/Material.lc 97:38-97:43  Type
+testdata/Material.lc 93:6-93:11  Type->Type
 testdata/Material.lc 97:7-97:16  'VecS 'Float (Succ (Succ (Succ Zero))) -> 'VecS 'Float (Succ (Succ (Succ Zero))) -> 'TCGen
 testdata/Material.lc 98:7-98:19  'TCGen
+testdata/Material.lc 93:6-98:19  Type->Type
 testdata/Material.lc 93:6-98:19  Type
+testdata/Material.lc 97:7-97:16  Type->Type
 testdata/Material.lc 97:7-97:16  Type
 testdata/Material.lc 97:7-97:16  'TCGen
 testdata/Material.lc 101:6-101:11  Type
 testdata/Material.lc 102:7-102:25  'TCMod
 testdata/Material.lc 103:17-103:22  Type
+testdata/Material.lc 101:6-101:11  Type->Type
 testdata/Material.lc 103:7-103:16  'Float->'TCMod
 testdata/Material.lc 104:17-104:22  Type
+testdata/Material.lc 101:6-104:28  Type->Type
 testdata/Material.lc 101:6-104:28  Type
 testdata/Material.lc 104:23-104:28  Type
 testdata/Material.lc 104:7-104:16  'Float -> 'Float->'TCMod
 testdata/Material.lc 105:16-105:21  Type
+testdata/Material.lc 101:6-105:27  Type->Type
 testdata/Material.lc 101:6-105:27  Type
 testdata/Material.lc 105:22-105:27  Type
 testdata/Material.lc 105:7-105:15  'Float -> 'Float->'TCMod
 testdata/Material.lc 106:18-106:22  Type
 testdata/Material.lc 106:7-106:17  'Wave->'TCMod
 testdata/Material.lc 107:20-107:25  Type
+testdata/Material.lc 101:6-107:55  Type->Type
 testdata/Material.lc 101:6-107:55  Type
 testdata/Material.lc 107:26-107:31  Type
 testdata/Material.lc 107:32-107:37  Type
@@ -182,57 +229,75 @@ testdata/Material.lc 107:44-107:49  Type
 testdata/Material.lc 107:50-107:55  Type
 testdata/Material.lc 107:7-107:19  'Float -> 'Float -> 'Float -> 'Float -> 'Float -> 'Float->'TCMod
 testdata/Material.lc 108:15-108:20  Type
+testdata/Material.lc 101:6-108:38  Type->Type
 testdata/Material.lc 101:6-108:38  Type
 testdata/Material.lc 108:21-108:26  Type
 testdata/Material.lc 108:27-108:32  Type
 testdata/Material.lc 108:33-108:38  Type
 testdata/Material.lc 108:7-108:14  'Float -> 'Float -> 'Float -> 'Float->'TCMod
+testdata/Material.lc 101:6-108:14  Type->Type
 testdata/Material.lc 101:6-108:14  Type
+testdata/Material.lc 103:7-103:16  Type->Type
 testdata/Material.lc 103:7-103:16  Type
 testdata/Material.lc 103:7-103:16  'TCMod
+testdata/Material.lc 104:7-104:16  Type->Type
 testdata/Material.lc 104:7-104:16  Type
 testdata/Material.lc 104:7-104:16  'TCMod
+testdata/Material.lc 105:7-105:15  Type->Type
 testdata/Material.lc 105:7-105:15  Type
 testdata/Material.lc 105:7-105:15  'TCMod
+testdata/Material.lc 106:7-106:17  Type->Type
 testdata/Material.lc 106:7-106:17  Type
 testdata/Material.lc 106:7-106:17  'TCMod
+testdata/Material.lc 107:7-107:19  Type->Type
 testdata/Material.lc 107:7-107:19  Type
 testdata/Material.lc 107:7-107:19  'TCMod
+testdata/Material.lc 108:7-108:14  Type->Type
 testdata/Material.lc 108:7-108:14  Type
 testdata/Material.lc 108:7-108:14  'TCMod
 testdata/Material.lc 111:6-111:18  Type
 testdata/Material.lc 112:21-112:27  Type
+testdata/Material.lc 111:6-111:18  Type->Type
 testdata/Material.lc 112:7-112:13  'String->'StageTexture
 testdata/Material.lc 113:21-113:27  Type
 testdata/Material.lc 113:7-113:18  'String->'StageTexture
 testdata/Material.lc 114:21-114:26  Type
+testdata/Material.lc 111:6-114:35  Type->Type
 testdata/Material.lc 111:6-114:35  Type
 testdata/Material.lc 114:28-114:34  Type
 testdata/Material.lc 114:7-114:17  'Float -> 'List 'String -> 'StageTexture
 testdata/Material.lc 115:7-115:18  'StageTexture
 testdata/Material.lc 116:7-116:20  'StageTexture
+testdata/Material.lc 111:6-116:20  Type->Type
 testdata/Material.lc 111:6-116:20  Type
+testdata/Material.lc 112:7-112:13  Type->Type
 testdata/Material.lc 112:7-112:13  Type
 testdata/Material.lc 112:7-112:13  'StageTexture
+testdata/Material.lc 113:7-113:18  Type->Type
 testdata/Material.lc 113:7-113:18  Type
 testdata/Material.lc 113:7-113:18  'StageTexture
+testdata/Material.lc 114:7-114:17  Type->Type
 testdata/Material.lc 114:7-114:17  Type
 testdata/Material.lc 114:7-114:17  'StageTexture
 testdata/Material.lc 119:6-119:19  Type
 testdata/Material.lc 120:7-120:12  'AlphaFunction
 testdata/Material.lc 121:7-121:14  'AlphaFunction
 testdata/Material.lc 122:7-122:14  'AlphaFunction
+testdata/Material.lc 119:6-122:14  Type->Type
 testdata/Material.lc 119:6-122:14  Type
+testdata/Material.lc 119:6-119:19  Type->Type
 testdata/Material.lc 125:6-125:19  Type
 testdata/Material.lc 126:7-126:14  'DepthFunction
 testdata/Material.lc 127:7-127:15  'DepthFunction
+testdata/Material.lc 125:6-127:15  Type->Type
 testdata/Material.lc 125:6-127:15  Type
+testdata/Material.lc 125:6-125:19  Type->Type
 testdata/Material.lc 130:6-130:16  Type
 testdata/Material.lc 132:25-132:30  Type->Type
 testdata/Material.lc 132:31-132:53  Type
-testdata/Material.lc 132:31-132:53  Type -> Type->Type
 testdata/Material.lc 132:32-132:41  Type
 testdata/Material.lc 132:43-132:52  Type
+testdata/Material.lc 130:6-144:34  Type->Type
 testdata/Material.lc 130:6-144:34  Type
 testdata/Material.lc 133:24-133:30  Type
 testdata/Material.lc 134:24-134:32  Type
@@ -245,8 +310,11 @@ testdata/Material.lc 140:25-140:30  Type->Type
 testdata/Material.lc 140:31-140:44  Type
 testdata/Material.lc 143:32-143:36  Type
 testdata/Material.lc 144:28-144:34  Type
+testdata/Material.lc 130:6-130:16  Type->Type
 testdata/Material.lc 131:7-131:17  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
+testdata/Material.lc 130:6-131:17  Type->Type
 testdata/Material.lc 130:6-131:17  Type
+testdata/Material.lc 131:7-131:17  Type->Type
 testdata/Material.lc 131:7-131:17  Type
 testdata/Material.lc 131:7-131:17  'StageAttrs
 testdata/Material.lc 131:7-131:17  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->V11
@@ -284,13 +352,15 @@ testdata/Material.lc 133:7-133:15  'StageAttrs->'RGBGen
 testdata/Material.lc 131:7-131:17  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/Material.lc 132:7-132:14  'StageAttrs -> 'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/Material.lc 148:22-148:32  Type
-testdata/Material.lc 149:21-160:29  'StageAttrs
+testdata/Material.lc 149:21-161:6  'StageAttrs
 testdata/Material.lc 149:21-149:31  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/Material.lc 150:23-150:30  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/Material.lc 150:23-150:30  {a} -> 'Maybe a
 testdata/Material.lc 151:23-151:36  'RGBGen
 testdata/Material.lc 152:23-152:33  'AlphaGen
 testdata/Material.lc 153:23-153:35  'TCGen
+testdata/Material.lc 154:23-154:25  'List 'TCMod
+testdata/Material.lc 154:23-154:25  {a} -> 'List a
 testdata/Material.lc 155:23-155:36  'StageTexture
 testdata/Material.lc 156:23-156:27  'Bool
 testdata/Material.lc 157:23-157:31  'DepthFunction
@@ -301,6 +371,7 @@ testdata/Material.lc 160:27-160:29  'String
 testdata/Material.lc 149:1-149:18  'StageAttrs
 testdata/Material.lc 163:6-163:17  Type
 testdata/Material.lc 165:28-165:30  Type
+testdata/Material.lc 163:6-178:32  Type->Type
 testdata/Material.lc 163:6-178:32  Type
 testdata/Material.lc 166:28-166:30  Type
 testdata/Material.lc 167:28-167:32  Type
@@ -313,8 +384,11 @@ testdata/Material.lc 173:28-173:32  Type
 testdata/Material.lc 174:28-174:32  Type
 testdata/Material.lc 175:29-175:39  Type
 testdata/Material.lc 178:28-178:32  Type
+testdata/Material.lc 163:6-163:17  Type->Type
 testdata/Material.lc 164:7-164:18  'Tuple0 -> 'Tuple0 -> 'Bool -> 'Int -> 'Bool -> 'Bool -> 'CullType -> 'List 'Deform -> 'Bool -> 'Bool -> 'List 'StageAttrs -> 'Bool->'CommonAttrs
+testdata/Material.lc 163:6-164:18  Type->Type
 testdata/Material.lc 163:6-164:18  Type
+testdata/Material.lc 164:7-164:18  Type->Type
 testdata/Material.lc 164:7-164:18  Type
 testdata/Material.lc 164:7-164:18  'CommonAttrs
 testdata/Material.lc 164:7-164:18  'Tuple0 -> 'Tuple0 -> 'Bool -> 'Int -> 'Bool -> 'Bool -> 'CullType -> 'List 'Deform -> 'Bool -> 'Bool -> 'List 'StageAttrs -> 'Bool->V12
@@ -350,7 +424,7 @@ testdata/Material.lc 164:7-164:18  'Tuple0
 testdata/Material.lc 166:7-166:17  'CommonAttrs->'Tuple0
 testdata/Material.lc 165:7-165:17  'CommonAttrs->'Tuple0
 testdata/Material.lc 182:23-182:34  Type
-testdata/Material.lc 183:22-195:32  'CommonAttrs
+testdata/Material.lc 183:22-196:6  'CommonAttrs
 testdata/Material.lc 183:22-183:33  'Tuple0 -> 'Tuple0 -> 'Bool -> 'Int -> 'Bool -> 'Bool -> 'CullType -> 'List 'Deform -> 'Bool -> 'Bool -> 'List 'StageAttrs -> 'Bool->'CommonAttrs
 testdata/Material.lc 184:27-184:29  'Tuple0
 testdata/Material.lc 185:27-185:29  'Tuple0
@@ -359,7 +433,11 @@ testdata/Material.lc 187:27-187:28  'Int
 testdata/Material.lc 188:27-188:32  'Bool
 testdata/Material.lc 189:27-189:32  'Bool
 testdata/Material.lc 190:27-190:40  'CullType
+testdata/Material.lc 191:27-191:29  'List 'Deform
+testdata/Material.lc 191:27-191:29  {a} -> 'List a
 testdata/Material.lc 192:27-192:32  'Bool
 testdata/Material.lc 193:27-193:32  'Bool
+testdata/Material.lc 194:27-194:29  'List 'StageAttrs
+testdata/Material.lc 194:27-194:29  {a} -> 'List a
 testdata/Material.lc 195:27-195:32  'Bool
 testdata/Material.lc 183:1-183:19  'CommonAttrs
diff --git a/testdata/Prelude.out b/testdata/Prelude.out
index 17c94c1c..3838228c 100644
--- a/testdata/Prelude.out
+++ b/testdata/Prelude.out
@@ -26,7 +26,6 @@ testdata/Prelude.lc 25:1-25:8  {a} -> {b} -> {c} -> (a -> b->c) -> 'Tuple2 a b -
 testdata/Prelude.lc 27:20-27:30  V2 -> V2->V2
 testdata/Prelude.lc 27:20-27:30  V2->V2
 testdata/Prelude.lc 27:20-27:30  V2
-testdata/Prelude.lc 27:20-27:30  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/Prelude.lc 27:21-27:24  V1
 testdata/Prelude.lc 27:21-27:22  V12
 testdata/Prelude.lc 27:23-27:24  V9
@@ -38,31 +37,38 @@ testdata/Prelude.lc 27:12-27:16  V5
 testdata/Prelude.lc 27:1-27:6  {a} -> {b} -> {c} -> {d} -> a->c -> b->d -> 'Tuple2 a b -> 'Tuple2 c d
 testdata/Prelude.lc 29:6-29:10  'Float
 testdata/Prelude.lc 29:1-29:3  'Float
-testdata/Prelude.lc 32:1-32:4  {a} -> a->a -> a
 testdata/Prelude.lc 31:8-34:39  V0->V1
 testdata/Prelude.lc 31:8-34:39  V1
 testdata/Prelude.lc 31:8-31:29  Type
+testdata/Prelude.lc 31:8-31:29  Type->Type
 testdata/Prelude.lc 31:9-31:10  Type
 testdata/Prelude.lc 31:9-31:10  V3
+testdata/Prelude.lc 31:15-31:29  Type->Type
 testdata/Prelude.lc 31:15-31:29  Type
 testdata/Prelude.lc 31:16-31:17  Type
 testdata/Prelude.lc 31:16-31:17  V2
+testdata/Prelude.lc 31:22-31:29  Type->Type
 testdata/Prelude.lc 31:22-31:29  Type
 testdata/Prelude.lc 31:23-31:28  Type
-testdata/Prelude.lc 31:23-31:28  Type -> Type->Type
 testdata/Prelude.lc 31:24-31:25  Type
 testdata/Prelude.lc 31:26-31:27  Type
-testdata/Prelude.lc 34:23-34:39  {a} -> {b} -> 'List a -> 'List b -> 'List ('Tuple2 a b)
-testdata/Prelude.lc 34:23-34:39  {a} -> 'List V1 -> 'List a -> 'List ('Tuple2 V3 a)
-testdata/Prelude.lc 34:23-34:39  'List V1 -> 'List V1 -> 'List ('Tuple2 V3 V2)
-testdata/Prelude.lc 34:23-34:39  'List V1 -> 'List ('Tuple2 V3 V2)
-testdata/Prelude.lc 34:23-34:39  'List ('Tuple2 V3 V2)
+testdata/Prelude.lc 32:22-34:39  {a} -> {b} -> 'List a -> 'List b -> 'List ('Tuple2 a b)
+testdata/Prelude.lc 32:22-34:39  {a} -> 'List V1 -> 'List a -> 'List ('Tuple2 V3 a)
+testdata/Prelude.lc 32:22-34:39  'List V1 -> 'List V1 -> 'List ('Tuple2 V3 V2)
+testdata/Prelude.lc 32:22-34:39  'List V1 -> 'List ('Tuple2 V3 V2)
+testdata/Prelude.lc 32:22-34:39  'List ('Tuple2 V3 V2)
+testdata/Prelude.lc 32:22-32:24  V0
+testdata/Prelude.lc 32:22-32:24  {a} -> 'List a
+testdata/Prelude.lc 33:22-34:39  V1 -> 'List V2 -> 'List V2
+testdata/Prelude.lc 33:22-34:39  'List V2 -> 'List V2
+testdata/Prelude.lc 33:22-34:39  'List V2
+testdata/Prelude.lc 33:22-33:24  V0
+testdata/Prelude.lc 33:22-33:24  {a} -> 'List a
 testdata/Prelude.lc 34:23-34:39  V1 -> 'List V2 -> 'List V2
 testdata/Prelude.lc 34:23-34:39  'List V2 -> 'List V2
 testdata/Prelude.lc 34:23-34:39  'List V2
 testdata/Prelude.lc 34:28-34:29  {a} -> a -> 'List a -> 'List a
 testdata/Prelude.lc 34:23-34:28  V0
-testdata/Prelude.lc 34:23-34:28  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/Prelude.lc 34:24-34:25  V1
 testdata/Prelude.lc 34:24-34:25  V10
 testdata/Prelude.lc 34:26-34:27  V0
@@ -73,18 +79,17 @@ testdata/Prelude.lc 34:34-34:36  'List V1
 testdata/Prelude.lc 34:34-34:36  'List V8
 testdata/Prelude.lc 34:37-34:39  'List V2
 testdata/Prelude.lc 32:1-32:4  {a} -> {b} -> 'List a -> 'List b -> 'List ('Tuple2 a b)
-testdata/Prelude.lc 37:1-37:6  {a} -> a->a -> a
 testdata/Prelude.lc 36:10-39:27  V0->V1
 testdata/Prelude.lc 36:10-39:27  V1
 testdata/Prelude.lc 36:10-36:30  Type
+testdata/Prelude.lc 36:10-36:30  Type->Type
 testdata/Prelude.lc 36:11-36:16  Type
-testdata/Prelude.lc 36:11-36:16  Type -> Type->Type
 testdata/Prelude.lc 36:12-36:13  Type
 testdata/Prelude.lc 36:12-36:13  V3
 testdata/Prelude.lc 36:14-36:15  Type
 testdata/Prelude.lc 36:14-36:15  V1
+testdata/Prelude.lc 36:21-36:30  Type->Type
 testdata/Prelude.lc 36:21-36:30  Type
-testdata/Prelude.lc 36:21-36:30  Type -> Type->Type
 testdata/Prelude.lc 36:22-36:25  Type
 testdata/Prelude.lc 36:23-36:24  Type
 testdata/Prelude.lc 36:26-36:29  Type
@@ -94,7 +99,10 @@ testdata/Prelude.lc 37:12-39:27  {a} -> 'List ('Tuple2 V1 a) -> 'Tuple2 ('List V
 testdata/Prelude.lc 37:12-39:27  'List ('Tuple2 V1 V0) -> 'Tuple2 ('List V2) ('List V1)
 testdata/Prelude.lc 37:12-39:27  'Tuple2 ('List V2) ('List V1)
 testdata/Prelude.lc 37:12-37:19  V0
-testdata/Prelude.lc 37:12-37:19  {a} -> {b} -> a -> b -> 'Tuple2 a b
+testdata/Prelude.lc 37:13-37:15  V1
+testdata/Prelude.lc 37:13-37:15  {a} -> 'List a
+testdata/Prelude.lc 37:16-37:18  V1
+testdata/Prelude.lc 37:16-37:18  {a} -> 'List a
 testdata/Prelude.lc 38:20-39:27  V2 -> 'List V3 -> 'Tuple2 ('List V3) ('List V2)
 testdata/Prelude.lc 38:20-39:27  'List V3 -> 'Tuple2 ('List V3) ('List V2)
 testdata/Prelude.lc 38:20-39:27  'Tuple2 ('List V3) ('List V2)
@@ -104,7 +112,6 @@ testdata/Prelude.lc 38:20-39:27  V2
 testdata/Prelude.lc 38:20-38:31  V2 -> V2->V2
 testdata/Prelude.lc 38:20-38:31  V2->V2
 testdata/Prelude.lc 38:20-38:31  V2
-testdata/Prelude.lc 38:20-38:31  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/Prelude.lc 38:21-38:25  V1
 testdata/Prelude.lc 38:22-38:23  {a} -> a -> 'List a -> 'List a
 testdata/Prelude.lc 38:21-38:22  V0
@@ -124,17 +131,18 @@ testdata/Prelude.lc 39:19-39:24  {a} -> {b} -> 'List ('Tuple2 a b) -> 'Tuple2 ('
 testdata/Prelude.lc 39:25-39:27  'List ('Tuple2 V1 V0)
 testdata/Prelude.lc 39:25-39:27  'List V10
 testdata/Prelude.lc 37:1-37:6  {a} -> {b} -> 'List ('Tuple2 a b) -> 'Tuple2 ('List a) ('List b)
-testdata/Prelude.lc 41:1-41:7  {a} -> a->a -> a
-testdata/Prelude.lc 42:27-44:48  V0->V1
-testdata/Prelude.lc 42:27-44:48  V1
-testdata/Prelude.lc 42:27-44:48  V1 -> 'List V2 -> 'List V2
-testdata/Prelude.lc 42:27-44:48  'List V2 -> 'List V2
-testdata/Prelude.lc 42:27-44:48  'List V2
-testdata/Prelude.lc 44:34-44:48  V0
+testdata/Prelude.lc 41:21-44:49  V0->V1
+testdata/Prelude.lc 41:21-44:49  V1
+testdata/Prelude.lc 41:21-41:23  V0
+testdata/Prelude.lc 41:21-41:23  {a} -> 'List a
+testdata/Prelude.lc 42:22-44:49  V1 -> 'List V2 -> 'List V2
+testdata/Prelude.lc 42:22-44:49  'List V2 -> 'List V2
+testdata/Prelude.lc 42:22-44:49  'List V2
+testdata/Prelude.lc 44:33-44:49  V0
 testdata/Prelude.lc 44:34-44:40  V12
 testdata/Prelude.lc 44:41-44:45  V13
 testdata/Prelude.lc 44:46-44:48  'List V10
-testdata/Prelude.lc 43:33-43:51  V0
+testdata/Prelude.lc 43:32-43:52  V0
 testdata/Prelude.lc 43:35-43:36  {a} -> a -> 'List a -> 'List a
 testdata/Prelude.lc 43:33-43:34  V0
 testdata/Prelude.lc 43:33-43:34  V7
@@ -149,8 +157,10 @@ testdata/Prelude.lc 42:27-42:31  V6
 testdata/Prelude.lc 42:32-42:33  V5
 testdata/Prelude.lc 41:1-41:7  {a} -> a->'Bool -> 'List a -> 'List a
 testdata/Prelude.lc 46:9-46:17  Type
+testdata/Prelude.lc 46:9-46:17  Type->Type
 testdata/Prelude.lc 46:10-46:11  Type
 testdata/Prelude.lc 46:10-46:11  V1
+testdata/Prelude.lc 46:16-46:17  Type->Type
 testdata/Prelude.lc 46:16-46:17  Type
 testdata/Prelude.lc 47:7-47:16  {a} -> 'List a -> a
 testdata/Prelude.lc 47:7-47:16  'List V0 -> V1
@@ -162,8 +172,10 @@ testdata/Prelude.lc 47:15-47:16  V3
 testdata/Prelude.lc 47:7-47:11  'List V1
 testdata/Prelude.lc 47:1-47:5  {a} -> 'List a -> a
 testdata/Prelude.lc 49:9-49:19  Type
+testdata/Prelude.lc 49:9-49:19  Type->Type
 testdata/Prelude.lc 49:10-49:11  Type
 testdata/Prelude.lc 49:10-49:11  V1
+testdata/Prelude.lc 49:16-49:19  Type->Type
 testdata/Prelude.lc 49:16-49:19  Type
 testdata/Prelude.lc 49:17-49:18  Type
 testdata/Prelude.lc 50:7-50:18  {a} -> 'List a -> 'List a
@@ -176,25 +188,25 @@ testdata/Prelude.lc 50:16-50:18  'List V3
 testdata/Prelude.lc 50:7-50:12  'List V1
 testdata/Prelude.lc 50:1-50:5  {a} -> 'List a -> 'List a
 testdata/Prelude.lc 52:10-52:25  Type
+testdata/Prelude.lc 52:10-52:25  Type->Type
 testdata/Prelude.lc 52:11-52:12  Type
 testdata/Prelude.lc 52:11-52:12  V1
+testdata/Prelude.lc 52:17-52:25  Type->Type
 testdata/Prelude.lc 52:17-52:25  Type
 testdata/Prelude.lc 52:18-52:24  Type
-testdata/Prelude.lc 52:18-52:24  Type -> Type->Type
 testdata/Prelude.lc 52:19-52:20  Type
 testdata/Prelude.lc 52:22-52:23  Type
-testdata/Prelude.lc 53:11-53:24  {a} -> 'List a -> 'List ('Tuple2 a a)
-testdata/Prelude.lc 53:11-53:24  'List V0 -> 'List ('Tuple2 V1 V1)
-testdata/Prelude.lc 53:11-53:24  'List ('Tuple2 V1 V1)
+testdata/Prelude.lc 53:11-53:25  {a} -> 'List a -> 'List ('Tuple2 a a)
+testdata/Prelude.lc 53:11-53:25  'List V0 -> 'List ('Tuple2 V1 V1)
+testdata/Prelude.lc 53:11-53:25  'List ('Tuple2 V1 V1)
 testdata/Prelude.lc 53:11-53:14  {a} -> {b} -> 'List a -> 'List b -> 'List ('Tuple2 a b)
 testdata/Prelude.lc 53:15-53:16  'List V1
 testdata/Prelude.lc 53:15-53:16  'List V3
-testdata/Prelude.lc 53:18-53:24  'List V1
+testdata/Prelude.lc 53:17-53:25  'List V1
 testdata/Prelude.lc 53:18-53:22  {a} -> 'List a -> 'List a
 testdata/Prelude.lc 53:23-53:24  'List V0
 testdata/Prelude.lc 53:23-53:24  'List V2
 testdata/Prelude.lc 53:1-53:6  {a} -> 'List a -> 'List ('Tuple2 a a)
-testdata/Prelude.lc 55:1-55:7  {a} -> a->a -> a
 testdata/Prelude.lc 55:17-56:41  V0->V1
 testdata/Prelude.lc 55:17-56:41  V1
 testdata/Prelude.lc 55:17-55:18  V0
@@ -212,7 +224,6 @@ testdata/Prelude.lc 55:1-55:7  {a} -> {b} -> (a -> b->a) -> a -> 'List b -> a
 testdata/Prelude.lc 58:16-58:17  V0
 testdata/Prelude.lc 58:16-58:17  V2
 testdata/Prelude.lc 58:1-58:10  {a} -> a -> 'List a
-testdata/Prelude.lc 60:1-60:7  {a} -> a->a -> a
 testdata/Prelude.lc 60:20-61:36  V0->V1
 testdata/Prelude.lc 60:20-61:36  V1
 testdata/Prelude.lc 60:20-60:22  V0
@@ -231,10 +242,13 @@ testdata/Prelude.lc 60:1-60:7  {a} -> 'List a -> 'List a -> 'List a
 testdata/Prelude.lc 63:10-63:16  {a} -> {b} -> (a -> b->a) -> a -> 'List b -> a
 testdata/Prelude.lc 63:17-63:23  V1 -> V1->V3
 testdata/Prelude.lc 63:17-63:23  {a} -> 'List a -> 'List a -> 'List a
+testdata/Prelude.lc 63:24-63:26  'List V0
+testdata/Prelude.lc 63:24-63:26  {a} -> 'List a
 testdata/Prelude.lc 63:1-63:7  {a} -> 'List ('List a) -> 'List a
-testdata/Prelude.lc 65:1-65:4  {a} -> a->a -> a
-testdata/Prelude.lc 66:16-66:30  V0->V1
-testdata/Prelude.lc 66:16-66:30  V1
+testdata/Prelude.lc 65:16-66:30  V0->V1
+testdata/Prelude.lc 65:16-66:30  V1
+testdata/Prelude.lc 65:16-65:18  V0
+testdata/Prelude.lc 65:16-65:18  {a} -> 'List a
 testdata/Prelude.lc 66:16-66:30  V1 -> 'List V2 -> 'List V2
 testdata/Prelude.lc 66:16-66:30  'List V2 -> 'List V2
 testdata/Prelude.lc 66:16-66:30  'List V2
@@ -247,39 +261,44 @@ testdata/Prelude.lc 66:22-66:25  V8
 testdata/Prelude.lc 66:26-66:27  V6->V6
 testdata/Prelude.lc 66:28-66:30  'List V7
 testdata/Prelude.lc 65:1-65:4  {a} -> {b} -> a->b -> 'List a -> 'List b
-testdata/Prelude.lc 68:15-68:38  Type
+testdata/Prelude.lc 68:14-68:38  Type
+testdata/Prelude.lc 68:14-68:38  Type->Type
 testdata/Prelude.lc 68:15-68:16  V3
+testdata/Prelude.lc 68:20-68:23  Type->Type
 testdata/Prelude.lc 68:20-68:23  Type
 testdata/Prelude.lc 68:21-68:22  Type
 testdata/Prelude.lc 68:21-68:22  V2
+testdata/Prelude.lc 68:28-68:38  Type->Type
 testdata/Prelude.lc 68:28-68:38  Type
 testdata/Prelude.lc 68:29-68:30  Type
+testdata/Prelude.lc 68:35-68:38  Type->Type
 testdata/Prelude.lc 68:35-68:38  Type
 testdata/Prelude.lc 68:36-68:37  Type
-testdata/Prelude.lc 69:17-69:32  {a} -> {b} -> (a -> 'List b) -> 'List a -> 'List b
-testdata/Prelude.lc 69:17-69:32  {a} -> (V1 -> 'List a) -> 'List V2 -> 'List a
-testdata/Prelude.lc 69:17-69:32  (V1 -> 'List V1) -> 'List V2 -> 'List V2
-testdata/Prelude.lc 69:17-69:32  'List V2 -> 'List V2
-testdata/Prelude.lc 69:17-69:32  'List V2
+testdata/Prelude.lc 69:17-69:33  {a} -> {b} -> (a -> 'List b) -> 'List a -> 'List b
+testdata/Prelude.lc 69:17-69:33  {a} -> (V1 -> 'List a) -> 'List V2 -> 'List a
+testdata/Prelude.lc 69:17-69:33  (V1 -> 'List V1) -> 'List V2 -> 'List V2
+testdata/Prelude.lc 69:17-69:33  'List V2 -> 'List V2
+testdata/Prelude.lc 69:17-69:33  'List V2
 testdata/Prelude.lc 69:17-69:23  {a} -> 'List ('List a) -> 'List a
-testdata/Prelude.lc 69:25-69:32  'List ('List V0)
+testdata/Prelude.lc 69:24-69:33  'List ('List V0)
 testdata/Prelude.lc 69:25-69:28  {a} -> {b} -> a->b -> 'List a -> 'List b
 testdata/Prelude.lc 69:29-69:30  V1->V1
 testdata/Prelude.lc 69:29-69:30  V6 -> 'List V6
 testdata/Prelude.lc 69:31-69:32  'List V3
 testdata/Prelude.lc 69:1-69:10  {a} -> {b} -> (a -> 'List b) -> 'List a -> 'List b
-testdata/Prelude.lc 71:1-71:6  {a} -> a->a -> a
 testdata/Prelude.lc 71:12-72:55  V0->V1
 testdata/Prelude.lc 71:12-72:55  V1
 testdata/Prelude.lc 71:12-71:20  V0
-testdata/Prelude.lc 71:12-71:20  {a} -> {b} -> a -> b -> 'Tuple2 a b
+testdata/Prelude.lc 71:13-71:15  V1
+testdata/Prelude.lc 71:13-71:15  {a} -> 'List a
+testdata/Prelude.lc 71:17-71:19  V1
+testdata/Prelude.lc 71:17-71:19  {a} -> 'List a
 testdata/Prelude.lc 72:17-72:55  V2 -> 'List V3 -> 'Tuple2 ('List V3) ('List V2)
 testdata/Prelude.lc 72:17-72:55  'List V3 -> 'Tuple2 ('List V3) ('List V2)
 testdata/Prelude.lc 72:17-72:55  'Tuple2 ('List V3) ('List V2)
 testdata/Prelude.lc 72:17-72:28  V2 -> V2->V2
 testdata/Prelude.lc 72:17-72:28  V2->V2
 testdata/Prelude.lc 72:17-72:28  V2
-testdata/Prelude.lc 72:17-72:28  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/Prelude.lc 72:18-72:23  V1
 testdata/Prelude.lc 72:19-72:20  {a} -> a -> 'List a -> 'List a
 testdata/Prelude.lc 72:18-72:19  V0
@@ -294,7 +313,6 @@ testdata/Prelude.lc 72:47-72:55  'Tuple2 ('List V2) ('List V3)
 testdata/Prelude.lc 72:47-72:52  V7
 testdata/Prelude.lc 72:53-72:55  'List V6
 testdata/Prelude.lc 71:1-71:6  {a} -> 'List a -> 'Tuple2 ('List a) ('List a)
-testdata/Prelude.lc 74:1-74:8  {a} -> a->a -> a
 testdata/Prelude.lc 74:12-78:21  V0->V1
 testdata/Prelude.lc 74:12-78:21  V1
 testdata/Prelude.lc 77:19-77:21  V0
@@ -304,14 +322,14 @@ testdata/Prelude.lc 74:19-78:21  'List V1 -> V4
 testdata/Prelude.lc 74:19-78:21  V4
 testdata/Prelude.lc 78:19-78:21  V0
 testdata/Prelude.lc 78:19-78:21  V8
-testdata/Prelude.lc 74:32-76:32  V0 -> 'List V1 -> V9
-testdata/Prelude.lc 74:32-76:32  'List V1 -> V9
-testdata/Prelude.lc 74:32-76:32  V9
-testdata/Prelude.lc 75:11-75:32  V0
+testdata/Prelude.lc 74:27-76:32  V0 -> 'List V1 -> V9
+testdata/Prelude.lc 74:27-76:32  'List V1 -> V9
+testdata/Prelude.lc 74:27-76:32  V9
+testdata/Prelude.lc 75:11-75:33  V0
 testdata/Prelude.lc 75:12-75:13  {a} -> a -> 'List a -> 'List a
 testdata/Prelude.lc 75:11-75:12  V0
 testdata/Prelude.lc 75:11-75:12  V9
-testdata/Prelude.lc 75:14-75:32  'List V7
+testdata/Prelude.lc 75:14-75:33  'List V7
 testdata/Prelude.lc 75:14-75:21  V15
 testdata/Prelude.lc 75:22-75:23  V16
 testdata/Prelude.lc 75:24-75:26  'List V11
@@ -326,7 +344,7 @@ testdata/Prelude.lc 76:10-76:11  V5
 testdata/Prelude.lc 76:13-76:32  'List V6
 testdata/Prelude.lc 76:13-76:20  V12 -> 'List V7 -> 'List V8 -> 'List V9
 testdata/Prelude.lc 76:21-76:22  V12
-testdata/Prelude.lc 76:24-76:28  'List V6
+testdata/Prelude.lc 76:23-76:29  'List V6
 testdata/Prelude.lc 76:25-76:26  {a} -> a -> 'List a -> 'List a
 testdata/Prelude.lc 76:24-76:25  V0
 testdata/Prelude.lc 76:24-76:25  V7
@@ -343,24 +361,25 @@ testdata/Prelude.lc 74:36-74:37  V8
 testdata/Prelude.lc 74:19-74:23  'List V2
 testdata/Prelude.lc 74:12-74:16  'List V0
 testdata/Prelude.lc 74:1-74:8  {a} -> (a -> a->'Ordering) -> 'List a -> 'List a -> 'List a
-testdata/Prelude.lc 80:1-80:7  {a} -> a->a -> a
-testdata/Prelude.lc 81:16-82:69  V0->V1
-testdata/Prelude.lc 81:16-82:69  V1
-testdata/Prelude.lc 81:16-82:69  V1 -> 'List V2 -> 'List V2
-testdata/Prelude.lc 81:16-82:69  'List V2 -> 'List V2
-testdata/Prelude.lc 81:16-82:69  'List V2
+testdata/Prelude.lc 80:15-82:71  V0->V1
+testdata/Prelude.lc 80:15-82:71  V1
+testdata/Prelude.lc 80:15-80:17  V0
+testdata/Prelude.lc 80:15-80:17  {a} -> 'List a
+testdata/Prelude.lc 81:16-82:71  V1 -> 'List V2 -> 'List V2
+testdata/Prelude.lc 81:16-82:71  'List V2 -> 'List V2
+testdata/Prelude.lc 81:16-82:71  'List V2
 testdata/Prelude.lc 81:16-81:19  V0
 testdata/Prelude.lc 81:17-81:18  V0
 testdata/Prelude.lc 81:17-81:18  V6
-testdata/Prelude.lc 82:15-82:69  V0 -> 'List V1 -> 'List V6
-testdata/Prelude.lc 82:15-82:69  'List V1 -> 'List V6
-testdata/Prelude.lc 82:15-82:69  'List V6
+testdata/Prelude.lc 82:15-82:71  V0 -> 'List V1 -> 'List V6
+testdata/Prelude.lc 82:15-82:71  'List V1 -> 'List V6
+testdata/Prelude.lc 82:15-82:71  'List V6
 testdata/Prelude.lc 82:15-82:22  {a} -> {b} -> {c} -> (a -> b->c) -> 'Tuple2 a b -> c
-testdata/Prelude.lc 82:24-82:33  V2 -> V2->V2
+testdata/Prelude.lc 82:23-82:34  V2 -> V2->V2
 testdata/Prelude.lc 82:24-82:31  {a} -> (a -> a->'Ordering) -> 'List a -> 'List a -> 'List a
 testdata/Prelude.lc 82:32-82:33  V0 -> V1->'Ordering
 testdata/Prelude.lc 82:32-82:33  V14
-testdata/Prelude.lc 82:37-82:69  'Tuple2 ('List V6) ('List V6)
+testdata/Prelude.lc 82:35-82:71  'Tuple2 ('List V6) ('List V6)
 testdata/Prelude.lc 82:46-82:49  {a} -> {b} -> {c} -> {d} -> a->c -> b->d -> 'Tuple2 a b -> 'Tuple2 c d
 testdata/Prelude.lc 82:37-82:45  V3->V2
 testdata/Prelude.lc 82:37-82:43  V15
@@ -368,46 +387,52 @@ testdata/Prelude.lc 82:44-82:45  V13 -> V14->'Ordering
 testdata/Prelude.lc 82:50-82:58  V2->V1
 testdata/Prelude.lc 82:50-82:56  (V10 -> V11->'Ordering) -> V4->V3
 testdata/Prelude.lc 82:57-82:58  V8 -> V9->'Ordering
-testdata/Prelude.lc 82:61-82:69  'Tuple2 V0 V0
+testdata/Prelude.lc 82:60-82:70  'Tuple2 V0 V0
 testdata/Prelude.lc 82:61-82:66  {a} -> 'List a -> 'Tuple2 ('List a) ('List a)
 testdata/Prelude.lc 82:67-82:69  'List V0
 testdata/Prelude.lc 82:67-82:69  V10
 testdata/Prelude.lc 80:1-80:7  {a} -> (a -> a->'Ordering) -> 'List a -> 'List a
 testdata/Prelude.lc 84:8-84:14  {a} -> 'List a -> 'List a -> 'List a
 testdata/Prelude.lc 84:1-84:5  {a} -> 'List a -> 'List a -> 'List a
-testdata/Prelude.lc 88:1-88:8  {a} -> a->a -> a
-testdata/Prelude.lc 87:13-88:34  V0->V1
-testdata/Prelude.lc 87:13-88:34  V1
-testdata/Prelude.lc 87:13-87:32  Type
+testdata/Prelude.lc 87:12-88:35  V0->V1
+testdata/Prelude.lc 87:12-88:35  V1
+testdata/Prelude.lc 87:12-87:32  Type
+testdata/Prelude.lc 87:12-87:32  Type->Type
 testdata/Prelude.lc 87:13-87:14  V1
+testdata/Prelude.lc 87:18-87:19  Type->Type
 testdata/Prelude.lc 87:18-87:19  Type
+testdata/Prelude.lc 87:24-87:32  Type->Type
 testdata/Prelude.lc 87:24-87:32  Type
 testdata/Prelude.lc 87:24-87:25  Type
+testdata/Prelude.lc 87:29-87:32  Type->Type
 testdata/Prelude.lc 87:29-87:32  Type
 testdata/Prelude.lc 87:30-87:31  Type
-testdata/Prelude.lc 88:16-88:34  {a} -> a->a -> a -> 'List a
-testdata/Prelude.lc 88:16-88:34  V0->V1 -> V1 -> 'List V2
-testdata/Prelude.lc 88:16-88:34  V1 -> 'List V2
-testdata/Prelude.lc 88:16-88:34  'List V2
+testdata/Prelude.lc 88:16-88:35  {a} -> a->a -> a -> 'List a
+testdata/Prelude.lc 88:16-88:35  V0->V1 -> V1 -> 'List V2
+testdata/Prelude.lc 88:16-88:35  V1 -> 'List V2
+testdata/Prelude.lc 88:16-88:35  'List V2
 testdata/Prelude.lc 88:18-88:19  {a} -> a -> 'List a -> 'List a
 testdata/Prelude.lc 88:16-88:17  V0
 testdata/Prelude.lc 88:16-88:17  V3
-testdata/Prelude.lc 88:20-88:34  'List V2
+testdata/Prelude.lc 88:20-88:35  'List V2
 testdata/Prelude.lc 88:20-88:27  {a} -> a->a -> a -> 'List a
 testdata/Prelude.lc 88:28-88:29  V0->V1
 testdata/Prelude.lc 88:28-88:29  V3->V4
-testdata/Prelude.lc 88:31-88:34  V2
+testdata/Prelude.lc 88:30-88:35  V2
 testdata/Prelude.lc 88:31-88:32  V2->V3
 testdata/Prelude.lc 88:33-88:34  V2
 testdata/Prelude.lc 88:1-88:8  {a} -> a->a -> a -> 'List a
 testdata/Prelude.lc 90:6-90:11  Type->Type
 testdata/Prelude.lc 90:6-90:11  Type
 testdata/Prelude.lc 91:7-91:14  {a} -> 'Maybe a
+testdata/Prelude.lc 90:6-92:13  Type->Type
 testdata/Prelude.lc 90:6-92:13  Type
 testdata/Prelude.lc 92:12-92:13  Type
 testdata/Prelude.lc 92:7-92:11  {a} -> a -> 'Maybe a
+testdata/Prelude.lc 90:6-92:11  Type->Type
 testdata/Prelude.lc 90:6-92:11  Type
 testdata/Prelude.lc 91:7-91:14  'Maybe V1
+testdata/Prelude.lc 92:7-92:11  Type->Type
 testdata/Prelude.lc 92:7-92:11  Type
 testdata/Prelude.lc 92:7-92:11  'Maybe V3
 testdata/Prelude.lc 96:14-96:15  V2 -> V2->V2
@@ -424,20 +449,19 @@ testdata/Prelude.lc 97:14-97:15  V3
 testdata/Prelude.lc 97:6-97:10  'Tuple2 V1 V0
 testdata/Prelude.lc 97:6-97:10  V3
 testdata/Prelude.lc 97:1-97:4  {a} -> {b} -> 'Tuple2 a b -> b
-testdata/Prelude.lc 100:1-100:8  {a} -> a->a -> a
 testdata/Prelude.lc 99:12-101:34  V0->V1
 testdata/Prelude.lc 99:12-101:34  V1
 testdata/Prelude.lc 99:12-99:26  Type
 testdata/Prelude.lc 99:13-99:17  Type
+testdata/Prelude.lc 99:22-99:26  Type->Type
 testdata/Prelude.lc 99:22-99:26  Type
-testdata/Prelude.lc 100:15-101:34  'List Type -> Type
-testdata/Prelude.lc 100:15-101:34  Type
-testdata/Prelude.lc 100:15-100:17  V0
-testdata/Prelude.lc 100:15-100:17  Type
-testdata/Prelude.lc 101:19-101:34  V0 -> 'List V1 -> Type
-testdata/Prelude.lc 101:19-101:34  'List V1 -> Type
-testdata/Prelude.lc 101:19-101:34  Type
-testdata/Prelude.lc 101:19-101:34  Type -> Type->Type
+testdata/Prelude.lc 100:14-101:34  'List Type -> Type
+testdata/Prelude.lc 100:14-101:34  Type
+testdata/Prelude.lc 100:14-100:17  V0
+testdata/Prelude.lc 100:14-100:17  Type
+testdata/Prelude.lc 101:18-101:34  V0 -> 'List V1 -> Type
+testdata/Prelude.lc 101:18-101:34  'List V1 -> Type
+testdata/Prelude.lc 101:18-101:34  Type
 testdata/Prelude.lc 101:20-101:21  Type
 testdata/Prelude.lc 101:20-101:21  V2
 testdata/Prelude.lc 101:23-101:33  Type
@@ -445,34 +469,36 @@ testdata/Prelude.lc 101:23-101:30  'List Type -> Type
 testdata/Prelude.lc 101:31-101:33  'List Type
 testdata/Prelude.lc 100:1-100:8  'List Type -> Type
 testdata/Prelude.lc 103:22-103:36  Type
-testdata/Prelude.lc 103:22-103:36  Type -> Type->Type
 testdata/Prelude.lc 103:23-103:29  Type
 testdata/Prelude.lc 103:31-103:35  Type
 testdata/Prelude.lc 103:6-103:13  'List ('Tuple2 'String Type) -> Type
-testdata/Prelude.lc 103:6-104:38  Type
+testdata/Prelude.lc 103:6-104:40  Type->Type
+testdata/Prelude.lc 103:6-104:40  Type
 testdata/Prelude.lc 104:19-104:26  'List Type -> Type
-testdata/Prelude.lc 104:28-104:38  'List Type
+testdata/Prelude.lc 104:27-104:39  'List Type
 testdata/Prelude.lc 104:28-104:31  {a} -> {b} -> a->b -> 'List a -> 'List b
 testdata/Prelude.lc 104:32-104:35  V1->V1
 testdata/Prelude.lc 104:32-104:35  {a} -> {b} -> 'Tuple2 a b -> b
 testdata/Prelude.lc 104:36-104:38  'List ('Tuple2 V0 Type)
 testdata/Prelude.lc 104:36-104:38  'List ('Tuple2 'String Type)
+testdata/Prelude.lc 103:6-103:13  Type->Type
 testdata/Prelude.lc 103:6-103:13  Type
 testdata/Prelude.lc 104:7-104:17  {a : 'List ('Tuple2 'String Type)} -> tuptype (map ('Tuple2 'String Type) Type (\(b : 'Tuple2 'String Type) -> snd 'String Type b) a) -> 'RecordC a
+testdata/Prelude.lc 103:6-104:17  Type->Type
 testdata/Prelude.lc 103:6-104:17  Type
+testdata/Prelude.lc 104:7-104:17  Type->Type
 testdata/Prelude.lc 104:7-104:17  Type
 testdata/Prelude.lc 104:7-104:17  'RecordC V2
-testdata/Prelude.lc 106:1-106:7  {a} -> a->a -> a
-testdata/Prelude.lc 106:11-107:36  V0->V1
-testdata/Prelude.lc 106:11-107:36  V1
-testdata/Prelude.lc 106:16-107:36  V1 -> 'List V2 -> V2
-testdata/Prelude.lc 106:16-107:36  'List V2 -> V2
-testdata/Prelude.lc 106:16-107:36  V2
+testdata/Prelude.lc 106:11-107:37  V0->V1
+testdata/Prelude.lc 106:11-107:37  V1
+testdata/Prelude.lc 106:16-107:37  V1 -> 'List V2 -> V2
+testdata/Prelude.lc 106:16-107:37  'List V2 -> V2
+testdata/Prelude.lc 106:16-107:37  V2
 testdata/Prelude.lc 106:16-106:17  V0
 testdata/Prelude.lc 106:16-106:17  V5
-testdata/Prelude.lc 107:20-107:36  V0 -> 'List V1 -> V6
-testdata/Prelude.lc 107:20-107:36  'List V1 -> V6
-testdata/Prelude.lc 107:20-107:36  V6
+testdata/Prelude.lc 107:20-107:37  V0 -> 'List V1 -> V6
+testdata/Prelude.lc 107:20-107:37  'List V1 -> V6
+testdata/Prelude.lc 107:20-107:37  V6
 testdata/Prelude.lc 107:20-107:21  V10
 testdata/Prelude.lc 107:22-107:23  V9
 testdata/Prelude.lc 107:25-107:31  V15
@@ -501,39 +527,42 @@ testdata/Prelude.lc 117:14-117:15  V1
 testdata/Prelude.lc 117:1-117:5  'Bool
 testdata/Prelude.lc 117:1-117:5  V2
 testdata/Prelude.lc 117:6-117:9  'Bool -> 'Bool->'Bool
-testdata/Prelude.lc 127:10-127:19  Type->Type
-testdata/Prelude.lc 127:10-127:19  Type
-testdata/Prelude.lc 127:10-127:12  Type
+testdata/Prelude.lc 127:13-127:19  Type->Type
 testdata/Prelude.lc 127:13-127:19  Type
 testdata/Prelude.lc 122:7-122:9  Type->Type
 testdata/Prelude.lc 122:7-123:28  Type
+testdata/Prelude.lc 122:7-123:28  Type->Type
+testdata/Prelude.lc 123:14-123:28  Type->Type
 testdata/Prelude.lc 123:14-123:28  Type
 testdata/Prelude.lc 123:14-123:15  Type
+testdata/Prelude.lc 123:19-123:28  Type->Type
 testdata/Prelude.lc 123:19-123:28  Type
 testdata/Prelude.lc 123:19-123:20  Type
+testdata/Prelude.lc 123:24-123:28  Type->Type
 testdata/Prelude.lc 123:24-123:28  Type
-testdata/Prelude.lc 127:13-128:42  {a} -> {b : 'Eq a} -> a -> a->'Bool
-testdata/Prelude.lc 127:13-128:42  {a : 'Eq V0} -> V1 -> V2->'Bool
-testdata/Prelude.lc 128:15-128:42  {a:'Unit} -> 'String -> 'String->'Bool
-testdata/Prelude.lc 128:15-128:42  'String -> 'String->'Bool
-testdata/Prelude.lc 128:15-128:42  'String->'Bool
-testdata/Prelude.lc 128:15-128:42  'Bool
+testdata/Prelude.lc 127:13-128:43  {a} -> {b : 'Eq a} -> a -> a->'Bool
+testdata/Prelude.lc 127:13-128:43  {a : 'Eq V0} -> V1 -> V2->'Bool
+testdata/Prelude.lc 128:15-128:43  {a:'Unit} -> 'String -> 'String->'Bool
+testdata/Prelude.lc 128:15-128:43  'String -> 'String->'Bool
+testdata/Prelude.lc 128:15-128:43  'String->'Bool
+testdata/Prelude.lc 128:15-128:43  'Bool
 testdata/Prelude.lc 128:15-128:19  'Ordering->'Bool
-testdata/Prelude.lc 128:21-128:42  'Ordering
+testdata/Prelude.lc 128:20-128:43  'Ordering
 testdata/Prelude.lc 128:21-128:38  'String -> 'String->'Ordering
 testdata/Prelude.lc 128:39-128:40  'String
 testdata/Prelude.lc 128:41-128:42  'String
 testdata/Prelude.lc 123:5-123:10  {a} -> {b : 'Eq a} -> a -> a->'Bool
+testdata/Prelude.lc 163:30-163:36  Type->Type
 testdata/Prelude.lc 163:30-163:36  Type
 testdata/Prelude.lc 163:30-163:31  V3
+testdata/Prelude.lc 163:35-163:36  Type->Type
 testdata/Prelude.lc 163:35-163:36  Type
 testdata/Prelude.lc 163:35-163:36  V2
 testdata/Prelude.lc 163:1-163:13  {a} -> {b} -> a->b
-testdata/Prelude.lc 165:1-165:7  {a} -> a->a -> a
-testdata/Prelude.lc 165:18-166:71  V0->V1
-testdata/Prelude.lc 165:18-166:71  V1
-testdata/Prelude.lc 165:18-165:26  V0
-testdata/Prelude.lc 165:18-165:23  'String->Type
+testdata/Prelude.lc 165:17-166:71  V0->V1
+testdata/Prelude.lc 165:17-166:71  V1
+testdata/Prelude.lc 165:17-165:26  V0
+testdata/Prelude.lc 165:17-165:23  'String->Type
 testdata/Prelude.lc 165:24-165:26  'String
 testdata/Prelude.lc 166:29-166:71  V0 -> 'List V1 -> Type
 testdata/Prelude.lc 166:29-166:71  'List V1 -> Type
@@ -541,7 +570,6 @@ testdata/Prelude.lc 166:29-166:71  Type
 testdata/Prelude.lc 166:29-166:71  V2 -> V2->V2
 testdata/Prelude.lc 166:29-166:71  V2->V2
 testdata/Prelude.lc 166:29-166:71  V2
-testdata/Prelude.lc 166:29-166:71  {a} -> 'Bool -> a -> a->a
 testdata/Prelude.lc 166:32-166:40  'Bool
 testdata/Prelude.lc 166:34-166:37  {a} -> {b : 'Eq a} -> a -> a->'Bool
 testdata/Prelude.lc 166:32-166:33  V1
@@ -559,66 +587,70 @@ testdata/Prelude.lc 166:65-166:66  V13
 testdata/Prelude.lc 166:67-166:68  Type
 testdata/Prelude.lc 166:69-166:71  'List V9
 testdata/Prelude.lc 165:1-165:7  {a} -> {b : 'Eq a} -> a -> Type -> 'List ('Tuple2 a Type) -> Type
-testdata/Prelude.lc 170:1-170:8  {a} -> a->a -> a
-testdata/Prelude.lc 169:28-171:161  V0->V1
-testdata/Prelude.lc 169:28-171:161  V1
+testdata/Prelude.lc 169:12-171:164  V0->V1
+testdata/Prelude.lc 169:12-171:164  V1
+testdata/Prelude.lc 169:12-169:105  Type
+testdata/Prelude.lc 169:28-169:105  Type->Type
 testdata/Prelude.lc 169:28-169:105  Type
 testdata/Prelude.lc 169:29-169:43  Type
-testdata/Prelude.lc 169:29-169:43  Type -> Type->Type
 testdata/Prelude.lc 169:30-169:36  Type
 testdata/Prelude.lc 169:38-169:42  Type
-testdata/Prelude.lc 169:61-169:105  Type
+testdata/Prelude.lc 169:48-169:105  Type->Type
+testdata/Prelude.lc 169:48-169:105  Type
 testdata/Prelude.lc 169:61-169:67  Type
-testdata/Prelude.lc 169:73-169:105  Type
-testdata/Prelude.lc 169:73-169:79  {a} -> {b : 'Eq a} -> a -> Type -> 'List ('Tuple2 a Type) -> Type
+testdata/Prelude.lc 169:72-169:105  Type->Type
+testdata/Prelude.lc 169:72-169:105  Type
+testdata/Prelude.lc 169:72-169:79  {a} -> {b : 'Eq a} -> a -> Type -> 'List ('Tuple2 a Type) -> Type
 testdata/Prelude.lc 169:80-169:81  V1
 testdata/Prelude.lc 169:80-169:81  'String
 testdata/Prelude.lc 169:82-169:83  Type
 testdata/Prelude.lc 169:82-169:83  V3
 testdata/Prelude.lc 169:84-169:86  'List ('Tuple2 'String Type)
+testdata/Prelude.lc 169:90-169:105  Type->Type
 testdata/Prelude.lc 169:90-169:105  Type
 testdata/Prelude.lc 169:90-169:97  'List ('Tuple2 'String Type) -> Type
 testdata/Prelude.lc 169:98-169:100  'List ('Tuple2 'String Type)
+testdata/Prelude.lc 169:104-169:105  Type->Type
 testdata/Prelude.lc 169:104-169:105  Type
-testdata/Prelude.lc 170:15-171:161  {a} -> {b : 'List ('Tuple2 'String Type)} -> c:'String -> {d : isKeyC 'String TT c a b} -> 'RecordC b -> a
-testdata/Prelude.lc 170:15-171:161  {a : 'List ('Tuple2 'String Type)} -> b:'String -> {c : isKeyC 'String TT b V2 a} -> 'RecordC a -> V4
-testdata/Prelude.lc 170:15-171:161  a:'String -> {b : isKeyC 'String TT a V2 V1} -> 'RecordC V2 -> V4
-testdata/Prelude.lc 170:15-171:161  {a : isKeyC 'String TT V0 V2 V1} -> 'RecordC V2 -> V4
-testdata/Prelude.lc 170:15-171:161  'RecordC V2 -> V4
-testdata/Prelude.lc 170:15-171:161  V4
-testdata/Prelude.lc 170:45-171:161  V1 -> 'List V2 -> V2
-testdata/Prelude.lc 170:45-171:161  'List V2 -> V2
-testdata/Prelude.lc 170:45-171:161  V2
-testdata/Prelude.lc 170:45-171:161  V2 -> V2->V2
-testdata/Prelude.lc 170:45-171:161  V2->V2
-testdata/Prelude.lc 170:51-171:161  tuptype (map ('Tuple2 'String Type) Type (\(a : 'Tuple2 'String Type) -> snd 'String Type a) V1) -> V1
-testdata/Prelude.lc 170:51-171:161  V1
-testdata/Prelude.lc 171:51-171:161  V0
+testdata/Prelude.lc 170:15-171:164  {a} -> {b : 'List ('Tuple2 'String Type)} -> c:'String -> {d : isKeyC 'String TT c a b} -> 'RecordC b -> a
+testdata/Prelude.lc 170:15-171:164  {a : 'List ('Tuple2 'String Type)} -> b:'String -> {c : isKeyC 'String TT b V2 a} -> 'RecordC a -> V4
+testdata/Prelude.lc 170:15-171:164  a:'String -> {b : isKeyC 'String TT a V2 V1} -> 'RecordC V2 -> V4
+testdata/Prelude.lc 170:15-171:164  {a : isKeyC 'String TT V0 V2 V1} -> 'RecordC V2 -> V4
+testdata/Prelude.lc 170:15-171:164  'RecordC V2 -> V4
+testdata/Prelude.lc 170:15-171:164  V4
+testdata/Prelude.lc 170:45-171:164  V1 -> 'List V2 -> V2
+testdata/Prelude.lc 170:45-171:164  'List V2 -> V2
+testdata/Prelude.lc 170:45-171:164  V2
+testdata/Prelude.lc 170:45-171:164  V2 -> V2->V2
+testdata/Prelude.lc 170:45-171:164  V2->V2
+testdata/Prelude.lc 170:51-171:164  tuptype (map ('Tuple2 'String Type) Type (\(a : 'Tuple2 'String Type) -> snd 'String Type a) V1) -> V1
+testdata/Prelude.lc 170:51-171:164  V1
+testdata/Prelude.lc 171:51-171:164  V0
 testdata/Prelude.lc 171:51-171:58  {a} -> {b : 'List ('Tuple2 'String Type)} -> c:'String -> {d : isKeyC 'String TT c a b} -> 'RecordC b -> a
 testdata/Prelude.lc 171:60-171:61  Type
 testdata/Prelude.lc 171:63-171:65  'List ('Tuple2 'String Type)
 testdata/Prelude.lc 171:63-171:65  'List V12
 testdata/Prelude.lc 171:66-171:67  'String
-testdata/Prelude.lc 171:70-171:95  isKeyC 'String TT V14 V16 V9
+testdata/Prelude.lc 171:69-171:97  isKeyC 'String TT V14 V16 V9
 testdata/Prelude.lc 171:70-171:79  {a}->a
-testdata/Prelude.lc 171:82-171:95  Type
+testdata/Prelude.lc 171:81-171:96  Type
 testdata/Prelude.lc 171:82-171:88  {a} -> {b : 'Eq a} -> a -> Type -> 'List ('Tuple2 a Type) -> Type
 testdata/Prelude.lc 171:89-171:90  V1
 testdata/Prelude.lc 171:89-171:90  'String
 testdata/Prelude.lc 171:91-171:92  Type
 testdata/Prelude.lc 171:93-171:95  'List ('Tuple2 'String Type)
-testdata/Prelude.lc 171:99-171:161  'RecordC V8
+testdata/Prelude.lc 171:98-171:164  'RecordC V8
 testdata/Prelude.lc 171:99-171:109  {a : 'List ('Tuple2 'String Type)} -> tuptype (map ('Tuple2 'String Type) Type (\(b : 'Tuple2 'String Type) -> snd 'String Type b) a) -> 'RecordC a
-testdata/Prelude.lc 171:111-171:161  tuptype (map ('Tuple2 'String Type) Type (\(a : 'Tuple2 'String Type) -> snd 'String Type a) V0)
+testdata/Prelude.lc 171:110-171:163  tuptype (map ('Tuple2 'String Type) Type (\(a : 'Tuple2 'String Type) -> snd 'String Type a) V0)
 testdata/Prelude.lc 171:111-171:114  {a} -> {b} -> 'Tuple2 a b -> b
-testdata/Prelude.lc 171:116-171:161  'Tuple2 V1 V0
+testdata/Prelude.lc 171:115-171:162  'Tuple2 V1 V0
 testdata/Prelude.lc 171:116-171:128  {a} -> {b} -> a->b
+testdata/Prelude.lc 171:130-171:131  Type
 testdata/Prelude.lc 171:133-171:158  Type
-testdata/Prelude.lc 171:133-171:158  Type -> Type->Type
 testdata/Prelude.lc 171:134-171:135  Type
-testdata/Prelude.lc 171:137-171:156  Type
+testdata/Prelude.lc 171:137-171:157  Type
 testdata/Prelude.lc 171:137-171:144  'List Type -> Type
-testdata/Prelude.lc 171:146-171:156  'List Type
+testdata/Prelude.lc 171:145-171:157  'List Type
 testdata/Prelude.lc 171:146-171:149  {a} -> {b} -> a->b -> 'List a -> 'List b
 testdata/Prelude.lc 171:150-171:153  V1->V1
 testdata/Prelude.lc 171:150-171:153  {a} -> {b} -> 'Tuple2 a b -> b
@@ -626,16 +658,16 @@ testdata/Prelude.lc 171:154-171:156  'List ('Tuple2 V0 Type)
 testdata/Prelude.lc 171:154-171:156  'List ('Tuple2 'String Type)
 testdata/Prelude.lc 171:159-171:161  V0
 testdata/Prelude.lc 171:159-171:161  tuptype (map ('Tuple2 'String Type) Type (\(a : 'Tuple2 'String Type) -> snd 'String Type a) V4)
-testdata/Prelude.lc 170:62-170:112  V15
+testdata/Prelude.lc 170:62-170:113  V15
 testdata/Prelude.lc 170:62-170:65  {a} -> {b} -> 'Tuple2 a b -> a
-testdata/Prelude.lc 170:67-170:112  'Tuple2 V1 V0
+testdata/Prelude.lc 170:66-170:113  'Tuple2 V1 V0
 testdata/Prelude.lc 170:67-170:79  {a} -> {b} -> a->b
+testdata/Prelude.lc 170:81-170:82  Type
 testdata/Prelude.lc 170:84-170:109  Type
-testdata/Prelude.lc 170:84-170:109  Type -> Type->Type
 testdata/Prelude.lc 170:85-170:86  Type
-testdata/Prelude.lc 170:88-170:107  Type
+testdata/Prelude.lc 170:88-170:108  Type
 testdata/Prelude.lc 170:88-170:95  'List Type -> Type
-testdata/Prelude.lc 170:97-170:107  'List Type
+testdata/Prelude.lc 170:96-170:108  'List Type
 testdata/Prelude.lc 170:97-170:100  {a} -> {b} -> a->b -> 'List a -> 'List b
 testdata/Prelude.lc 170:101-170:104  V1->V1
 testdata/Prelude.lc 170:101-170:104  {a} -> {b} -> 'Tuple2 a b -> b
@@ -744,37 +776,39 @@ testdata/Prelude.lc 192:19-192:22  'Float
 testdata/Prelude.lc 192:23-192:26  'Float
 testdata/Prelude.lc 192:1-192:8  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 194:15-194:25  {a:'Nat} -> {b:'Nat} -> {c} -> {d} -> {e : 'Num c} -> {f : d ~ 'VecScalar b c} -> d -> 'Image a ('Color d)
+testdata/Prelude.lc 194:27-194:28  'Nat
 testdata/Prelude.lc 194:1-194:12  {a:'Nat} -> {b} -> {c} -> {d : 'Num b} -> {e : c ~ 'VecScalar a b} -> c -> 'Image (Succ Zero) ('Color c)
 testdata/Prelude.lc 195:15-195:25  {a:'Nat} -> {b:'Nat} -> {c} -> {d} -> {e : 'Num c} -> {f : d ~ 'VecScalar b c} -> d -> 'Image a ('Color d)
+testdata/Prelude.lc 195:27-195:28  'Nat
 testdata/Prelude.lc 195:1-195:12  {a:'Nat} -> {b} -> {c} -> {d : 'Num b} -> {e : c ~ 'VecScalar a b} -> c -> 'Image (Succ (Succ Zero)) ('Color c)
 testdata/Prelude.lc 197:15-197:25  {a:'Nat} -> 'Float -> 'Image a ('Depth 'Float)
+testdata/Prelude.lc 197:27-197:28  'Nat
 testdata/Prelude.lc 197:1-197:12  'Float -> 'Image (Succ Zero) ('Depth 'Float)
 testdata/Prelude.lc 199:13-199:39  Type
 testdata/Prelude.lc 199:13-199:16  'Nat -> Type->Type
+testdata/Prelude.lc 199:17-199:18  'Nat
 testdata/Prelude.lc 199:19-199:24  Type
+testdata/Prelude.lc 199:28-199:39  Type->Type
 testdata/Prelude.lc 199:28-199:39  Type
 testdata/Prelude.lc 199:28-199:31  'Nat -> Type->Type
+testdata/Prelude.lc 199:32-199:33  'Nat
 testdata/Prelude.lc 199:34-199:39  Type
 testdata/Prelude.lc 200:14-200:30  'VecS 'Float (Succ (Succ (Succ Zero))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 200:14-200:30  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 200:14-200:16  {a} -> a -> a -> a -> a -> 'VecS a (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 200:17-200:18  V0
-testdata/Prelude.lc 200:18-200:18  {a} -> {b:'Nat} -> 'VecS a b -> 'Swizz->a
 testdata/Prelude.lc 200:17-200:18  'VecS V1 V0
 testdata/Prelude.lc 200:17-200:18  'VecS 'Float (Succ (Succ (Succ Zero)))
 testdata/Prelude.lc 200:18-200:18  'Swizz
 testdata/Prelude.lc 200:21-200:22  'Float
-testdata/Prelude.lc 200:22-200:22  {a} -> {b:'Nat} -> 'VecS a b -> 'Swizz->a
 testdata/Prelude.lc 200:21-200:22  'VecS V1 V0
 testdata/Prelude.lc 200:21-200:22  'VecS 'Float (Succ (Succ (Succ Zero)))
 testdata/Prelude.lc 200:22-200:22  'Swizz
 testdata/Prelude.lc 200:25-200:26  'Float
-testdata/Prelude.lc 200:26-200:26  {a} -> {b:'Nat} -> 'VecS a b -> 'Swizz->a
 testdata/Prelude.lc 200:25-200:26  'VecS V1 V0
 testdata/Prelude.lc 200:25-200:26  'VecS 'Float (Succ (Succ (Succ Zero)))
 testdata/Prelude.lc 200:26-200:26  'Swizz
 testdata/Prelude.lc 200:29-200:30  'Float
-testdata/Prelude.lc 200:29-200:30  'Int
 testdata/Prelude.lc 200:1-200:9  'VecS 'Float (Succ (Succ (Succ Zero))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 207:11-207:22  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
 testdata/Prelude.lc 207:1-207:8  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
@@ -1005,47 +1039,33 @@ testdata/Prelude.lc 337:9-337:12  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Floa
 testdata/Prelude.lc 337:13-337:14  'VecScalar V0 'Float
 testdata/Prelude.lc 337:13-337:14  'VecScalar V2 'Float
 testdata/Prelude.lc 334:16-334:20  'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'Mat (Succ (Succ (Succ (Succ Zero)))) (Succ (Succ (Succ (Succ Zero)))) 'Float
-testdata/Prelude.lc 334:22-334:32  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
+testdata/Prelude.lc 334:21-334:33  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 334:22-334:24  {a} -> a -> a -> a -> a -> 'VecS a (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 334:25-334:26  V0
 testdata/Prelude.lc 334:25-334:26  'VecScalar V3 'Float
 testdata/Prelude.lc 334:27-334:28  'VecScalar V2 'Float
 testdata/Prelude.lc 334:29-334:30  'VecScalar V2 'Float
-testdata/Prelude.lc 334:29-334:30  'Int
 testdata/Prelude.lc 334:31-334:32  'Float
-testdata/Prelude.lc 334:31-334:32  'Int
-testdata/Prelude.lc 334:35-334:48  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
+testdata/Prelude.lc 334:34-334:49  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 334:35-334:37  {a} -> a -> a -> a -> a -> 'VecS a (Succ (Succ (Succ (Succ Zero))))
-testdata/Prelude.lc 334:39-334:41  V0
-testdata/Prelude.lc 334:39-334:41  V1
-testdata/Prelude.lc 334:39-334:41  'Int
+testdata/Prelude.lc 334:38-334:42  V0
 testdata/Prelude.lc 334:40-334:41  V2
 testdata/Prelude.lc 334:40-334:41  'Float
 testdata/Prelude.lc 334:43-334:44  'Float
 testdata/Prelude.lc 334:45-334:46  'Float
-testdata/Prelude.lc 334:45-334:46  'Int
 testdata/Prelude.lc 334:47-334:48  'Float
-testdata/Prelude.lc 334:47-334:48  'Int
-testdata/Prelude.lc 334:51-334:61  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
+testdata/Prelude.lc 334:50-334:62  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 334:51-334:53  {a} -> a -> a -> a -> a -> 'VecS a (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 334:54-334:55  V0
-testdata/Prelude.lc 334:54-334:55  'Int
 testdata/Prelude.lc 334:56-334:57  V1
-testdata/Prelude.lc 334:56-334:57  'Int
 testdata/Prelude.lc 334:58-334:59  V1
-testdata/Prelude.lc 334:58-334:59  'Int
 testdata/Prelude.lc 334:60-334:61  'Float
-testdata/Prelude.lc 334:60-334:61  'Int
-testdata/Prelude.lc 334:64-334:74  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
+testdata/Prelude.lc 334:63-334:75  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 334:64-334:66  {a} -> a -> a -> a -> a -> 'VecS a (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 334:67-334:68  V0
-testdata/Prelude.lc 334:67-334:68  'Int
 testdata/Prelude.lc 334:69-334:70  V1
-testdata/Prelude.lc 334:69-334:70  'Int
 testdata/Prelude.lc 334:71-334:72  V1
-testdata/Prelude.lc 334:71-334:72  'Int
 testdata/Prelude.lc 334:73-334:74  'Float
-testdata/Prelude.lc 334:73-334:74  'Int
 testdata/Prelude.lc 334:1-334:11  'Float -> 'Mat (Succ (Succ (Succ (Succ Zero)))) (Succ (Succ (Succ (Succ Zero)))) 'Float
 testdata/Prelude.lc 341:9-341:12  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
 testdata/Prelude.lc 341:13-341:14  'VecScalar V0 'Float
@@ -1054,47 +1074,33 @@ testdata/Prelude.lc 342:9-342:12  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Floa
 testdata/Prelude.lc 342:13-342:14  'VecScalar V0 'Float
 testdata/Prelude.lc 342:13-342:14  'VecScalar V2 'Float
 testdata/Prelude.lc 339:16-339:20  'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'Mat (Succ (Succ (Succ (Succ Zero)))) (Succ (Succ (Succ (Succ Zero)))) 'Float
-testdata/Prelude.lc 339:22-339:35  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
+testdata/Prelude.lc 339:21-339:36  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 339:22-339:24  {a} -> a -> a -> a -> a -> 'VecS a (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 339:25-339:26  V0
 testdata/Prelude.lc 339:25-339:26  'VecScalar V3 'Float
 testdata/Prelude.lc 339:27-339:28  'VecScalar V2 'Float
-testdata/Prelude.lc 339:27-339:28  'Int
-testdata/Prelude.lc 339:30-339:32  'VecScalar V3 'Float
-testdata/Prelude.lc 339:30-339:32  V1
-testdata/Prelude.lc 339:30-339:32  'Int
+testdata/Prelude.lc 339:29-339:33  'VecScalar V3 'Float
 testdata/Prelude.lc 339:31-339:32  'VecScalar V5 'Float
 testdata/Prelude.lc 339:34-339:35  'Float
-testdata/Prelude.lc 339:34-339:35  'Int
-testdata/Prelude.lc 339:38-339:48  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
+testdata/Prelude.lc 339:37-339:49  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 339:38-339:40  {a} -> a -> a -> a -> a -> 'VecS a (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 339:41-339:42  V0
-testdata/Prelude.lc 339:41-339:42  'Int
 testdata/Prelude.lc 339:43-339:44  V1
-testdata/Prelude.lc 339:43-339:44  'Int
 testdata/Prelude.lc 339:45-339:46  V1
-testdata/Prelude.lc 339:45-339:46  'Int
 testdata/Prelude.lc 339:47-339:48  'Float
-testdata/Prelude.lc 339:47-339:48  'Int
-testdata/Prelude.lc 339:51-339:61  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
+testdata/Prelude.lc 339:50-339:62  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 339:51-339:53  {a} -> a -> a -> a -> a -> 'VecS a (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 339:54-339:55  V0
 testdata/Prelude.lc 339:54-339:55  'Float
 testdata/Prelude.lc 339:56-339:57  'Float
-testdata/Prelude.lc 339:56-339:57  'Int
 testdata/Prelude.lc 339:58-339:59  'Float
 testdata/Prelude.lc 339:60-339:61  'Float
-testdata/Prelude.lc 339:60-339:61  'Int
-testdata/Prelude.lc 339:64-339:74  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
+testdata/Prelude.lc 339:63-339:75  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 339:64-339:66  {a} -> a -> a -> a -> a -> 'VecS a (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 339:67-339:68  V0
-testdata/Prelude.lc 339:67-339:68  'Int
 testdata/Prelude.lc 339:69-339:70  V1
-testdata/Prelude.lc 339:69-339:70  'Int
 testdata/Prelude.lc 339:71-339:72  V1
-testdata/Prelude.lc 339:71-339:72  'Int
 testdata/Prelude.lc 339:73-339:74  'Float
-testdata/Prelude.lc 339:73-339:74  'Int
 testdata/Prelude.lc 339:1-339:11  'Float -> 'Mat (Succ (Succ (Succ (Succ Zero)))) (Succ (Succ (Succ (Succ Zero)))) 'Float
 testdata/Prelude.lc 346:9-346:12  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
 testdata/Prelude.lc 346:13-346:14  'VecScalar V0 'Float
@@ -1103,46 +1109,33 @@ testdata/Prelude.lc 347:9-347:12  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Floa
 testdata/Prelude.lc 347:13-347:14  'VecScalar V0 'Float
 testdata/Prelude.lc 347:13-347:14  'VecScalar V2 'Float
 testdata/Prelude.lc 344:16-344:20  'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'Mat (Succ (Succ (Succ (Succ Zero)))) (Succ (Succ (Succ (Succ Zero)))) 'Float
-testdata/Prelude.lc 344:22-344:32  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
+testdata/Prelude.lc 344:21-344:33  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 344:22-344:24  {a} -> a -> a -> a -> a -> 'VecS a (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 344:25-344:26  V0
-testdata/Prelude.lc 344:25-344:26  'Int
 testdata/Prelude.lc 344:27-344:28  V1
-testdata/Prelude.lc 344:27-344:28  'Int
 testdata/Prelude.lc 344:29-344:30  V1
-testdata/Prelude.lc 344:29-344:30  'Int
 testdata/Prelude.lc 344:31-344:32  'Float
-testdata/Prelude.lc 344:31-344:32  'Int
-testdata/Prelude.lc 344:35-344:45  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
+testdata/Prelude.lc 344:34-344:46  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 344:35-344:37  {a} -> a -> a -> a -> a -> 'VecS a (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 344:38-344:39  V0
-testdata/Prelude.lc 344:38-344:39  'Int
 testdata/Prelude.lc 344:40-344:41  V1
 testdata/Prelude.lc 344:40-344:41  'VecScalar V4 'Float
 testdata/Prelude.lc 344:42-344:43  'VecScalar V3 'Float
 testdata/Prelude.lc 344:44-344:45  'Float
-testdata/Prelude.lc 344:44-344:45  'Int
-testdata/Prelude.lc 344:48-344:61  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
+testdata/Prelude.lc 344:47-344:62  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 344:48-344:50  {a} -> a -> a -> a -> a -> 'VecS a (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 344:51-344:52  V0
-testdata/Prelude.lc 344:51-344:52  'Int
-testdata/Prelude.lc 344:54-344:56  V1
-testdata/Prelude.lc 344:54-344:56  'Int
+testdata/Prelude.lc 344:53-344:57  V1
 testdata/Prelude.lc 344:55-344:56  V3
 testdata/Prelude.lc 344:55-344:56  'Float
 testdata/Prelude.lc 344:58-344:59  'Float
 testdata/Prelude.lc 344:60-344:61  'Float
-testdata/Prelude.lc 344:60-344:61  'Int
-testdata/Prelude.lc 344:64-344:74  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
+testdata/Prelude.lc 344:63-344:75  'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 344:64-344:66  {a} -> a -> a -> a -> a -> 'VecS a (Succ (Succ (Succ (Succ Zero))))
 testdata/Prelude.lc 344:67-344:68  V0
-testdata/Prelude.lc 344:67-344:68  'Int
 testdata/Prelude.lc 344:69-344:70  V1
-testdata/Prelude.lc 344:69-344:70  'Int
 testdata/Prelude.lc 344:71-344:72  V1
-testdata/Prelude.lc 344:71-344:72  'Int
 testdata/Prelude.lc 344:73-344:74  'Float
-testdata/Prelude.lc 344:73-344:74  'Int
 testdata/Prelude.lc 344:1-344:11  'Float -> 'Mat (Succ (Succ (Succ (Succ Zero)))) (Succ (Succ (Succ (Succ Zero)))) 'Float
 testdata/Prelude.lc 349:53-349:56  {a:'Nat} -> {b:'Nat} -> {c} -> {d:'Nat} -> 'Mat a b c -> 'Mat b d c -> 'Mat a d c
 testdata/Prelude.lc 349:23-349:52  'Mat V3 V2 V1
@@ -1172,66 +1165,68 @@ testdata/Prelude.lc 365:24-365:25  V4
 testdata/Prelude.lc 365:26-365:29  V3
 testdata/Prelude.lc 365:26-365:29  'Float
 testdata/Prelude.lc 365:1-365:6  'Float -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero)))) -> 'VecS 'Float (Succ (Succ (Succ (Succ Zero))))
-testdata/Prelude.lc 368:1-368:7  {a} -> a->a -> a
 testdata/Prelude.lc 367:11-368:58  V0->V1
 testdata/Prelude.lc 367:11-368:58  V1
 testdata/Prelude.lc 367:11-367:36  Type
 testdata/Prelude.lc 367:11-367:16  Type
+testdata/Prelude.lc 367:20-367:36  Type->Type
 testdata/Prelude.lc 367:20-367:36  Type
 testdata/Prelude.lc 367:20-367:25  Type
+testdata/Prelude.lc 367:29-367:36  Type->Type
 testdata/Prelude.lc 367:29-367:36  Type
 testdata/Prelude.lc 367:30-367:35  Type
 testdata/Prelude.lc 368:14-368:58  'Float -> 'Float -> 'List 'Float
 testdata/Prelude.lc 368:14-368:58  'Float -> 'List 'Float
 testdata/Prelude.lc 368:14-368:58  'List 'Float
-testdata/Prelude.lc 368:14-368:58  {a} -> 'Bool -> a -> a->a
 testdata/Prelude.lc 368:17-368:22  'Bool
 testdata/Prelude.lc 368:19-368:20  {a} -> {b:'Nat} -> {c : 'Num a} -> 'VecScalar b a -> 'VecScalar b a -> 'VecScalar b 'Bool
 testdata/Prelude.lc 368:17-368:18  'VecScalar V1 V2
 testdata/Prelude.lc 368:17-368:18  'Float
 testdata/Prelude.lc 368:21-368:22  'Float
+testdata/Prelude.lc 368:28-368:30  V0
+testdata/Prelude.lc 368:28-368:30  {a} -> 'List a
 testdata/Prelude.lc 368:36-368:58  'List 'Float
 testdata/Prelude.lc 368:37-368:38  {a} -> a -> 'List a -> 'List a
 testdata/Prelude.lc 368:36-368:37  V0
 testdata/Prelude.lc 368:36-368:37  'Float
 testdata/Prelude.lc 368:39-368:58  'List 'Float
 testdata/Prelude.lc 368:39-368:45  'Float -> 'Float -> 'List 'Float
-testdata/Prelude.lc 368:47-368:55  'Float
+testdata/Prelude.lc 368:46-368:56  'Float
 testdata/Prelude.lc 368:49-368:51  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> 'MatVecScalarElem a -> a
 testdata/Prelude.lc 368:47-368:48  V1
 testdata/Prelude.lc 368:47-368:48  'Float
 testdata/Prelude.lc 368:52-368:55  'Float
 testdata/Prelude.lc 368:57-368:58  'Float
 testdata/Prelude.lc 368:1-368:7  'Float -> 'Float -> 'List 'Float
-testdata/Prelude.lc 371:10-371:12  {a} -> a->a -> a
-testdata/Prelude.lc 370:9-372:29  V0->V1
-testdata/Prelude.lc 370:9-372:29  V1
+testdata/Prelude.lc 370:9-372:30  V0->V1
+testdata/Prelude.lc 370:9-372:30  V1
 testdata/Prelude.lc 370:9-370:24  Type
+testdata/Prelude.lc 370:9-370:24  Type->Type
 testdata/Prelude.lc 370:10-370:11  Type
 testdata/Prelude.lc 370:10-370:11  V1
+testdata/Prelude.lc 370:16-370:24  Type->Type
 testdata/Prelude.lc 370:16-370:24  Type
 testdata/Prelude.lc 370:16-370:19  Type
+testdata/Prelude.lc 370:23-370:24  Type->Type
 testdata/Prelude.lc 370:23-370:24  Type
-testdata/Prelude.lc 371:2-372:29  {a} -> 'List a -> 'Int->a
-testdata/Prelude.lc 371:2-372:29  'List V0 -> 'Int->V2
-testdata/Prelude.lc 371:2-372:29  'Int->V2
-testdata/Prelude.lc 371:2-372:29  V2
-testdata/Prelude.lc 371:13-372:29  V1 -> 'List V2 -> V2
-testdata/Prelude.lc 371:13-372:29  'List V2 -> V2
-testdata/Prelude.lc 371:13-372:29  V2
-testdata/Prelude.lc 372:19-372:29  V0
+testdata/Prelude.lc 371:2-372:30  {a} -> 'List a -> 'Int->a
+testdata/Prelude.lc 371:2-372:30  'List V0 -> 'Int->V2
+testdata/Prelude.lc 371:2-372:30  'Int->V2
+testdata/Prelude.lc 371:2-372:30  V2
+testdata/Prelude.lc 371:19-372:30  V1 -> 'List V2 -> V2
+testdata/Prelude.lc 371:19-372:30  'List V2 -> V2
+testdata/Prelude.lc 371:19-372:30  V2
+testdata/Prelude.lc 372:19-372:30  V0
 testdata/Prelude.lc 372:22-372:24  {a} -> 'List a -> 'Int->a
 testdata/Prelude.lc 372:19-372:21  'List V0
 testdata/Prelude.lc 372:19-372:21  'List V5
-testdata/Prelude.lc 372:26-372:29  'Int
+testdata/Prelude.lc 372:25-372:30  'Int
 testdata/Prelude.lc 372:27-372:28  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> a->a
 testdata/Prelude.lc 372:26-372:27  V1
 testdata/Prelude.lc 372:26-372:27  'Int
 testdata/Prelude.lc 372:28-372:29  'Int
 testdata/Prelude.lc 371:19-371:20  V3
-testdata/Prelude.lc 372:19-372:29  V3
+testdata/Prelude.lc 372:19-372:30  V3
 testdata/Prelude.lc 372:19-372:21  'List V4
-testdata/Prelude.lc 371:13-371:14  'Ordering
-testdata/Prelude.lc 371:13-371:14  'Int
 testdata/Prelude.lc 371:2-371:7  'List V2
 testdata/Prelude.lc 371:10-371:12  {a} -> 'List a -> 'Int->a
diff --git a/testdata/SampleMaterial.out b/testdata/SampleMaterial.out
index ba48a298..937791f6 100644
--- a/testdata/SampleMaterial.out
+++ b/testdata/SampleMaterial.out
@@ -1,10 +1,9 @@
 main is not found
 tooltips:
 testdata/SampleMaterial.lc 4:5-46:6  V0
-testdata/SampleMaterial.lc 4:5-46:6  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 4:7-4:49  V1
 testdata/SampleMaterial.lc 4:7-4:49  'String
-testdata/SampleMaterial.lc 5:7-44:26  V0
+testdata/SampleMaterial.lc 5:7-45:10  V0
 testdata/SampleMaterial.lc 5:7-5:18  'Tuple0 -> 'Tuple0 -> 'Bool -> 'Int -> 'Bool -> 'Bool -> 'CullType -> 'List 'Deform -> 'Bool -> 'Bool -> 'List 'StageAttrs -> 'Bool->'CommonAttrs
 testdata/SampleMaterial.lc 6:24-6:26  'Tuple0
 testdata/SampleMaterial.lc 7:24-7:26  'Tuple0
@@ -13,16 +12,20 @@ testdata/SampleMaterial.lc 9:20-9:21  'Int
 testdata/SampleMaterial.lc 10:30-10:35  'Bool
 testdata/SampleMaterial.lc 11:23-11:28  'Bool
 testdata/SampleMaterial.lc 12:20-12:33  'CullType
+testdata/SampleMaterial.lc 13:30-13:32  'List 'Deform
+testdata/SampleMaterial.lc 13:30-13:32  {a} -> 'List a
 testdata/SampleMaterial.lc 14:25-14:30  'Bool
 testdata/SampleMaterial.lc 15:29-15:34  'Bool
 testdata/SampleMaterial.lc 17:13-43:14  'List 'StageAttrs
-testdata/SampleMaterial.lc 17:15-28:53  V0
+testdata/SampleMaterial.lc 17:15-29:18  V0
 testdata/SampleMaterial.lc 17:15-17:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 18:29-18:36  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 18:29-18:36  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 19:30-19:50  'RGBGen
 testdata/SampleMaterial.lc 20:32-20:42  'AlphaGen
 testdata/SampleMaterial.lc 21:29-21:36  'TCGen
+testdata/SampleMaterial.lc 22:29-22:31  'List 'TCMod
+testdata/SampleMaterial.lc 22:29-22:31  {a} -> 'List a
 testdata/SampleMaterial.lc 23:31-23:80  'StageTexture
 testdata/SampleMaterial.lc 23:31-23:37  'String->'StageTexture
 testdata/SampleMaterial.lc 23:38-23:80  'String
@@ -32,12 +35,12 @@ testdata/SampleMaterial.lc 26:33-26:40  'Maybe 'AlphaFunction
 testdata/SampleMaterial.lc 26:33-26:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 27:41-27:46  'Bool
 testdata/SampleMaterial.lc 28:38-28:53  'String
-testdata/SampleMaterial.lc 30:15-41:54  V0
+testdata/SampleMaterial.lc 30:15-42:18  'List 'StageAttrs
+testdata/SampleMaterial.lc 30:15-42:18  V0
 testdata/SampleMaterial.lc 30:15-30:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 31:29-31:57  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 31:29-31:33  {a} -> a -> 'Maybe a
 testdata/SampleMaterial.lc 31:34-31:57  V0
-testdata/SampleMaterial.lc 31:34-31:57  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 31:36-31:46  V1
 testdata/SampleMaterial.lc 31:36-31:46  'Blending'
 testdata/SampleMaterial.lc 31:49-31:55  V0
@@ -45,6 +48,8 @@ testdata/SampleMaterial.lc 31:49-31:55  'Blending'
 testdata/SampleMaterial.lc 32:30-32:50  'RGBGen
 testdata/SampleMaterial.lc 33:32-33:42  'AlphaGen
 testdata/SampleMaterial.lc 34:29-34:40  'TCGen
+testdata/SampleMaterial.lc 35:29-35:31  'List 'TCMod
+testdata/SampleMaterial.lc 35:29-35:31  {a} -> 'List a
 testdata/SampleMaterial.lc 36:31-36:42  'StageTexture
 testdata/SampleMaterial.lc 37:34-37:38  'Bool
 testdata/SampleMaterial.lc 38:33-38:41  'DepthFunction
@@ -53,12 +58,11 @@ testdata/SampleMaterial.lc 39:33-39:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 40:41-40:46  'Bool
 testdata/SampleMaterial.lc 41:38-41:54  'String
 testdata/SampleMaterial.lc 44:21-44:26  'Bool
-testdata/SampleMaterial.lc 4:3-262:4  'List ('Tuple2 'String 'CommonAttrs)
+testdata/SampleMaterial.lc 47:5-261:6  'List ('Tuple2 'String 'CommonAttrs)
 testdata/SampleMaterial.lc 47:5-89:6  V0
-testdata/SampleMaterial.lc 47:5-89:6  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 47:7-47:53  V1
 testdata/SampleMaterial.lc 47:7-47:53  'String
-testdata/SampleMaterial.lc 48:7-87:26  V0
+testdata/SampleMaterial.lc 48:7-88:10  V0
 testdata/SampleMaterial.lc 48:7-48:18  'Tuple0 -> 'Tuple0 -> 'Bool -> 'Int -> 'Bool -> 'Bool -> 'CullType -> 'List 'Deform -> 'Bool -> 'Bool -> 'List 'StageAttrs -> 'Bool->'CommonAttrs
 testdata/SampleMaterial.lc 49:24-49:26  'Tuple0
 testdata/SampleMaterial.lc 50:24-50:26  'Tuple0
@@ -67,16 +71,20 @@ testdata/SampleMaterial.lc 52:20-52:21  'Int
 testdata/SampleMaterial.lc 53:30-53:35  'Bool
 testdata/SampleMaterial.lc 54:23-54:28  'Bool
 testdata/SampleMaterial.lc 55:20-55:33  'CullType
+testdata/SampleMaterial.lc 56:30-56:32  'List 'Deform
+testdata/SampleMaterial.lc 56:30-56:32  {a} -> 'List a
 testdata/SampleMaterial.lc 57:25-57:30  'Bool
 testdata/SampleMaterial.lc 58:29-58:34  'Bool
 testdata/SampleMaterial.lc 60:13-86:14  'List 'StageAttrs
-testdata/SampleMaterial.lc 60:15-71:54  V0
+testdata/SampleMaterial.lc 60:15-72:18  V0
 testdata/SampleMaterial.lc 60:15-60:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 61:29-61:36  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 61:29-61:36  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 62:30-62:50  'RGBGen
 testdata/SampleMaterial.lc 63:32-63:42  'AlphaGen
 testdata/SampleMaterial.lc 64:29-64:36  'TCGen
+testdata/SampleMaterial.lc 65:29-65:31  'List 'TCMod
+testdata/SampleMaterial.lc 65:29-65:31  {a} -> 'List a
 testdata/SampleMaterial.lc 66:31-66:84  'StageTexture
 testdata/SampleMaterial.lc 66:31-66:37  'String->'StageTexture
 testdata/SampleMaterial.lc 66:38-66:84  'String
@@ -86,12 +94,12 @@ testdata/SampleMaterial.lc 69:33-69:40  'Maybe 'AlphaFunction
 testdata/SampleMaterial.lc 69:33-69:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 70:41-70:46  'Bool
 testdata/SampleMaterial.lc 71:38-71:54  'String
-testdata/SampleMaterial.lc 73:15-84:54  V0
+testdata/SampleMaterial.lc 73:15-85:18  'List 'StageAttrs
+testdata/SampleMaterial.lc 73:15-85:18  V0
 testdata/SampleMaterial.lc 73:15-73:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 74:29-74:57  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 74:29-74:33  {a} -> a -> 'Maybe a
 testdata/SampleMaterial.lc 74:34-74:57  V0
-testdata/SampleMaterial.lc 74:34-74:57  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 74:36-74:46  V1
 testdata/SampleMaterial.lc 74:36-74:46  'Blending'
 testdata/SampleMaterial.lc 74:49-74:55  V0
@@ -99,6 +107,8 @@ testdata/SampleMaterial.lc 74:49-74:55  'Blending'
 testdata/SampleMaterial.lc 75:30-75:50  'RGBGen
 testdata/SampleMaterial.lc 76:32-76:42  'AlphaGen
 testdata/SampleMaterial.lc 77:29-77:40  'TCGen
+testdata/SampleMaterial.lc 78:29-78:31  'List 'TCMod
+testdata/SampleMaterial.lc 78:29-78:31  {a} -> 'List a
 testdata/SampleMaterial.lc 79:31-79:42  'StageTexture
 testdata/SampleMaterial.lc 80:34-80:38  'Bool
 testdata/SampleMaterial.lc 81:33-81:41  'DepthFunction
@@ -107,11 +117,11 @@ testdata/SampleMaterial.lc 82:33-82:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 83:41-83:46  'Bool
 testdata/SampleMaterial.lc 84:38-84:54  'String
 testdata/SampleMaterial.lc 87:21-87:26  'Bool
+testdata/SampleMaterial.lc 90:5-261:6  'List ('Tuple2 'String 'CommonAttrs)
 testdata/SampleMaterial.lc 90:5-132:6  V0
-testdata/SampleMaterial.lc 90:5-132:6  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 90:7-90:53  V1
 testdata/SampleMaterial.lc 90:7-90:53  'String
-testdata/SampleMaterial.lc 91:7-130:26  V0
+testdata/SampleMaterial.lc 91:7-131:10  V0
 testdata/SampleMaterial.lc 91:7-91:18  'Tuple0 -> 'Tuple0 -> 'Bool -> 'Int -> 'Bool -> 'Bool -> 'CullType -> 'List 'Deform -> 'Bool -> 'Bool -> 'List 'StageAttrs -> 'Bool->'CommonAttrs
 testdata/SampleMaterial.lc 92:24-92:26  'Tuple0
 testdata/SampleMaterial.lc 93:24-93:26  'Tuple0
@@ -120,16 +130,20 @@ testdata/SampleMaterial.lc 95:20-95:21  'Int
 testdata/SampleMaterial.lc 96:30-96:35  'Bool
 testdata/SampleMaterial.lc 97:23-97:28  'Bool
 testdata/SampleMaterial.lc 98:20-98:33  'CullType
+testdata/SampleMaterial.lc 99:30-99:32  'List 'Deform
+testdata/SampleMaterial.lc 99:30-99:32  {a} -> 'List a
 testdata/SampleMaterial.lc 100:25-100:30  'Bool
 testdata/SampleMaterial.lc 101:29-101:34  'Bool
 testdata/SampleMaterial.lc 103:13-129:14  'List 'StageAttrs
-testdata/SampleMaterial.lc 103:15-114:54  V0
+testdata/SampleMaterial.lc 103:15-115:18  V0
 testdata/SampleMaterial.lc 103:15-103:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 104:29-104:36  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 104:29-104:36  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 105:30-105:50  'RGBGen
 testdata/SampleMaterial.lc 106:32-106:42  'AlphaGen
 testdata/SampleMaterial.lc 107:29-107:36  'TCGen
+testdata/SampleMaterial.lc 108:29-108:31  'List 'TCMod
+testdata/SampleMaterial.lc 108:29-108:31  {a} -> 'List a
 testdata/SampleMaterial.lc 109:31-109:84  'StageTexture
 testdata/SampleMaterial.lc 109:31-109:37  'String->'StageTexture
 testdata/SampleMaterial.lc 109:38-109:84  'String
@@ -139,12 +153,12 @@ testdata/SampleMaterial.lc 112:33-112:40  'Maybe 'AlphaFunction
 testdata/SampleMaterial.lc 112:33-112:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 113:41-113:46  'Bool
 testdata/SampleMaterial.lc 114:38-114:54  'String
-testdata/SampleMaterial.lc 116:15-127:54  V0
+testdata/SampleMaterial.lc 116:15-128:18  'List 'StageAttrs
+testdata/SampleMaterial.lc 116:15-128:18  V0
 testdata/SampleMaterial.lc 116:15-116:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 117:29-117:57  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 117:29-117:33  {a} -> a -> 'Maybe a
 testdata/SampleMaterial.lc 117:34-117:57  V0
-testdata/SampleMaterial.lc 117:34-117:57  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 117:36-117:46  V1
 testdata/SampleMaterial.lc 117:36-117:46  'Blending'
 testdata/SampleMaterial.lc 117:49-117:55  V0
@@ -152,6 +166,8 @@ testdata/SampleMaterial.lc 117:49-117:55  'Blending'
 testdata/SampleMaterial.lc 118:30-118:50  'RGBGen
 testdata/SampleMaterial.lc 119:32-119:42  'AlphaGen
 testdata/SampleMaterial.lc 120:29-120:40  'TCGen
+testdata/SampleMaterial.lc 121:29-121:31  'List 'TCMod
+testdata/SampleMaterial.lc 121:29-121:31  {a} -> 'List a
 testdata/SampleMaterial.lc 122:31-122:42  'StageTexture
 testdata/SampleMaterial.lc 123:34-123:38  'Bool
 testdata/SampleMaterial.lc 124:33-124:41  'DepthFunction
@@ -160,11 +176,11 @@ testdata/SampleMaterial.lc 125:33-125:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 126:41-126:46  'Bool
 testdata/SampleMaterial.lc 127:38-127:54  'String
 testdata/SampleMaterial.lc 130:21-130:26  'Bool
+testdata/SampleMaterial.lc 133:5-261:6  'List ('Tuple2 'String 'CommonAttrs)
 testdata/SampleMaterial.lc 133:5-175:6  V0
-testdata/SampleMaterial.lc 133:5-175:6  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 133:7-133:53  V1
 testdata/SampleMaterial.lc 133:7-133:53  'String
-testdata/SampleMaterial.lc 134:7-173:26  V0
+testdata/SampleMaterial.lc 134:7-174:10  V0
 testdata/SampleMaterial.lc 134:7-134:18  'Tuple0 -> 'Tuple0 -> 'Bool -> 'Int -> 'Bool -> 'Bool -> 'CullType -> 'List 'Deform -> 'Bool -> 'Bool -> 'List 'StageAttrs -> 'Bool->'CommonAttrs
 testdata/SampleMaterial.lc 135:24-135:26  'Tuple0
 testdata/SampleMaterial.lc 136:24-136:26  'Tuple0
@@ -173,16 +189,20 @@ testdata/SampleMaterial.lc 138:20-138:21  'Int
 testdata/SampleMaterial.lc 139:30-139:35  'Bool
 testdata/SampleMaterial.lc 140:23-140:28  'Bool
 testdata/SampleMaterial.lc 141:20-141:33  'CullType
+testdata/SampleMaterial.lc 142:30-142:32  'List 'Deform
+testdata/SampleMaterial.lc 142:30-142:32  {a} -> 'List a
 testdata/SampleMaterial.lc 143:25-143:30  'Bool
 testdata/SampleMaterial.lc 144:29-144:34  'Bool
 testdata/SampleMaterial.lc 146:13-172:14  'List 'StageAttrs
-testdata/SampleMaterial.lc 146:15-157:54  V0
+testdata/SampleMaterial.lc 146:15-158:18  V0
 testdata/SampleMaterial.lc 146:15-146:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 147:29-147:36  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 147:29-147:36  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 148:30-148:50  'RGBGen
 testdata/SampleMaterial.lc 149:32-149:42  'AlphaGen
 testdata/SampleMaterial.lc 150:29-150:36  'TCGen
+testdata/SampleMaterial.lc 151:29-151:31  'List 'TCMod
+testdata/SampleMaterial.lc 151:29-151:31  {a} -> 'List a
 testdata/SampleMaterial.lc 152:31-152:84  'StageTexture
 testdata/SampleMaterial.lc 152:31-152:37  'String->'StageTexture
 testdata/SampleMaterial.lc 152:38-152:84  'String
@@ -192,12 +212,12 @@ testdata/SampleMaterial.lc 155:33-155:40  'Maybe 'AlphaFunction
 testdata/SampleMaterial.lc 155:33-155:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 156:41-156:46  'Bool
 testdata/SampleMaterial.lc 157:38-157:54  'String
-testdata/SampleMaterial.lc 159:15-170:54  V0
+testdata/SampleMaterial.lc 159:15-171:18  'List 'StageAttrs
+testdata/SampleMaterial.lc 159:15-171:18  V0
 testdata/SampleMaterial.lc 159:15-159:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 160:29-160:57  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 160:29-160:33  {a} -> a -> 'Maybe a
 testdata/SampleMaterial.lc 160:34-160:57  V0
-testdata/SampleMaterial.lc 160:34-160:57  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 160:36-160:46  V1
 testdata/SampleMaterial.lc 160:36-160:46  'Blending'
 testdata/SampleMaterial.lc 160:49-160:55  V0
@@ -205,6 +225,8 @@ testdata/SampleMaterial.lc 160:49-160:55  'Blending'
 testdata/SampleMaterial.lc 161:30-161:50  'RGBGen
 testdata/SampleMaterial.lc 162:32-162:42  'AlphaGen
 testdata/SampleMaterial.lc 163:29-163:40  'TCGen
+testdata/SampleMaterial.lc 164:29-164:31  'List 'TCMod
+testdata/SampleMaterial.lc 164:29-164:31  {a} -> 'List a
 testdata/SampleMaterial.lc 165:31-165:42  'StageTexture
 testdata/SampleMaterial.lc 166:34-166:38  'Bool
 testdata/SampleMaterial.lc 167:33-167:41  'DepthFunction
@@ -213,11 +235,11 @@ testdata/SampleMaterial.lc 168:33-168:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 169:41-169:46  'Bool
 testdata/SampleMaterial.lc 170:38-170:54  'String
 testdata/SampleMaterial.lc 173:21-173:26  'Bool
+testdata/SampleMaterial.lc 176:5-261:6  'List ('Tuple2 'String 'CommonAttrs)
 testdata/SampleMaterial.lc 176:5-218:6  V0
-testdata/SampleMaterial.lc 176:5-218:6  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 176:7-176:53  V1
 testdata/SampleMaterial.lc 176:7-176:53  'String
-testdata/SampleMaterial.lc 177:7-216:26  V0
+testdata/SampleMaterial.lc 177:7-217:10  V0
 testdata/SampleMaterial.lc 177:7-177:18  'Tuple0 -> 'Tuple0 -> 'Bool -> 'Int -> 'Bool -> 'Bool -> 'CullType -> 'List 'Deform -> 'Bool -> 'Bool -> 'List 'StageAttrs -> 'Bool->'CommonAttrs
 testdata/SampleMaterial.lc 178:24-178:26  'Tuple0
 testdata/SampleMaterial.lc 179:24-179:26  'Tuple0
@@ -226,16 +248,20 @@ testdata/SampleMaterial.lc 181:20-181:21  'Int
 testdata/SampleMaterial.lc 182:30-182:35  'Bool
 testdata/SampleMaterial.lc 183:23-183:28  'Bool
 testdata/SampleMaterial.lc 184:20-184:33  'CullType
+testdata/SampleMaterial.lc 185:30-185:32  'List 'Deform
+testdata/SampleMaterial.lc 185:30-185:32  {a} -> 'List a
 testdata/SampleMaterial.lc 186:25-186:30  'Bool
 testdata/SampleMaterial.lc 187:29-187:34  'Bool
 testdata/SampleMaterial.lc 189:13-215:14  'List 'StageAttrs
-testdata/SampleMaterial.lc 189:15-200:54  V0
+testdata/SampleMaterial.lc 189:15-201:18  V0
 testdata/SampleMaterial.lc 189:15-189:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 190:29-190:36  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 190:29-190:36  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 191:30-191:50  'RGBGen
 testdata/SampleMaterial.lc 192:32-192:42  'AlphaGen
 testdata/SampleMaterial.lc 193:29-193:36  'TCGen
+testdata/SampleMaterial.lc 194:29-194:31  'List 'TCMod
+testdata/SampleMaterial.lc 194:29-194:31  {a} -> 'List a
 testdata/SampleMaterial.lc 195:31-195:84  'StageTexture
 testdata/SampleMaterial.lc 195:31-195:37  'String->'StageTexture
 testdata/SampleMaterial.lc 195:38-195:84  'String
@@ -245,12 +271,12 @@ testdata/SampleMaterial.lc 198:33-198:40  'Maybe 'AlphaFunction
 testdata/SampleMaterial.lc 198:33-198:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 199:41-199:46  'Bool
 testdata/SampleMaterial.lc 200:38-200:54  'String
-testdata/SampleMaterial.lc 202:15-213:54  V0
+testdata/SampleMaterial.lc 202:15-214:18  'List 'StageAttrs
+testdata/SampleMaterial.lc 202:15-214:18  V0
 testdata/SampleMaterial.lc 202:15-202:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 203:29-203:57  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 203:29-203:33  {a} -> a -> 'Maybe a
 testdata/SampleMaterial.lc 203:34-203:57  V0
-testdata/SampleMaterial.lc 203:34-203:57  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 203:36-203:46  V1
 testdata/SampleMaterial.lc 203:36-203:46  'Blending'
 testdata/SampleMaterial.lc 203:49-203:55  V0
@@ -258,6 +284,8 @@ testdata/SampleMaterial.lc 203:49-203:55  'Blending'
 testdata/SampleMaterial.lc 204:30-204:50  'RGBGen
 testdata/SampleMaterial.lc 205:32-205:42  'AlphaGen
 testdata/SampleMaterial.lc 206:29-206:40  'TCGen
+testdata/SampleMaterial.lc 207:29-207:31  'List 'TCMod
+testdata/SampleMaterial.lc 207:29-207:31  {a} -> 'List a
 testdata/SampleMaterial.lc 208:31-208:42  'StageTexture
 testdata/SampleMaterial.lc 209:34-209:38  'Bool
 testdata/SampleMaterial.lc 210:33-210:41  'DepthFunction
@@ -266,11 +294,11 @@ testdata/SampleMaterial.lc 211:33-211:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 212:41-212:46  'Bool
 testdata/SampleMaterial.lc 213:38-213:54  'String
 testdata/SampleMaterial.lc 216:21-216:26  'Bool
+testdata/SampleMaterial.lc 219:5-261:6  'List ('Tuple2 'String 'CommonAttrs)
 testdata/SampleMaterial.lc 219:5-261:6  V0
-testdata/SampleMaterial.lc 219:5-261:6  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 219:7-219:53  V1
 testdata/SampleMaterial.lc 219:7-219:53  'String
-testdata/SampleMaterial.lc 220:7-259:26  V0
+testdata/SampleMaterial.lc 220:7-260:10  V0
 testdata/SampleMaterial.lc 220:7-220:18  'Tuple0 -> 'Tuple0 -> 'Bool -> 'Int -> 'Bool -> 'Bool -> 'CullType -> 'List 'Deform -> 'Bool -> 'Bool -> 'List 'StageAttrs -> 'Bool->'CommonAttrs
 testdata/SampleMaterial.lc 221:24-221:26  'Tuple0
 testdata/SampleMaterial.lc 222:24-222:26  'Tuple0
@@ -279,16 +307,20 @@ testdata/SampleMaterial.lc 224:20-224:21  'Int
 testdata/SampleMaterial.lc 225:30-225:35  'Bool
 testdata/SampleMaterial.lc 226:23-226:28  'Bool
 testdata/SampleMaterial.lc 227:20-227:33  'CullType
+testdata/SampleMaterial.lc 228:30-228:32  'List 'Deform
+testdata/SampleMaterial.lc 228:30-228:32  {a} -> 'List a
 testdata/SampleMaterial.lc 229:25-229:30  'Bool
 testdata/SampleMaterial.lc 230:29-230:34  'Bool
 testdata/SampleMaterial.lc 232:13-258:14  'List 'StageAttrs
-testdata/SampleMaterial.lc 232:15-243:54  V0
+testdata/SampleMaterial.lc 232:15-244:18  V0
 testdata/SampleMaterial.lc 232:15-232:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 233:29-233:36  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 233:29-233:36  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 234:30-234:50  'RGBGen
 testdata/SampleMaterial.lc 235:32-235:42  'AlphaGen
 testdata/SampleMaterial.lc 236:29-236:36  'TCGen
+testdata/SampleMaterial.lc 237:29-237:31  'List 'TCMod
+testdata/SampleMaterial.lc 237:29-237:31  {a} -> 'List a
 testdata/SampleMaterial.lc 238:31-238:84  'StageTexture
 testdata/SampleMaterial.lc 238:31-238:37  'String->'StageTexture
 testdata/SampleMaterial.lc 238:38-238:84  'String
@@ -298,12 +330,12 @@ testdata/SampleMaterial.lc 241:33-241:40  'Maybe 'AlphaFunction
 testdata/SampleMaterial.lc 241:33-241:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 242:41-242:46  'Bool
 testdata/SampleMaterial.lc 243:38-243:54  'String
-testdata/SampleMaterial.lc 245:15-256:54  V0
+testdata/SampleMaterial.lc 245:15-257:18  'List 'StageAttrs
+testdata/SampleMaterial.lc 245:15-257:18  V0
 testdata/SampleMaterial.lc 245:15-245:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 246:29-246:57  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 246:29-246:33  {a} -> a -> 'Maybe a
 testdata/SampleMaterial.lc 246:34-246:57  V0
-testdata/SampleMaterial.lc 246:34-246:57  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 246:36-246:46  V1
 testdata/SampleMaterial.lc 246:36-246:46  'Blending'
 testdata/SampleMaterial.lc 246:49-246:55  V0
@@ -311,6 +343,8 @@ testdata/SampleMaterial.lc 246:49-246:55  'Blending'
 testdata/SampleMaterial.lc 247:30-247:50  'RGBGen
 testdata/SampleMaterial.lc 248:32-248:42  'AlphaGen
 testdata/SampleMaterial.lc 249:29-249:40  'TCGen
+testdata/SampleMaterial.lc 250:29-250:31  'List 'TCMod
+testdata/SampleMaterial.lc 250:29-250:31  {a} -> 'List a
 testdata/SampleMaterial.lc 251:31-251:42  'StageTexture
 testdata/SampleMaterial.lc 252:34-252:38  'Bool
 testdata/SampleMaterial.lc 253:33-253:41  'DepthFunction
diff --git a/testdata/ambig.out b/testdata/ambig.out
index e309814c..02d4d2d4 100644
--- a/testdata/ambig.out
+++ b/testdata/ambig.out
@@ -1,12 +1,16 @@
 main is not found
 tooltips:
 testdata/ambig.lc 3:6-3:12  Type -> Type->Type
+testdata/ambig.lc 3:6-3:29  Type->Type
 testdata/ambig.lc 3:6-3:29  Type
 testdata/ambig.lc 3:26-3:27  Type
 testdata/ambig.lc 3:28-3:29  Type
+testdata/ambig.lc 3:6-3:12  Type->Type
 testdata/ambig.lc 3:6-3:12  Type
 testdata/ambig.lc 3:19-3:25  {a} -> {b} -> a -> b -> 'Tuple2 a b
+testdata/ambig.lc 3:6-3:25  Type->Type
 testdata/ambig.lc 3:6-3:25  Type
+testdata/ambig.lc 3:19-3:25  Type->Type
 testdata/ambig.lc 3:19-3:25  Type
 testdata/ambig.lc 3:19-3:25  'Tuple2 V4 V3
 testdata/ambig.lc 8:21-8:26  V2 -> V2->V2
diff --git a/testdata/complex.out b/testdata/complex.out
index 083010e5..e10d5074 100644
--- a/testdata/complex.out
+++ b/testdata/complex.out
@@ -3,27 +3,39 @@ tooltips:
 testdata/complex.lc 3:6-3:10  Type
 testdata/complex.lc 3:13-3:19  'Repr
 testdata/complex.lc 3:22-3:27  'Repr
+testdata/complex.lc 3:6-3:27  Type->Type
 testdata/complex.lc 3:6-3:27  Type
+testdata/complex.lc 3:6-3:10  Type->Type
 testdata/complex.lc 5:17-5:21  Type
+testdata/complex.lc 5:25-5:29  Type->Type
 testdata/complex.lc 5:25-5:29  Type
 testdata/complex.lc 5:6-5:13  'Repr->Type
+testdata/complex.lc 6:25-6:52  Type->Type
 testdata/complex.lc 6:25-6:52  Type
 testdata/complex.lc 6:25-6:30  Type
+testdata/complex.lc 6:34-6:52  Type->Type
 testdata/complex.lc 6:34-6:52  Type
 testdata/complex.lc 6:34-6:39  Type
+testdata/complex.lc 6:43-6:52  Type->Type
 testdata/complex.lc 6:43-6:52  Type
 testdata/complex.lc 6:43-6:50  'Repr->Type
 testdata/complex.lc 6:51-6:52  'Repr
 testdata/complex.lc 6:51-6:52  V3
 testdata/complex.lc 6:3-6:10  {a:'Repr} -> 'Float -> 'Float -> 'Complex a
+testdata/complex.lc 5:6-5:13  Type->Type
 testdata/complex.lc 5:6-5:13  Type
+testdata/complex.lc 5:6-6:52  Type->Type
 testdata/complex.lc 5:6-6:52  Type
+testdata/complex.lc 6:3-6:52  Type->Type
 testdata/complex.lc 6:3-6:52  Type
 testdata/complex.lc 6:3-6:10  'Complex V2
+testdata/complex.lc 8:9-8:37  Type
+testdata/complex.lc 8:20-8:37  Type->Type
 testdata/complex.lc 8:20-8:37  Type
 testdata/complex.lc 8:20-8:27  'Repr->Type
 testdata/complex.lc 8:28-8:29  'Repr
 testdata/complex.lc 8:28-8:29  V1
+testdata/complex.lc 8:33-8:37  Type->Type
 testdata/complex.lc 8:33-8:37  Type
 testdata/complex.lc 9:13-9:14  {a:'Repr} -> 'Complex a -> 'Repr
 testdata/complex.lc 9:13-9:14  'Complex V0 -> 'Repr
@@ -31,8 +43,10 @@ testdata/complex.lc 9:13-9:14  'Repr
 testdata/complex.lc 9:1-9:5  {a:'Repr} -> 'Complex a -> 'Repr
 testdata/complex.lc 11:11-11:43  Type
 testdata/complex.lc 11:11-11:16  Type
+testdata/complex.lc 11:20-11:43  Type->Type
 testdata/complex.lc 11:20-11:43  Type
 testdata/complex.lc 11:20-11:25  Type
+testdata/complex.lc 11:29-11:43  Type->Type
 testdata/complex.lc 11:29-11:43  Type
 testdata/complex.lc 11:29-11:36  'Repr->Type
 testdata/complex.lc 11:37-11:43  'Repr
@@ -45,8 +59,10 @@ testdata/complex.lc 12:24-12:25  'Float
 testdata/complex.lc 12:1-12:7  'Float -> 'Float -> 'Complex Normal
 testdata/complex.lc 14:10-14:41  Type
 testdata/complex.lc 14:10-14:15  Type
+testdata/complex.lc 14:19-14:41  Type->Type
 testdata/complex.lc 14:19-14:41  Type
 testdata/complex.lc 14:19-14:24  Type
+testdata/complex.lc 14:28-14:41  Type->Type
 testdata/complex.lc 14:28-14:41  Type
 testdata/complex.lc 14:28-14:35  'Repr->Type
 testdata/complex.lc 14:36-14:41  'Repr
@@ -57,21 +73,24 @@ testdata/complex.lc 15:13-15:20  {a:'Repr} -> 'Float -> 'Float -> 'Complex a
 testdata/complex.lc 15:21-15:22  'Float
 testdata/complex.lc 15:23-15:24  'Float
 testdata/complex.lc 15:1-15:6  'Float -> 'Float -> 'Complex Polar
+testdata/complex.lc 18:9-18:38  Type
+testdata/complex.lc 18:20-18:38  Type->Type
 testdata/complex.lc 18:20-18:38  Type
 testdata/complex.lc 18:20-18:27  'Repr->Type
 testdata/complex.lc 18:28-18:29  'Repr
 testdata/complex.lc 18:28-18:29  V1
+testdata/complex.lc 18:33-18:38  Type->Type
 testdata/complex.lc 18:33-18:38  Type
 testdata/complex.lc 19:7-20:34  {a:'Repr} -> 'Complex a -> 'Float
 testdata/complex.lc 19:7-20:34  'Complex V0 -> 'Float
 testdata/complex.lc 19:7-20:34  'Float
-testdata/complex.lc 19:23-19:48  V0
-testdata/complex.lc 19:33-19:48  {a:'Repr} -> 'Float -> 'Float->V3
-testdata/complex.lc 19:33-19:48  'Float -> 'Float->V3
-testdata/complex.lc 19:33-19:48  'Float->V3
-testdata/complex.lc 19:33-19:48  V3
+testdata/complex.lc 19:23-19:49  V0
+testdata/complex.lc 19:33-19:49  {a:'Repr} -> 'Float -> 'Float->V3
+testdata/complex.lc 19:33-19:49  'Float -> 'Float->V3
+testdata/complex.lc 19:33-19:49  'Float->V3
+testdata/complex.lc 19:33-19:49  V3
 testdata/complex.lc 19:33-19:37  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
-testdata/complex.lc 19:39-19:48  'VecScalar V0 'Float
+testdata/complex.lc 19:38-19:49  'VecScalar V0 'Float
 testdata/complex.lc 19:43-19:44  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> a->a
 testdata/complex.lc 19:39-19:42  V1
 testdata/complex.lc 19:40-19:41  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> a->a
@@ -98,17 +117,18 @@ testdata/complex.lc 19:1-19:5  {a:'Repr} -> 'Complex a -> 'Float
 testdata/complex.lc 22:12-22:43  Type
 testdata/complex.lc 22:12-22:19  'Repr->Type
 testdata/complex.lc 22:20-22:26  'Repr
+testdata/complex.lc 22:30-22:43  Type->Type
 testdata/complex.lc 22:30-22:43  Type
 testdata/complex.lc 22:30-22:37  'Repr->Type
 testdata/complex.lc 22:38-22:43  'Repr
-testdata/complex.lc 23:18-31:24  'Complex Normal -> 'Complex Polar
-testdata/complex.lc 23:18-31:24  'Complex Polar
-testdata/complex.lc 24:8-31:24  {a:'Repr} -> 'Float -> 'Float->V3
-testdata/complex.lc 24:8-31:24  'Float -> 'Float->V3
-testdata/complex.lc 24:8-31:24  'Float->V3
-testdata/complex.lc 24:8-31:24  V3
+testdata/complex.lc 23:18-31:25  'Complex Normal -> 'Complex Polar
+testdata/complex.lc 23:18-31:25  'Complex Polar
+testdata/complex.lc 24:8-31:25  {a:'Repr} -> 'Float -> 'Float->V3
+testdata/complex.lc 24:8-31:25  'Float -> 'Float->V3
+testdata/complex.lc 24:8-31:25  'Float->V3
+testdata/complex.lc 24:8-31:25  V3
 testdata/complex.lc 31:9-31:13  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
-testdata/complex.lc 31:15-31:24  'VecScalar V0 'Float
+testdata/complex.lc 31:14-31:25  'VecScalar V0 'Float
 testdata/complex.lc 31:19-31:20  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> a->a
 testdata/complex.lc 31:15-31:18  V1
 testdata/complex.lc 31:16-31:17  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> a->a
@@ -120,24 +140,22 @@ testdata/complex.lc 31:22-31:23  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a ->
 testdata/complex.lc 31:21-31:22  V1
 testdata/complex.lc 31:21-31:22  'Float
 testdata/complex.lc 31:23-31:24  'Float
-testdata/complex.lc 24:8-29:17  {a} -> 'Bool -> a -> a->a
 testdata/complex.lc 24:11-24:19  'Bool
 testdata/complex.lc 24:13-24:14  {a} -> {b:'Nat} -> {c : 'Num a} -> 'VecScalar b a -> 'VecScalar b a -> 'VecScalar b 'Bool
 testdata/complex.lc 24:11-24:12  'VecScalar V1 V2
 testdata/complex.lc 24:11-24:12  'Float
 testdata/complex.lc 24:16-24:19  'Float
-testdata/complex.lc 24:37-24:57  V0
+testdata/complex.lc 24:37-24:59  V0
 testdata/complex.lc 24:37-24:42  'Float -> 'Float -> 'Complex Polar
 testdata/complex.lc 24:43-24:44  'Float
-testdata/complex.lc 24:46-24:57  'Float
+testdata/complex.lc 24:45-24:59  'Float
 testdata/complex.lc 24:46-24:50  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
-testdata/complex.lc 24:52-24:57  'VecScalar V0 'Float
+testdata/complex.lc 24:51-24:58  'VecScalar V0 'Float
 testdata/complex.lc 24:54-24:55  {a} -> {b:'Nat} -> {c : 'Num a} -> 'VecScalar b a -> 'VecScalar b a -> 'VecScalar b a
 testdata/complex.lc 24:52-24:53  'VecScalar V1 V2
 testdata/complex.lc 24:52-24:53  'Float
 testdata/complex.lc 24:56-24:57  'Float
 testdata/complex.lc 25:8-29:17  'Complex Polar
-testdata/complex.lc 25:8-29:17  {a} -> 'Bool -> a -> a->a
 testdata/complex.lc 25:11-25:31  'Bool
 testdata/complex.lc 25:20-25:22  'Bool -> 'Bool->'Bool
 testdata/complex.lc 25:11-25:19  'Bool
@@ -150,21 +168,20 @@ testdata/complex.lc 25:25-25:27  {a} -> {b:'Nat} -> {c : 'Num a} -> 'VecScalar b
 testdata/complex.lc 25:23-25:24  'VecScalar V1 V2
 testdata/complex.lc 25:23-25:24  'Float
 testdata/complex.lc 25:28-25:31  'Float
-testdata/complex.lc 25:37-25:63  V0
+testdata/complex.lc 25:37-25:64  V0
 testdata/complex.lc 25:37-25:42  'Float -> 'Float -> 'Complex Polar
 testdata/complex.lc 25:43-25:44  'Float
-testdata/complex.lc 25:46-25:63  'Float
+testdata/complex.lc 25:45-25:64  'Float
 testdata/complex.lc 25:59-25:60  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> a->a
-testdata/complex.lc 25:46-25:57  V1
+testdata/complex.lc 25:46-25:58  V1
 testdata/complex.lc 25:46-25:50  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
-testdata/complex.lc 25:52-25:57  'VecScalar V0 'Float
+testdata/complex.lc 25:51-25:58  'VecScalar V0 'Float
 testdata/complex.lc 25:54-25:55  {a} -> {b:'Nat} -> {c : 'Num a} -> 'VecScalar b a -> 'VecScalar b a -> 'VecScalar b a
 testdata/complex.lc 25:52-25:53  'VecScalar V1 V2
 testdata/complex.lc 25:52-25:53  'Float
 testdata/complex.lc 25:56-25:57  'Float
 testdata/complex.lc 25:61-25:63  'Float
 testdata/complex.lc 26:8-29:17  'Complex Polar
-testdata/complex.lc 26:8-29:17  {a} -> 'Bool -> a -> a->a
 testdata/complex.lc 26:11-26:31  'Bool
 testdata/complex.lc 26:20-26:22  'Bool -> 'Bool->'Bool
 testdata/complex.lc 26:11-26:19  'Bool
@@ -177,21 +194,20 @@ testdata/complex.lc 26:25-26:26  {a} -> {b:'Nat} -> {c : 'Num a} -> 'VecScalar b
 testdata/complex.lc 26:23-26:24  'VecScalar V1 V2
 testdata/complex.lc 26:23-26:24  'Float
 testdata/complex.lc 26:28-26:31  'Float
-testdata/complex.lc 26:37-26:63  V0
+testdata/complex.lc 26:37-26:64  V0
 testdata/complex.lc 26:37-26:42  'Float -> 'Float -> 'Complex Polar
 testdata/complex.lc 26:43-26:44  'Float
-testdata/complex.lc 26:46-26:63  'Float
+testdata/complex.lc 26:45-26:64  'Float
 testdata/complex.lc 26:59-26:60  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> a->a
-testdata/complex.lc 26:46-26:57  V1
+testdata/complex.lc 26:46-26:58  V1
 testdata/complex.lc 26:46-26:50  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
-testdata/complex.lc 26:52-26:57  'VecScalar V0 'Float
+testdata/complex.lc 26:51-26:58  'VecScalar V0 'Float
 testdata/complex.lc 26:54-26:55  {a} -> {b:'Nat} -> {c : 'Num a} -> 'VecScalar b a -> 'VecScalar b a -> 'VecScalar b a
 testdata/complex.lc 26:52-26:53  'VecScalar V1 V2
 testdata/complex.lc 26:52-26:53  'Float
 testdata/complex.lc 26:56-26:57  'Float
 testdata/complex.lc 26:61-26:63  'Float
 testdata/complex.lc 27:8-29:17  'Complex Polar
-testdata/complex.lc 27:8-29:17  {a} -> 'Bool -> a -> a->a
 testdata/complex.lc 27:11-27:31  'Bool
 testdata/complex.lc 27:20-27:22  'Bool -> 'Bool->'Bool
 testdata/complex.lc 27:11-27:19  'Bool
@@ -204,16 +220,15 @@ testdata/complex.lc 27:25-27:27  {a} -> {b:'Nat} -> {c : 'Num a} -> 'VecScalar b
 testdata/complex.lc 27:23-27:24  'VecScalar V1 V2
 testdata/complex.lc 27:23-27:24  'Float
 testdata/complex.lc 27:28-27:31  'Float
-testdata/complex.lc 27:37-27:55  V0
+testdata/complex.lc 27:37-27:56  V0
 testdata/complex.lc 27:37-27:42  'Float -> 'Float -> 'Complex Polar
 testdata/complex.lc 27:43-27:44  'Float
-testdata/complex.lc 27:47-27:55  'Float
+testdata/complex.lc 27:45-27:56  'Float
 testdata/complex.lc 27:50-27:51  {a} -> {b:'Nat} -> {c : 'Num a} -> 'VecScalar b a -> 'VecScalar b a -> 'VecScalar b a
 testdata/complex.lc 27:47-27:49  'VecScalar V1 V2
 testdata/complex.lc 27:47-27:49  'Float
 testdata/complex.lc 27:52-27:55  'Float
 testdata/complex.lc 28:8-29:17  'Complex Polar
-testdata/complex.lc 28:8-29:17  {a} -> 'Bool -> a -> a->a
 testdata/complex.lc 28:11-28:31  'Bool
 testdata/complex.lc 28:20-28:22  'Bool -> 'Bool->'Bool
 testdata/complex.lc 28:11-28:19  'Bool
@@ -226,12 +241,10 @@ testdata/complex.lc 28:25-28:26  {a} -> {b:'Nat} -> {c : 'Num a} -> 'VecScalar b
 testdata/complex.lc 28:23-28:24  'VecScalar V1 V2
 testdata/complex.lc 28:23-28:24  'Float
 testdata/complex.lc 28:28-28:31  'Float
-testdata/complex.lc 28:37-28:55  V0
+testdata/complex.lc 28:37-28:56  V0
 testdata/complex.lc 28:37-28:42  'Float -> 'Float -> 'Complex Polar
 testdata/complex.lc 28:43-28:44  'Float
-testdata/complex.lc 28:46-28:55  'Float
-testdata/complex.lc 28:46-28:55  V1
-testdata/complex.lc 28:46-28:55  'Int
+testdata/complex.lc 28:45-28:56  'Float
 testdata/complex.lc 28:47-28:55  'Float
 testdata/complex.lc 28:50-28:51  {a} -> {b:'Nat} -> {c : 'Num a} -> 'VecScalar b a -> 'VecScalar b a -> 'VecScalar b a
 testdata/complex.lc 28:47-28:49  'VecScalar V1 V2
@@ -244,17 +257,18 @@ testdata/complex.lc 23:1-23:8  'Complex Normal -> 'Complex Polar
 testdata/complex.lc 64:13-64:44  Type
 testdata/complex.lc 64:13-64:20  'Repr->Type
 testdata/complex.lc 64:21-64:26  'Repr
+testdata/complex.lc 64:30-64:44  Type->Type
 testdata/complex.lc 64:30-64:44  Type
 testdata/complex.lc 64:30-64:37  'Repr->Type
 testdata/complex.lc 64:38-64:44  'Repr
-testdata/complex.lc 65:19-65:62  'Complex Polar -> 'Complex Normal
-testdata/complex.lc 65:19-65:62  'Complex Normal
-testdata/complex.lc 65:28-65:62  {a:'Repr} -> 'Float -> 'Float->V3
-testdata/complex.lc 65:28-65:62  'Float -> 'Float->V3
-testdata/complex.lc 65:28-65:62  'Float->V3
-testdata/complex.lc 65:28-65:62  V3
+testdata/complex.lc 65:19-65:63  'Complex Polar -> 'Complex Normal
+testdata/complex.lc 65:19-65:63  'Complex Normal
+testdata/complex.lc 65:28-65:63  {a:'Repr} -> 'Float -> 'Float->V3
+testdata/complex.lc 65:28-65:63  'Float -> 'Float->V3
+testdata/complex.lc 65:28-65:63  'Float->V3
+testdata/complex.lc 65:28-65:63  V3
 testdata/complex.lc 65:28-65:35  {a:'Repr} -> 'Float -> 'Float -> 'Complex a
-testdata/complex.lc 65:37-65:48  'Float
+testdata/complex.lc 65:36-65:49  'Float
 testdata/complex.lc 65:39-65:40  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> a->a
 testdata/complex.lc 65:37-65:38  V1
 testdata/complex.lc 65:37-65:38  'Float
@@ -262,7 +276,7 @@ testdata/complex.lc 65:41-65:48  'Float
 testdata/complex.lc 65:41-65:44  {a} -> {b:'Nat} -> {c : a ~ 'VecScalar b 'Float} -> a->a
 testdata/complex.lc 65:45-65:48  'VecScalar V0 'Float
 testdata/complex.lc 65:45-65:48  'Float
-testdata/complex.lc 65:51-65:62  'Float
+testdata/complex.lc 65:50-65:63  'Float
 testdata/complex.lc 65:53-65:54  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> a->a
 testdata/complex.lc 65:51-65:52  V1
 testdata/complex.lc 65:51-65:52  'Float
@@ -281,39 +295,45 @@ testdata/complex.lc 111:38-111:39  'Float
 testdata/complex.lc 111:25-111:34  'Complex V0
 testdata/complex.lc 111:25-111:34  V2
 testdata/complex.lc 111:1-111:15  {a:'Repr} -> 'Complex a -> 'Float
+testdata/complex.lc 113:8-113:70  Type
+testdata/complex.lc 113:20-113:70  Type->Type
+testdata/complex.lc 113:20-113:70  Type
+testdata/complex.lc 113:32-113:70  Type->Type
 testdata/complex.lc 113:32-113:70  Type
 testdata/complex.lc 113:32-113:39  'Repr->Type
 testdata/complex.lc 113:40-113:42  'Repr
 testdata/complex.lc 113:40-113:42  V3
+testdata/complex.lc 113:46-113:70  Type->Type
 testdata/complex.lc 113:46-113:70  Type
 testdata/complex.lc 113:46-113:53  'Repr->Type
 testdata/complex.lc 113:54-113:56  'Repr
 testdata/complex.lc 113:54-113:56  V2
+testdata/complex.lc 113:60-113:70  Type->Type
 testdata/complex.lc 113:60-113:70  Type
 testdata/complex.lc 113:60-113:67  'Repr->Type
 testdata/complex.lc 113:68-113:70  'Repr
-testdata/complex.lc 114:6-114:73  {a:'Repr} -> {b:'Repr} -> 'Complex a -> 'Complex b -> 'Complex a
-testdata/complex.lc 114:6-114:73  {a:'Repr} -> 'Complex V1 -> 'Complex a -> 'Complex V3
-testdata/complex.lc 114:6-114:73  'Complex V1 -> 'Complex V1 -> 'Complex V3
-testdata/complex.lc 114:6-114:73  'Complex V1 -> 'Complex V3
-testdata/complex.lc 114:6-114:73  'Complex V3
-testdata/complex.lc 114:14-114:73  V0
-testdata/complex.lc 114:30-114:73  V0
-testdata/complex.lc 114:44-114:73  {a:'Repr} -> 'Float -> 'Float->V3
-testdata/complex.lc 114:44-114:73  'Float -> 'Float->V3
-testdata/complex.lc 114:44-114:73  'Float->V3
-testdata/complex.lc 114:44-114:73  V3
-testdata/complex.lc 114:51-114:73  {a:'Repr} -> 'Float -> 'Float->V3
-testdata/complex.lc 114:51-114:73  'Float -> 'Float->V3
-testdata/complex.lc 114:51-114:73  'Float->V3
-testdata/complex.lc 114:51-114:73  V3
+testdata/complex.lc 114:6-114:74  {a:'Repr} -> {b:'Repr} -> 'Complex a -> 'Complex b -> 'Complex a
+testdata/complex.lc 114:6-114:74  {a:'Repr} -> 'Complex V1 -> 'Complex a -> 'Complex V3
+testdata/complex.lc 114:6-114:74  'Complex V1 -> 'Complex V1 -> 'Complex V3
+testdata/complex.lc 114:6-114:74  'Complex V1 -> 'Complex V3
+testdata/complex.lc 114:6-114:74  'Complex V3
+testdata/complex.lc 114:14-114:74  V0
+testdata/complex.lc 114:30-114:74  V0
+testdata/complex.lc 114:44-114:74  {a:'Repr} -> 'Float -> 'Float->V3
+testdata/complex.lc 114:44-114:74  'Float -> 'Float->V3
+testdata/complex.lc 114:44-114:74  'Float->V3
+testdata/complex.lc 114:44-114:74  V3
+testdata/complex.lc 114:51-114:74  {a:'Repr} -> 'Float -> 'Float->V3
+testdata/complex.lc 114:51-114:74  'Float -> 'Float->V3
+testdata/complex.lc 114:51-114:74  'Float->V3
+testdata/complex.lc 114:51-114:74  V3
 testdata/complex.lc 114:51-114:58  {a:'Repr} -> 'Float -> 'Float -> 'Complex a
-testdata/complex.lc 114:60-114:65  'Float
+testdata/complex.lc 114:59-114:66  'Float
 testdata/complex.lc 114:62-114:63  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> a->a
 testdata/complex.lc 114:60-114:61  V1
 testdata/complex.lc 114:60-114:61  'Float
 testdata/complex.lc 114:64-114:65  'Float
-testdata/complex.lc 114:68-114:73  'Float
+testdata/complex.lc 114:67-114:74  'Float
 testdata/complex.lc 114:70-114:71  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> a->a
 testdata/complex.lc 114:68-114:69  V1
 testdata/complex.lc 114:68-114:69  'Float
@@ -325,34 +345,38 @@ testdata/complex.lc 114:30-114:33  'Complex V7
 testdata/complex.lc 114:14-114:20  'Repr
 testdata/complex.lc 114:6-114:12  'Repr
 testdata/complex.lc 114:1-114:4  {a:'Repr} -> {b:'Repr} -> 'Complex a -> 'Complex b -> 'Complex a
+testdata/complex.lc 128:8-128:61  Type
+testdata/complex.lc 128:23-128:61  Type->Type
 testdata/complex.lc 128:23-128:61  Type
 testdata/complex.lc 128:23-128:30  'Repr->Type
 testdata/complex.lc 128:31-128:33  'Repr
 testdata/complex.lc 128:31-128:33  V3
+testdata/complex.lc 128:37-128:61  Type->Type
 testdata/complex.lc 128:37-128:61  Type
 testdata/complex.lc 128:37-128:44  'Repr->Type
 testdata/complex.lc 128:45-128:47  'Repr
 testdata/complex.lc 128:45-128:47  V2
+testdata/complex.lc 128:51-128:61  Type->Type
 testdata/complex.lc 128:51-128:61  Type
 testdata/complex.lc 128:51-128:58  'Repr->Type
 testdata/complex.lc 128:59-128:61  'Repr
-testdata/complex.lc 129:6-129:81  {a:'Repr} -> {b:'Repr} -> 'Complex a -> 'Complex b -> 'Complex a
-testdata/complex.lc 129:6-129:81  {a:'Repr} -> 'Complex V1 -> 'Complex a -> 'Complex V3
-testdata/complex.lc 129:6-129:81  'Complex V1 -> 'Complex V1 -> 'Complex V3
-testdata/complex.lc 129:6-129:81  'Complex V1 -> 'Complex V3
-testdata/complex.lc 129:6-129:81  'Complex V3
-testdata/complex.lc 129:14-129:81  V0
-testdata/complex.lc 129:30-129:81  V0
-testdata/complex.lc 129:44-129:81  {a:'Repr} -> 'Float -> 'Float->V3
-testdata/complex.lc 129:44-129:81  'Float -> 'Float->V3
-testdata/complex.lc 129:44-129:81  'Float->V3
-testdata/complex.lc 129:44-129:81  V3
-testdata/complex.lc 129:51-129:81  {a:'Repr} -> 'Float -> 'Float->V3
-testdata/complex.lc 129:51-129:81  'Float -> 'Float->V3
-testdata/complex.lc 129:51-129:81  'Float->V3
-testdata/complex.lc 129:51-129:81  V3
+testdata/complex.lc 129:6-129:82  {a:'Repr} -> {b:'Repr} -> 'Complex a -> 'Complex b -> 'Complex a
+testdata/complex.lc 129:6-129:82  {a:'Repr} -> 'Complex V1 -> 'Complex a -> 'Complex V3
+testdata/complex.lc 129:6-129:82  'Complex V1 -> 'Complex V1 -> 'Complex V3
+testdata/complex.lc 129:6-129:82  'Complex V1 -> 'Complex V3
+testdata/complex.lc 129:6-129:82  'Complex V3
+testdata/complex.lc 129:14-129:82  V0
+testdata/complex.lc 129:30-129:82  V0
+testdata/complex.lc 129:44-129:82  {a:'Repr} -> 'Float -> 'Float->V3
+testdata/complex.lc 129:44-129:82  'Float -> 'Float->V3
+testdata/complex.lc 129:44-129:82  'Float->V3
+testdata/complex.lc 129:44-129:82  V3
+testdata/complex.lc 129:51-129:82  {a:'Repr} -> 'Float -> 'Float->V3
+testdata/complex.lc 129:51-129:82  'Float -> 'Float->V3
+testdata/complex.lc 129:51-129:82  'Float->V3
+testdata/complex.lc 129:51-129:82  V3
 testdata/complex.lc 129:51-129:58  {a:'Repr} -> 'Float -> 'Float -> 'Complex a
-testdata/complex.lc 129:60-129:69  'Float
+testdata/complex.lc 129:59-129:70  'Float
 testdata/complex.lc 129:64-129:65  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> a->a
 testdata/complex.lc 129:60-129:63  V1
 testdata/complex.lc 129:61-129:62  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> a->a
@@ -364,7 +388,7 @@ testdata/complex.lc 129:67-129:68  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a
 testdata/complex.lc 129:66-129:67  V1
 testdata/complex.lc 129:66-129:67  'Float
 testdata/complex.lc 129:68-129:69  'Float
-testdata/complex.lc 129:72-129:81  'Float
+testdata/complex.lc 129:71-129:82  'Float
 testdata/complex.lc 129:76-129:77  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> a->a
 testdata/complex.lc 129:72-129:75  V1
 testdata/complex.lc 129:73-129:74  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> a->a
@@ -384,17 +408,19 @@ testdata/complex.lc 129:14-129:20  'Repr
 testdata/complex.lc 129:6-129:12  'Repr
 testdata/complex.lc 129:1-129:4  {a:'Repr} -> {b:'Repr} -> 'Complex a -> 'Complex b -> 'Complex a
 testdata/complex.lc 137:6-137:28  Type
+testdata/complex.lc 137:6-137:28  Type->Type
 testdata/complex.lc 137:6-137:13  'Repr->Type
 testdata/complex.lc 137:14-137:15  'Repr
 testdata/complex.lc 137:14-137:15  V1
+testdata/complex.lc 137:19-137:28  Type->Type
 testdata/complex.lc 137:19-137:28  Type
 testdata/complex.lc 137:19-137:26  'Repr->Type
 testdata/complex.lc 137:27-137:28  'Repr
-testdata/complex.lc 138:8-138:24  {a:'Repr} -> 'Complex a -> 'Complex a
-testdata/complex.lc 138:8-138:24  'Complex V0 -> 'Complex V1
-testdata/complex.lc 138:8-138:24  'Complex V1
+testdata/complex.lc 138:7-138:24  {a:'Repr} -> 'Complex a -> 'Complex a
+testdata/complex.lc 138:7-138:24  'Complex V0 -> 'Complex V1
+testdata/complex.lc 138:7-138:24  'Complex V1
 testdata/complex.lc 138:17-138:16  {a:'Repr} -> {b:'Repr} -> 'Complex a -> 'Complex b -> 'Complex a
-testdata/complex.lc 138:8-138:15  'Complex V1
+testdata/complex.lc 138:7-138:16  'Complex V1
 testdata/complex.lc 138:8-138:11  {a:'Repr} -> {b:'Repr} -> 'Complex a -> 'Complex b -> 'Complex a
 testdata/complex.lc 138:12-138:13  'Complex V1
 testdata/complex.lc 138:12-138:13  'Complex V5
@@ -404,11 +430,11 @@ testdata/complex.lc 138:23-138:24  'Complex V0
 testdata/complex.lc 138:23-138:24  'Complex V2
 testdata/complex.lc 138:1-138:2  {a:'Repr} -> 'Complex a -> 'Complex a
 testdata/complex.lc 141:8-141:9  {a:'Repr} -> 'Complex a -> 'Complex a
-testdata/complex.lc 141:11-141:20  'Complex V0
+testdata/complex.lc 141:10-141:23  'Complex V0
 testdata/complex.lc 141:11-141:12  {a:'Repr} -> 'Complex a -> 'Complex a
-testdata/complex.lc 141:14-141:20  'Complex V0
+testdata/complex.lc 141:13-141:22  'Complex V0
 testdata/complex.lc 141:14-141:15  {a:'Repr} -> 'Complex a -> 'Complex a
-testdata/complex.lc 141:17-141:20  'Complex V0
+testdata/complex.lc 141:16-141:21  'Complex V0
 testdata/complex.lc 141:17-141:18  {a:'Repr} -> 'Complex a -> 'Complex a
 testdata/complex.lc 141:19-141:20  'Complex V0
 testdata/complex.lc 141:19-141:20  V5
@@ -416,9 +442,9 @@ testdata/complex.lc 141:1-141:3  {a:'Repr} -> 'Complex a -> 'Complex a
 testdata/complex.lc 143:8-143:10  {a:'Repr} -> 'Complex a -> 'Complex a
 testdata/complex.lc 143:1-143:5  {a:'Repr} -> 'Complex a -> 'Complex a
 testdata/complex.lc 145:26-145:27  {a} -> {b:'Nat} -> {c : 'Num a} -> 'VecScalar b a -> 'VecScalar b a -> 'VecScalar b 'Bool
-testdata/complex.lc 145:12-145:24  'VecScalar V1 V2
+testdata/complex.lc 145:12-145:25  'VecScalar V1 V2
 testdata/complex.lc 145:12-145:16  {a:'Repr} -> 'Complex a -> 'Float
-testdata/complex.lc 145:18-145:24  'Complex V0
+testdata/complex.lc 145:17-145:25  'Complex V0
 testdata/complex.lc 145:18-145:22  {a:'Repr} -> 'Complex a -> 'Complex a
 testdata/complex.lc 145:23-145:24  'Complex V0
 testdata/complex.lc 145:23-145:24  V6
diff --git a/testdata/data.out b/testdata/data.out
index 97814586..385bebec 100644
--- a/testdata/data.out
+++ b/testdata/data.out
@@ -2,32 +2,44 @@ main is not found
 tooltips:
 testdata/data.lc 1:6-1:11  Type
 testdata/data.lc 1:14-1:19  'Data0
+testdata/data.lc 1:6-1:19  Type->Type
 testdata/data.lc 1:6-1:19  Type
+testdata/data.lc 1:6-1:11  Type->Type
 testdata/data.lc 3:6-3:11  Type -> Type -> Type->Type
+testdata/data.lc 3:6-3:31  Type->Type
 testdata/data.lc 3:6-3:31  Type
 testdata/data.lc 3:26-3:27  Type
 testdata/data.lc 3:28-3:29  Type
 testdata/data.lc 3:30-3:31  Type
+testdata/data.lc 3:6-3:11  Type->Type
 testdata/data.lc 3:6-3:11  Type
 testdata/data.lc 3:20-3:25  {a} -> {b} -> {c} -> a -> b -> c -> 'Data1 a b c
+testdata/data.lc 3:6-3:25  Type->Type
 testdata/data.lc 3:6-3:25  Type
+testdata/data.lc 3:20-3:25  Type->Type
 testdata/data.lc 3:20-3:25  Type
 testdata/data.lc 3:20-3:25  'Data1 V6 V5 V4
 testdata/data.lc 5:6-5:11  Type
 testdata/data.lc 5:21-5:24  Type
+testdata/data.lc 5:6-5:11  Type->Type
 testdata/data.lc 5:14-5:20  'Int->'Data2
 testdata/data.lc 6:28-6:31  Type
+testdata/data.lc 5:6-6:39  Type->Type
 testdata/data.lc 5:6-6:39  Type
 testdata/data.lc 6:36-6:39  Type
 testdata/data.lc 6:14-6:20  'Int -> 'Int->'Data2
 testdata/data.lc 7:28-7:31  Type
 testdata/data.lc 7:14-7:20  'Int->'Data2
 testdata/data.lc 8:14-8:20  'Data2
+testdata/data.lc 5:6-8:20  Type->Type
 testdata/data.lc 5:6-8:20  Type
+testdata/data.lc 5:14-5:20  Type->Type
 testdata/data.lc 5:14-5:20  Type
 testdata/data.lc 5:14-5:20  'Data2
+testdata/data.lc 6:14-6:20  Type->Type
 testdata/data.lc 6:14-6:20  Type
 testdata/data.lc 6:14-6:20  'Data2
+testdata/data.lc 7:14-7:20  Type->Type
 testdata/data.lc 7:14-7:20  Type
 testdata/data.lc 7:14-7:20  'Data2
 testdata/data.lc 6:14-6:20  'Int -> 'Int->V2
@@ -42,15 +54,19 @@ testdata/data.lc 7:14-7:20  V1
 testdata/data.lc 7:14-7:20  'Int
 testdata/data.lc 7:23-7:24  'Data2->'Int
 testdata/data.lc 10:6-10:11  Type -> Type -> Type->Type
+testdata/data.lc 10:6-10:38  Type->Type
 testdata/data.lc 10:6-10:38  Type
 testdata/data.lc 10:36-10:38  Type
+testdata/data.lc 10:6-10:11  Type->Type
 testdata/data.lc 10:6-10:11  Type
 testdata/data.lc 10:23-10:29  {a} -> {b} -> {c} -> a -> 'Data5 a b c
+testdata/data.lc 10:6-11:54  Type->Type
 testdata/data.lc 10:6-11:54  Type
 testdata/data.lc 11:36-11:38  Type
 testdata/data.lc 11:44-11:46  Type
 testdata/data.lc 11:52-11:54  Type
 testdata/data.lc 11:23-11:29  {a} -> {b} -> {c} -> a -> b -> c -> 'Data5 a b c
+testdata/data.lc 10:6-12:48  Type->Type
 testdata/data.lc 10:6-12:48  Type
 testdata/data.lc 12:30-12:33  Type
 testdata/data.lc 12:34-12:36  Type
@@ -58,11 +74,15 @@ testdata/data.lc 12:37-12:42  Type
 testdata/data.lc 12:43-12:45  Type
 testdata/data.lc 12:46-12:48  Type
 testdata/data.lc 12:23-12:29  {a} -> {b} -> {c} -> 'Int -> a -> 'Float -> b -> c -> 'Data5 a b c
+testdata/data.lc 10:6-12:29  Type->Type
 testdata/data.lc 10:6-12:29  Type
+testdata/data.lc 10:23-10:29  Type->Type
 testdata/data.lc 10:23-10:29  Type
 testdata/data.lc 10:23-10:29  'Data5 V4 V3 V2
+testdata/data.lc 11:23-11:29  Type->Type
 testdata/data.lc 11:23-11:29  Type
 testdata/data.lc 11:23-11:29  'Data5 V7 V6 V5
+testdata/data.lc 12:23-12:29  Type->Type
 testdata/data.lc 12:23-12:29  Type
 testdata/data.lc 12:23-12:29  'Data5 V10 V9 V8
 testdata/data.lc 10:23-10:29  V3->V1
diff --git a/testdata/empty.out b/testdata/empty.out
index 72e5a61d..feb47c36 100644
--- a/testdata/empty.out
+++ b/testdata/empty.out
@@ -1,3 +1,4 @@
 main is not found
 tooltips:
 testdata/empty.lc 3:6-3:11  Type
+testdata/empty.lc 3:6-3:11  Type->Type
diff --git a/testdata/id.out b/testdata/id.out
index cc5dda6b..7cb8e6f6 100644
--- a/testdata/id.out
+++ b/testdata/id.out
@@ -1,7 +1,6 @@
 main is not found
 tooltips:
 testdata/id.lc 3:19-3:20  V1
-testdata/id.lc 4:8-4:27  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/id.lc 4:9-4:16  V1
 testdata/id.lc 4:9-4:12  {a} -> a->a
 testdata/id.lc 4:13-4:16  V0
diff --git a/testdata/instantiate.out b/testdata/instantiate.out
index c2d33b93..54452937 100644
--- a/testdata/instantiate.out
+++ b/testdata/instantiate.out
@@ -2,12 +2,12 @@ main is not found
 tooltips:
 testdata/instantiate.lc 2:13-2:20  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> a->a
 testdata/instantiate.lc 2:24-2:25  {a} -> {b : 'Num ('MatVecScalarElem a)} -> a -> a->a
-testdata/instantiate.lc 2:27-2:37  V1
+testdata/instantiate.lc 2:26-2:38  V1
 testdata/instantiate.lc 2:27-2:29  {a} -> a -> a -> 'VecS a (Succ (Succ Zero))
 testdata/instantiate.lc 2:30-2:33  V0
 testdata/instantiate.lc 2:30-2:33  'Float
 testdata/instantiate.lc 2:34-2:37  'Float
-testdata/instantiate.lc 2:40-2:50  'VecS 'Float (Succ (Succ Zero))
+testdata/instantiate.lc 2:39-2:51  'VecS 'Float (Succ (Succ Zero))
 testdata/instantiate.lc 2:40-2:42  {a} -> a -> a -> 'VecS a (Succ (Succ Zero))
 testdata/instantiate.lc 2:43-2:46  V0
 testdata/instantiate.lc 2:43-2:46  'Float
diff --git a/testdata/language-features/basic-list/list01.out b/testdata/language-features/basic-list/list01.out
index 0ac4ca00..4821e343 100644
--- a/testdata/language-features/basic-list/list01.out
+++ b/testdata/language-features/basic-list/list01.out
@@ -1,26 +1,26 @@
 main is not found
 tooltips:
+testdata/language-features/basic-list/list01.lc 1:10-1:12  {a} -> 'List a
 testdata/language-features/basic-list/list01.lc 2:11-2:12  V0
-testdata/language-features/basic-list/list01.lc 2:11-2:12  'Int
-testdata/language-features/basic-list/list01.lc 2:10-2:19  'List V1
+testdata/language-features/basic-list/list01.lc 2:13-2:18  'List V1
 testdata/language-features/basic-list/list01.lc 2:13-2:14  V0
-testdata/language-features/basic-list/list01.lc 2:13-2:14  'Int
-testdata/language-features/basic-list/list01.lc 2:10-2:19  'List V2
+testdata/language-features/basic-list/list01.lc 2:15-2:18  'List V2
 testdata/language-features/basic-list/list01.lc 2:15-2:16  V0
-testdata/language-features/basic-list/list01.lc 2:15-2:16  'Int
-testdata/language-features/basic-list/list01.lc 2:10-2:19  'List V3
+testdata/language-features/basic-list/list01.lc 2:17-2:18  'List V3
 testdata/language-features/basic-list/list01.lc 2:17-2:18  V0
-testdata/language-features/basic-list/list01.lc 2:17-2:18  'Int
 testdata/language-features/basic-list/list01.lc 2:1-2:7  {a} -> {b : 'Num a} -> 'List a
 testdata/language-features/basic-list/list01.lc 3:11-3:14  V0
 testdata/language-features/basic-list/list01.lc 3:11-3:14  'Char
-testdata/language-features/basic-list/list01.lc 3:10-3:31  'List 'Char
+testdata/language-features/basic-list/list01.lc 3:15-3:30  'List 'Char
 testdata/language-features/basic-list/list01.lc 3:15-3:18  V0
 testdata/language-features/basic-list/list01.lc 3:15-3:18  'Char
+testdata/language-features/basic-list/list01.lc 3:19-3:30  'List 'Char
 testdata/language-features/basic-list/list01.lc 3:19-3:22  V0
 testdata/language-features/basic-list/list01.lc 3:19-3:22  'Char
+testdata/language-features/basic-list/list01.lc 3:23-3:30  'List 'Char
 testdata/language-features/basic-list/list01.lc 3:23-3:26  V0
 testdata/language-features/basic-list/list01.lc 3:23-3:26  'Char
+testdata/language-features/basic-list/list01.lc 3:27-3:30  'List 'Char
 testdata/language-features/basic-list/list01.lc 3:27-3:30  V0
 testdata/language-features/basic-list/list01.lc 3:27-3:30  'Char
 testdata/language-features/basic-list/list01.lc 3:1-3:7  'List 'Char
diff --git a/testdata/language-features/basic-list/list02.out b/testdata/language-features/basic-list/list02.out
index f68479b2..ac945c2d 100644
--- a/testdata/language-features/basic-list/list02.out
+++ b/testdata/language-features/basic-list/list02.out
@@ -1,26 +1,26 @@
 main is not found
 tooltips:
+testdata/language-features/basic-list/list02.lc 1:10-2:4  {a} -> 'List a
 testdata/language-features/basic-list/list02.lc 4:11-4:12  V0
-testdata/language-features/basic-list/list02.lc 4:11-4:12  'Int
-testdata/language-features/basic-list/list02.lc 4:10-5:7  'List V1
+testdata/language-features/basic-list/list02.lc 4:13-5:6  'List V1
 testdata/language-features/basic-list/list02.lc 4:13-4:14  V0
-testdata/language-features/basic-list/list02.lc 4:13-4:14  'Int
-testdata/language-features/basic-list/list02.lc 4:10-5:7  'List V2
+testdata/language-features/basic-list/list02.lc 5:3-5:6  'List V2
 testdata/language-features/basic-list/list02.lc 5:3-5:4  V0
-testdata/language-features/basic-list/list02.lc 5:3-5:4  'Int
-testdata/language-features/basic-list/list02.lc 4:10-5:7  'List V3
+testdata/language-features/basic-list/list02.lc 5:5-5:6  'List V3
 testdata/language-features/basic-list/list02.lc 5:5-5:6  V0
-testdata/language-features/basic-list/list02.lc 5:5-5:6  'Int
 testdata/language-features/basic-list/list02.lc 4:1-4:7  {a} -> {b : 'Num a} -> 'List a
 testdata/language-features/basic-list/list02.lc 8:5-8:8  V0
 testdata/language-features/basic-list/list02.lc 8:5-8:8  'Char
-testdata/language-features/basic-list/list02.lc 8:3-13:4  'List 'Char
+testdata/language-features/basic-list/list02.lc 9:5-12:8  'List 'Char
 testdata/language-features/basic-list/list02.lc 9:5-9:8  V0
 testdata/language-features/basic-list/list02.lc 9:5-9:8  'Char
+testdata/language-features/basic-list/list02.lc 10:5-12:8  'List 'Char
 testdata/language-features/basic-list/list02.lc 10:5-10:8  V0
 testdata/language-features/basic-list/list02.lc 10:5-10:8  'Char
+testdata/language-features/basic-list/list02.lc 11:5-12:8  'List 'Char
 testdata/language-features/basic-list/list02.lc 11:5-11:8  V0
 testdata/language-features/basic-list/list02.lc 11:5-11:8  'Char
+testdata/language-features/basic-list/list02.lc 12:5-12:8  'List 'Char
 testdata/language-features/basic-list/list02.lc 12:5-12:8  V0
 testdata/language-features/basic-list/list02.lc 12:5-12:8  'Char
 testdata/language-features/basic-list/list02.lc 7:1-7:7  'List 'Char
diff --git a/testdata/language-features/basic-list/list07.reject.out b/testdata/language-features/basic-list/list07.reject.out
index dcda6e81..330be399 100644
--- a/testdata/language-features/basic-list/list07.reject.out
+++ b/testdata/language-features/basic-list/list07.reject.out
@@ -3,4 +3,4 @@ type error: can not unify
 with
 'Char
 
-in 
+in builtin Nil
diff --git a/testdata/language-features/basic-list/list08.out b/testdata/language-features/basic-list/list08.out
index 7e846c15..336acfed 100644
--- a/testdata/language-features/basic-list/list08.out
+++ b/testdata/language-features/basic-list/list08.out
@@ -1,7 +1,6 @@
 main is not found
 tooltips:
 testdata/language-features/basic-list/list08.lc 1:10-1:11  V0
-testdata/language-features/basic-list/list08.lc 1:10-1:11  'Int
-testdata/language-features/basic-list/list08.lc 1:9-1:16  'List V1
+testdata/language-features/basic-list/list08.lc 1:12-1:15  'List V1
 testdata/language-features/basic-list/list08.lc 1:12-1:15  V0
 testdata/language-features/basic-list/list08.lc 1:12-1:15  'Float
diff --git a/testdata/language-features/basic-list/list09.out b/testdata/language-features/basic-list/list09.out
index 88482480..3805ce5e 100644
--- a/testdata/language-features/basic-list/list09.out
+++ b/testdata/language-features/basic-list/list09.out
@@ -4,6 +4,6 @@ testdata/language-features/basic-list/list09.lc 1:20-1:27  Type
 testdata/language-features/basic-list/list09.lc 1:21-1:26  Type
 testdata/language-features/basic-list/list09.lc 1:9-1:16  'List 'Float
 testdata/language-features/basic-list/list09.lc 1:10-1:11  V0
-testdata/language-features/basic-list/list09.lc 1:10-1:11  'Int
+testdata/language-features/basic-list/list09.lc 1:12-1:15  'List 'Float
 testdata/language-features/basic-list/list09.lc 1:12-1:15  V0
 testdata/language-features/basic-list/list09.lc 1:12-1:15  'Float
diff --git a/testdata/language-features/basic-list/list10.reject.out b/testdata/language-features/basic-list/list10.reject.out
index 4f7500b2..8f1376a7 100644
--- a/testdata/language-features/basic-list/list10.reject.out
+++ b/testdata/language-features/basic-list/list10.reject.out
@@ -3,4 +3,4 @@ type error: can not unify
 with
 'Float
 
-in 
+in builtin Nil
diff --git a/testdata/language-features/basic-list/list11.out b/testdata/language-features/basic-list/list11.out
index 7736ade0..0f6c53b9 100644
--- a/testdata/language-features/basic-list/list11.out
+++ b/testdata/language-features/basic-list/list11.out
@@ -2,4 +2,5 @@ main is not found
 tooltips:
 testdata/language-features/basic-list/list11.lc 1:10-1:11  {a} -> a -> 'List a -> 'List a
 testdata/language-features/basic-list/list11.lc 1:9-1:10  V0
-testdata/language-features/basic-list/list11.lc 1:9-1:10  'Int
+testdata/language-features/basic-list/list11.lc 1:11-1:13  'List V1
+testdata/language-features/basic-list/list11.lc 1:11-1:13  {a} -> 'List a
diff --git a/testdata/language-features/basic-values/case02.out b/testdata/language-features/basic-values/case02.out
index 5e4cee55..01244408 100644
--- a/testdata/language-features/basic-values/case02.out
+++ b/testdata/language-features/basic-values/case02.out
@@ -3,18 +3,12 @@ tooltips:
 testdata/language-features/basic-values/case02.lc 3:8-3:10  V0
 testdata/language-features/basic-values/case02.lc 3:8-3:10  'Tuple0
 testdata/language-features/basic-values/case02.lc 2:8-2:10  'Tuple0
-testdata/language-features/basic-values/case02.lc 2:3-2:4  'Ordering
-testdata/language-features/basic-values/case02.lc 2:3-2:4  'Int
 testdata/language-features/basic-values/case02.lc 1:15-1:16  'Int
-testdata/language-features/basic-values/case02.lc 7:3-8:11  V0
+testdata/language-features/basic-values/case02.lc 7:8-8:11  V0
 testdata/language-features/basic-values/case02.lc 8:8-8:11  V0
 testdata/language-features/basic-values/case02.lc 8:8-8:11  'String
 testdata/language-features/basic-values/case02.lc 7:8-7:11  'String
-testdata/language-features/basic-values/case02.lc 7:3-7:4  'Ordering
-testdata/language-features/basic-values/case02.lc 7:3-7:4  'Int
 testdata/language-features/basic-values/case02.lc 6:8-6:11  'String
-testdata/language-features/basic-values/case02.lc 7:3-8:11  'String
-testdata/language-features/basic-values/case02.lc 6:3-6:4  'Ordering
-testdata/language-features/basic-values/case02.lc 6:3-6:4  'Int
+testdata/language-features/basic-values/case02.lc 7:8-8:11  'String
 testdata/language-features/basic-values/case02.lc 5:15-5:16  'Int
 testdata/language-features/basic-values/case02.lc 5:1-5:7  'String
diff --git a/testdata/language-features/basic-values/case05.out b/testdata/language-features/basic-values/case05.out
index 52e0011c..ec82a845 100644
--- a/testdata/language-features/basic-values/case05.out
+++ b/testdata/language-features/basic-values/case05.out
@@ -2,7 +2,5 @@ main is not found
 tooltips:
 testdata/language-features/basic-values/case05.lc 2:8-2:11  V0
 testdata/language-features/basic-values/case05.lc 2:8-2:11  'Char
-testdata/language-features/basic-values/case05.lc 2:3-2:4  'Ordering
-testdata/language-features/basic-values/case05.lc 2:3-2:4  'Int
 testdata/language-features/basic-values/case05.lc 1:16-1:17  'Int
 testdata/language-features/basic-values/case05.lc 1:16-1:17  V1
diff --git a/testdata/language-features/basic-values/case06.out b/testdata/language-features/basic-values/case06.out
index bea9e236..960169e6 100644
--- a/testdata/language-features/basic-values/case06.out
+++ b/testdata/language-features/basic-values/case06.out
@@ -3,7 +3,5 @@ tooltips:
 testdata/language-features/basic-values/case06.lc 3:8-3:11  V0
 testdata/language-features/basic-values/case06.lc 3:8-3:11  'Char
 testdata/language-features/basic-values/case06.lc 2:8-2:11  'Char
-testdata/language-features/basic-values/case06.lc 2:3-2:4  'Ordering
-testdata/language-features/basic-values/case06.lc 2:3-2:4  'Int
 testdata/language-features/basic-values/case06.lc 1:16-1:17  'Int
 testdata/language-features/basic-values/case06.lc 1:16-1:17  V1
diff --git a/testdata/language-features/basic-values/data01.out b/testdata/language-features/basic-values/data01.out
index 3507b1ab..d40b4d12 100644
--- a/testdata/language-features/basic-values/data01.out
+++ b/testdata/language-features/basic-values/data01.out
@@ -4,20 +4,28 @@ testdata/language-features/basic-values/data01.lc 1:6-1:7  Type
 testdata/language-features/basic-values/data01.lc 1:8-1:9  'A
 testdata/language-features/basic-values/data01.lc 1:10-1:11  'A
 testdata/language-features/basic-values/data01.lc 1:12-1:13  'A
+testdata/language-features/basic-values/data01.lc 1:6-1:13  Type->Type
 testdata/language-features/basic-values/data01.lc 1:6-1:13  Type
+testdata/language-features/basic-values/data01.lc 1:6-1:7  Type->Type
 testdata/language-features/basic-values/data01.lc 3:6-3:7  Type
 testdata/language-features/basic-values/data01.lc 3:10-3:11  'E
 testdata/language-features/basic-values/data01.lc 3:16-3:18  Type
+testdata/language-features/basic-values/data01.lc 3:6-3:7  Type->Type
 testdata/language-features/basic-values/data01.lc 3:14-3:15  'Tuple0->'E
 testdata/language-features/basic-values/data01.lc 3:21-3:22  'E
+testdata/language-features/basic-values/data01.lc 3:6-3:22  Type->Type
 testdata/language-features/basic-values/data01.lc 3:6-3:22  Type
+testdata/language-features/basic-values/data01.lc 3:14-3:15  Type->Type
 testdata/language-features/basic-values/data01.lc 3:14-3:15  Type
 testdata/language-features/basic-values/data01.lc 3:14-3:15  'E
 testdata/language-features/basic-values/data01.lc 5:6-5:8  Type
 testdata/language-features/basic-values/data01.lc 5:9-5:11  'D1
 testdata/language-features/basic-values/data01.lc 6:7-6:9  Type
+testdata/language-features/basic-values/data01.lc 5:6-5:8  Type->Type
 testdata/language-features/basic-values/data01.lc 6:5-6:7  'Tuple0->'D1
 testdata/language-features/basic-values/data01.lc 6:11-6:13  'D1
+testdata/language-features/basic-values/data01.lc 5:6-6:13  Type->Type
 testdata/language-features/basic-values/data01.lc 5:6-6:13  Type
+testdata/language-features/basic-values/data01.lc 6:5-6:7  Type->Type
 testdata/language-features/basic-values/data01.lc 6:5-6:7  Type
 testdata/language-features/basic-values/data01.lc 6:5-6:7  'D1
diff --git a/testdata/language-features/basic-values/def01.out b/testdata/language-features/basic-values/def01.out
index 2c8e63e9..11eb7345 100644
--- a/testdata/language-features/basic-values/def01.out
+++ b/testdata/language-features/basic-values/def01.out
@@ -1,7 +1,6 @@
 main is not found
 tooltips:
 testdata/language-features/basic-values/def01.lc 1:8-1:10  'Tuple0
-testdata/language-features/basic-values/def01.lc 3:10-3:11  'Int
 testdata/language-features/basic-values/def01.lc 3:1-3:5  {a} -> {b} -> {c : 'Num b} -> a->b
 testdata/language-features/basic-values/def01.lc 5:18-5:21  'Char
 testdata/language-features/basic-values/def01.lc 5:1-5:5  {a} -> {b} -> {c} -> {d} -> {e} -> a -> b -> c -> d -> e->'Char
diff --git a/testdata/language-features/basic-values/def03.out b/testdata/language-features/basic-values/def03.out
index c9c7e884..e0762a2e 100644
--- a/testdata/language-features/basic-values/def03.out
+++ b/testdata/language-features/basic-values/def03.out
@@ -1,11 +1,5 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/def03.lc 2:5-2:12  V0
 testdata/language-features/basic-values/def03.lc 2:9-2:12  V0
 testdata/language-features/basic-values/def03.lc 2:9-2:12  'Char
-testdata/language-features/basic-values/def03.lc 2:5-2:6  'Ordering
-testdata/language-features/basic-values/def03.lc 2:5-2:6  'Int
 testdata/language-features/basic-values/def03.lc 1:9-1:12  'Char
-testdata/language-features/basic-values/def03.lc 2:5-2:12  'Char
-testdata/language-features/basic-values/def03.lc 1:5-1:6  'Ordering
-testdata/language-features/basic-values/def03.lc 1:5-1:6  'Int
diff --git a/testdata/language-features/basic-values/def04.out b/testdata/language-features/basic-values/def04.out
index 82c1e71f..dfa8ca20 100644
--- a/testdata/language-features/basic-values/def04.out
+++ b/testdata/language-features/basic-values/def04.out
@@ -1,23 +1,15 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/def04.lc 2:5-3:12  V0
+testdata/language-features/basic-values/def04.lc 2:9-3:12  V0
 testdata/language-features/basic-values/def04.lc 3:9-3:12  V0
 testdata/language-features/basic-values/def04.lc 3:9-3:12  'Char
 testdata/language-features/basic-values/def04.lc 2:9-2:12  'Char
-testdata/language-features/basic-values/def04.lc 2:5-2:6  'Ordering
-testdata/language-features/basic-values/def04.lc 2:5-2:6  'Int
 testdata/language-features/basic-values/def04.lc 1:9-1:12  'Char
-testdata/language-features/basic-values/def04.lc 2:5-3:12  'Char
-testdata/language-features/basic-values/def04.lc 1:5-1:6  'Ordering
-testdata/language-features/basic-values/def04.lc 1:5-1:6  'Int
-testdata/language-features/basic-values/def04.lc 6:6-7:15  V0
+testdata/language-features/basic-values/def04.lc 2:9-3:12  'Char
+testdata/language-features/basic-values/def04.lc 6:12-7:15  V0
 testdata/language-features/basic-values/def04.lc 7:12-7:15  V0
 testdata/language-features/basic-values/def04.lc 7:12-7:15  'Char
 testdata/language-features/basic-values/def04.lc 6:12-6:15  'Char
-testdata/language-features/basic-values/def04.lc 6:6-6:7  'Ordering
-testdata/language-features/basic-values/def04.lc 6:6-6:7  'Int
 testdata/language-features/basic-values/def04.lc 5:12-5:15  'Char
-testdata/language-features/basic-values/def04.lc 6:6-7:15  'Char
-testdata/language-features/basic-values/def04.lc 5:6-5:7  'Ordering
-testdata/language-features/basic-values/def04.lc 5:6-5:7  'Int
+testdata/language-features/basic-values/def04.lc 6:12-7:15  'Char
 testdata/language-features/basic-values/def04.lc 5:1-5:5  {a} -> 'Int -> a->'Char
diff --git a/testdata/language-features/basic-values/if01.out b/testdata/language-features/basic-values/if01.out
index 62dac8a7..08a158e4 100644
--- a/testdata/language-features/basic-values/if01.out
+++ b/testdata/language-features/basic-values/if01.out
@@ -1,11 +1,9 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/if01.lc 1:10-1:33  {a} -> 'Bool -> a -> a->a
 testdata/language-features/basic-values/if01.lc 1:13-1:17  'Bool
 testdata/language-features/basic-values/if01.lc 1:23-1:25  V0
 testdata/language-features/basic-values/if01.lc 1:23-1:25  'Tuple0
 testdata/language-features/basic-values/if01.lc 1:31-1:33  'Tuple0
-testdata/language-features/basic-values/if01.lc 2:10-2:36  {a} -> 'Bool -> a -> a->a
 testdata/language-features/basic-values/if01.lc 2:13-2:18  'Bool
 testdata/language-features/basic-values/if01.lc 2:24-2:27  V0
 testdata/language-features/basic-values/if01.lc 2:24-2:27  'Float
diff --git a/testdata/language-features/basic-values/let01.out b/testdata/language-features/basic-values/let01.out
index 62cc7cc6..75c68ac3 100644
--- a/testdata/language-features/basic-values/let01.out
+++ b/testdata/language-features/basic-values/let01.out
@@ -1,18 +1,7 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/let01.lc 1:18-1:19  'Int
-testdata/language-features/basic-values/let01.lc 1:23-1:24  'Int
-testdata/language-features/basic-values/let01.lc 4:11-4:12  'Int
-testdata/language-features/basic-values/let01.lc 5:6-5:7  'Int
 testdata/language-features/basic-values/let01.lc 3:1-3:7  {a} -> {b : 'Num a}->a
-testdata/language-features/basic-values/let01.lc 8:11-8:12  'Int
 testdata/language-features/basic-values/let01.lc 9:11-9:14  'Char
-testdata/language-features/basic-values/let01.lc 10:6-10:7  'Int
 testdata/language-features/basic-values/let01.lc 7:1-7:7  {a} -> {b : 'Num a}->a
-testdata/language-features/basic-values/let01.lc 12:18-12:19  'Int
-testdata/language-features/basic-values/let01.lc 13:13-13:14  'Int
 testdata/language-features/basic-values/let01.lc 12:1-12:7  {a} -> {b : 'Num a}->a
-testdata/language-features/basic-values/let01.lc 15:18-15:19  'Int
-testdata/language-features/basic-values/let01.lc 16:18-16:19  'Int
-testdata/language-features/basic-values/let01.lc 17:13-17:14  'Int
 testdata/language-features/basic-values/let01.lc 15:1-15:7  {a} -> {b : 'Num a}->a
diff --git a/testdata/language-features/basic-values/let02.out b/testdata/language-features/basic-values/let02.out
index e8705d07..7d0cffd0 100644
--- a/testdata/language-features/basic-values/let02.out
+++ b/testdata/language-features/basic-values/let02.out
@@ -4,7 +4,6 @@ testdata/language-features/basic-values/let02.lc 2:11-2:13  'Tuple0
 testdata/language-features/basic-values/let02.lc 3:19-3:22  'Char
 testdata/language-features/basic-values/let02.lc 3:26-3:28  'Tuple0
 testdata/language-features/basic-values/let02.lc 5:17-5:19  'Tuple0
-testdata/language-features/basic-values/let02.lc 6:17-6:18  'Int
 testdata/language-features/basic-values/let02.lc 7:17-7:24  'String
 testdata/language-features/basic-values/let02.lc 8:12-8:15  'Char
 testdata/language-features/basic-values/let02.lc 9:6-9:8  'Tuple0
diff --git a/testdata/language-features/basic-values/literal01.out b/testdata/language-features/basic-values/literal01.out
index 41914ca9..f143d3fa 100644
--- a/testdata/language-features/basic-values/literal01.out
+++ b/testdata/language-features/basic-values/literal01.out
@@ -1,9 +1,6 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/literal01.lc 1:13-1:14  'Int
-testdata/language-features/basic-values/literal01.lc 2:13-2:14  'Int
 testdata/language-features/basic-values/literal01.lc 2:1-2:10  {a} -> {b : 'Num a}->a
-testdata/language-features/basic-values/literal01.lc 3:13-3:18  'Int
 testdata/language-features/basic-values/literal01.lc 3:1-3:10  {a} -> {b : 'Num a}->a
 testdata/language-features/basic-values/literal01.lc 5:15-5:18  'Float
 testdata/language-features/basic-values/literal01.lc 5:1-5:12  'Float
diff --git a/testdata/language-features/basic-values/shadowing01.out b/testdata/language-features/basic-values/shadowing01.out
index 05a37de9..41975630 100644
--- a/testdata/language-features/basic-values/shadowing01.out
+++ b/testdata/language-features/basic-values/shadowing01.out
@@ -2,7 +2,6 @@ main is not found
 tooltips:
 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  'Int
 testdata/language-features/basic-values/shadowing01.lc 6:17-6:21  'Float
 testdata/language-features/basic-values/shadowing01.lc 7:25-7:27  'Tuple0
 testdata/language-features/basic-values/shadowing01.lc 8:25-8:28  'Char
diff --git a/testdata/language-features/basic-values/shadowing02.out b/testdata/language-features/basic-values/shadowing02.out
index 71b65252..1f0e36dd 100644
--- a/testdata/language-features/basic-values/shadowing02.out
+++ b/testdata/language-features/basic-values/shadowing02.out
@@ -1,12 +1,9 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/shadowing02.lc 1:5-1:6  'Int
 testdata/language-features/basic-values/shadowing02.lc 2:9-2:16  'String
 testdata/language-features/basic-values/shadowing02.lc 2:1-2:6  'String
 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  'Int
-testdata/language-features/basic-values/shadowing02.lc 8:17-8:18  'Int
 testdata/language-features/basic-values/shadowing02.lc 9:17-9:21  'Float
 testdata/language-features/basic-values/shadowing02.lc 10:25-10:27  'Tuple0
 testdata/language-features/basic-values/shadowing02.lc 11:25-11:28  'Char
diff --git a/testdata/language-features/basic-values/tuple02.out b/testdata/language-features/basic-values/tuple02.out
index d3753729..4e32ee63 100644
--- a/testdata/language-features/basic-values/tuple02.out
+++ b/testdata/language-features/basic-values/tuple02.out
@@ -1,8 +1,6 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/tuple02.lc 1:10-1:33  {a} -> {b} -> {c} -> {d} -> {e} -> a -> b -> c -> d -> e -> 'Tuple5 a b c d e
 testdata/language-features/basic-values/tuple02.lc 1:11-1:12  V4
-testdata/language-features/basic-values/tuple02.lc 1:11-1:12  'Int
 testdata/language-features/basic-values/tuple02.lc 1:13-1:16  V4
 testdata/language-features/basic-values/tuple02.lc 1:13-1:16  'Float
 testdata/language-features/basic-values/tuple02.lc 1:17-1:20  V3
@@ -11,15 +9,12 @@ testdata/language-features/basic-values/tuple02.lc 1:21-1:29  V2
 testdata/language-features/basic-values/tuple02.lc 1:21-1:29  'String
 testdata/language-features/basic-values/tuple02.lc 1:30-1:32  V1
 testdata/language-features/basic-values/tuple02.lc 1:30-1:32  'Tuple0
-testdata/language-features/basic-values/tuple02.lc 3:10-3:17  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/language-features/basic-values/tuple02.lc 3:11-3:13  V1
 testdata/language-features/basic-values/tuple02.lc 3:11-3:13  'Tuple0
 testdata/language-features/basic-values/tuple02.lc 3:14-3:16  V0
 testdata/language-features/basic-values/tuple02.lc 3:14-3:16  'Tuple0
 testdata/language-features/basic-values/tuple02.lc 3:1-3:7  'Tuple2 'Tuple0 'Tuple0
-testdata/language-features/basic-values/tuple02.lc 5:10-5:27  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/language-features/basic-values/tuple02.lc 5:11-5:23  V1
-testdata/language-features/basic-values/tuple02.lc 5:11-5:23  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/language-features/basic-values/tuple02.lc 5:12-5:18  V1
 testdata/language-features/basic-values/tuple02.lc 5:12-5:18  'String
 testdata/language-features/basic-values/tuple02.lc 5:19-5:22  V0
diff --git a/testdata/language-features/basic-values/typesig03.out b/testdata/language-features/basic-values/typesig03.out
index 0b1228aa..61eab91b 100644
--- a/testdata/language-features/basic-values/typesig03.out
+++ b/testdata/language-features/basic-values/typesig03.out
@@ -1,11 +1,15 @@
 main is not found
 tooltips:
 testdata/language-features/basic-values/typesig03.lc 1:9-1:26  Type
+testdata/language-features/basic-values/typesig03.lc 1:9-1:26  Type->Type
 testdata/language-features/basic-values/typesig03.lc 1:9-1:10  V5
+testdata/language-features/basic-values/typesig03.lc 1:14-1:26  Type->Type
 testdata/language-features/basic-values/typesig03.lc 1:14-1:26  Type
 testdata/language-features/basic-values/typesig03.lc 1:14-1:15  V4
+testdata/language-features/basic-values/typesig03.lc 1:19-1:26  Type->Type
 testdata/language-features/basic-values/typesig03.lc 1:19-1:26  Type
 testdata/language-features/basic-values/typesig03.lc 1:19-1:20  V3
+testdata/language-features/basic-values/typesig03.lc 1:24-1:26  Type->Type
 testdata/language-features/basic-values/typesig03.lc 1:24-1:26  Type
 testdata/language-features/basic-values/typesig03.lc 2:14-2:16  {a} -> {b} -> {c} -> a -> b -> c->'Tuple0
 testdata/language-features/basic-values/typesig03.lc 2:14-2:16  {a} -> {b} -> V2 -> a -> b->'Tuple0
@@ -16,11 +20,15 @@ testdata/language-features/basic-values/typesig03.lc 2:14-2:16  V2->'Tuple0
 testdata/language-features/basic-values/typesig03.lc 2:14-2:16  'Tuple0
 testdata/language-features/basic-values/typesig03.lc 2:1-2:5  {a} -> {b} -> {c} -> a -> b -> c->'Tuple0
 testdata/language-features/basic-values/typesig03.lc 4:7-4:18  Type
+testdata/language-features/basic-values/typesig03.lc 4:7-4:18  Type->Type
 testdata/language-features/basic-values/typesig03.lc 4:7-4:8  V5
+testdata/language-features/basic-values/typesig03.lc 4:10-4:18  Type->Type
 testdata/language-features/basic-values/typesig03.lc 4:10-4:18  Type
 testdata/language-features/basic-values/typesig03.lc 4:10-4:11  V4
+testdata/language-features/basic-values/typesig03.lc 4:13-4:18  Type->Type
 testdata/language-features/basic-values/typesig03.lc 4:13-4:18  Type
 testdata/language-features/basic-values/typesig03.lc 4:13-4:14  V3
+testdata/language-features/basic-values/typesig03.lc 4:16-4:18  Type->Type
 testdata/language-features/basic-values/typesig03.lc 4:16-4:18  Type
 testdata/language-features/basic-values/typesig03.lc 5:14-5:16  {a} -> {b} -> {c} -> a -> b -> c->'Tuple0
 testdata/language-features/basic-values/typesig03.lc 5:14-5:16  {a} -> {b} -> V2 -> a -> b->'Tuple0
diff --git a/testdata/letIndent.out b/testdata/letIndent.out
index f99ad84d..f70a4982 100644
--- a/testdata/letIndent.out
+++ b/testdata/letIndent.out
@@ -1,6 +1,4 @@
 main is not found
 tooltips:
-testdata/letIndent.lc 3:10-3:11  'Int
-testdata/letIndent.lc 4:10-4:11  'Int
 testdata/letIndent.lc 5:7-5:8  V3
 testdata/letIndent.lc 2:1-2:4  {a} -> a->a
diff --git a/testdata/traceTest.out b/testdata/traceTest.out
index 16b64fc4..7c284a8e 100644
--- a/testdata/traceTest.out
+++ b/testdata/traceTest.out
@@ -2,14 +2,16 @@ main is not found
 tooltips:
 testdata/traceTest.lc 6:8-6:9  V1
 testdata/traceTest.lc 6:1-6:3  {a} -> a->a
+testdata/traceTest.lc 8:17-8:18  Type->Type
 testdata/traceTest.lc 8:17-8:18  Type
 testdata/traceTest.lc 8:6-8:7  {a} -> a->Type
+testdata/traceTest.lc 8:6-8:18  Type->Type
 testdata/traceTest.lc 8:6-8:18  Type
+testdata/traceTest.lc 8:6-8:7  Type->Type
 testdata/traceTest.lc 8:6-8:7  Type
-testdata/traceTest.lc 10:6-10:24  Type
+testdata/traceTest.lc 10:6-10:25  Type
 testdata/traceTest.lc 10:6-10:7  {a} -> a->Type
-testdata/traceTest.lc 10:9-10:24  V0
-testdata/traceTest.lc 10:18-10:24  Type -> Type->Type
+testdata/traceTest.lc 10:8-10:25  V0
 testdata/traceTest.lc 10:19-10:20  Type
 testdata/traceTest.lc 10:19-10:20  V3
 testdata/traceTest.lc 10:22-10:23  Type
diff --git a/testdata/typeclass.out b/testdata/typeclass.out
index d4817d5c..d2575528 100644
--- a/testdata/typeclass.out
+++ b/testdata/typeclass.out
@@ -3,13 +3,16 @@ tooltips:
 testdata/typeclass.lc 4:6-4:10  Type->Type
 testdata/typeclass.lc 4:6-4:10  Type
 testdata/typeclass.lc 4:15-4:18  {a} -> 'List a
-testdata/typeclass.lc 4:6-4:35  Type
+testdata/typeclass.lc 4:6-4:36  Type->Type
+testdata/typeclass.lc 4:6-4:36  Type
 testdata/typeclass.lc 4:26-4:27  Type
 testdata/typeclass.lc 4:29-4:33  Type->Type
 testdata/typeclass.lc 4:34-4:35  Type
 testdata/typeclass.lc 4:21-4:25  {a} -> a -> 'List a -> 'List a
+testdata/typeclass.lc 4:6-4:25  Type->Type
 testdata/typeclass.lc 4:6-4:25  Type
 testdata/typeclass.lc 4:15-4:18  'List V1
+testdata/typeclass.lc 4:21-4:25  Type->Type
 testdata/typeclass.lc 4:21-4:25  Type
 testdata/typeclass.lc 4:21-4:25  'List V4
 testdata/typeclass.lc 11:13-11:17  V0
@@ -32,30 +35,29 @@ testdata/typeclass.lc 17:13-17:17  'Bool
 testdata/typeclass.lc 16:1-16:6  'Bool
 testdata/typeclass.lc 16:1-16:6  V2
 testdata/typeclass.lc 16:7-16:9  'Bool -> 'Bool->'Bool
-testdata/typeclass.lc 19:7-19:9  {a} -> a->a -> a
-testdata/typeclass.lc 24:10-28:23  V0->V1
-testdata/typeclass.lc 24:10-28:23  V1
-testdata/typeclass.lc 24:10-28:23  Type->Type
-testdata/typeclass.lc 24:10-28:23  Type
-testdata/typeclass.lc 24:10-24:12  Type
+testdata/typeclass.lc 24:13-28:23  V0->V1
+testdata/typeclass.lc 24:13-28:23  V1
+testdata/typeclass.lc 24:13-28:23  Type->Type
+testdata/typeclass.lc 24:13-28:23  Type
 testdata/typeclass.lc 24:13-24:17  Type
 testdata/typeclass.lc 28:10-28:23  Type
-testdata/typeclass.lc 28:10-28:20  Type->Type
-testdata/typeclass.lc 28:10-28:20  Type
+testdata/typeclass.lc 28:10-28:14  Type->Type
 testdata/typeclass.lc 28:10-28:14  Type
 testdata/typeclass.lc 28:10-28:12  Type->Type
 testdata/typeclass.lc 28:13-28:14  Type
-testdata/typeclass.lc 28:18-28:20  Type
 testdata/typeclass.lc 28:22-28:23  Type
 testdata/typeclass.lc 19:7-19:9  Type->Type
-testdata/typeclass.lc 20:5-20:9  {a} -> a->a -> a
 testdata/typeclass.lc 19:7-32:25  V0->V1
 testdata/typeclass.lc 19:7-32:25  V1
 testdata/typeclass.lc 19:7-20:27  Type
+testdata/typeclass.lc 19:7-20:27  Type->Type
+testdata/typeclass.lc 20:13-20:27  Type->Type
 testdata/typeclass.lc 20:13-20:27  Type
 testdata/typeclass.lc 20:13-20:14  Type
+testdata/typeclass.lc 20:18-20:27  Type->Type
 testdata/typeclass.lc 20:18-20:27  Type
 testdata/typeclass.lc 20:18-20:19  Type
+testdata/typeclass.lc 20:23-20:27  Type->Type
 testdata/typeclass.lc 20:23-20:27  Type
 testdata/typeclass.lc 24:13-32:25  {a} -> {b : 'Eq a} -> a -> a->'Bool
 testdata/typeclass.lc 24:13-32:25  {a : 'Eq V0} -> V1 -> V2->'Bool
@@ -96,7 +98,7 @@ testdata/typeclass.lc 30:18-30:22  'List V3
 testdata/typeclass.lc 30:18-30:22  'List V7
 testdata/typeclass.lc 20:5-20:9  {a} -> {b : 'Eq a} -> a -> a->'Bool
 testdata/typeclass.lc 22:10-22:13  'Bool->'Bool
-testdata/typeclass.lc 22:15-22:21  'Bool
+testdata/typeclass.lc 22:14-22:22  'Bool
 testdata/typeclass.lc 22:17-22:19  {a} -> {b : 'Eq a} -> a -> a->'Bool
 testdata/typeclass.lc 22:15-22:16  V1
 testdata/typeclass.lc 22:15-22:16  V5
diff --git a/testdata/zip01.out b/testdata/zip01.out
index 0995aa5c..9173f6c8 100644
--- a/testdata/zip01.out
+++ b/testdata/zip01.out
@@ -1,30 +1,37 @@
 main is not found
 tooltips:
-testdata/zip01.lc 2:1-2:5  {a} -> a->a -> a
 testdata/zip01.lc 1:9-4:40  V0->V1
 testdata/zip01.lc 1:9-4:40  V1
 testdata/zip01.lc 1:9-1:30  Type
+testdata/zip01.lc 1:9-1:30  Type->Type
 testdata/zip01.lc 1:10-1:11  Type
 testdata/zip01.lc 1:10-1:11  V3
+testdata/zip01.lc 1:16-1:30  Type->Type
 testdata/zip01.lc 1:16-1:30  Type
 testdata/zip01.lc 1:17-1:18  Type
 testdata/zip01.lc 1:17-1:18  V2
+testdata/zip01.lc 1:23-1:30  Type->Type
 testdata/zip01.lc 1:23-1:30  Type
 testdata/zip01.lc 1:24-1:29  Type
-testdata/zip01.lc 1:24-1:29  Type -> Type->Type
 testdata/zip01.lc 1:25-1:26  Type
 testdata/zip01.lc 1:27-1:28  Type
-testdata/zip01.lc 4:22-4:40  {a} -> {b} -> 'List a -> 'List b -> 'List ('Tuple2 a b)
-testdata/zip01.lc 4:22-4:40  {a} -> 'List V1 -> 'List a -> 'List ('Tuple2 V3 a)
-testdata/zip01.lc 4:22-4:40  'List V1 -> 'List V1 -> 'List ('Tuple2 V3 V2)
-testdata/zip01.lc 4:22-4:40  'List V1 -> 'List ('Tuple2 V3 V2)
-testdata/zip01.lc 4:22-4:40  'List ('Tuple2 V3 V2)
+testdata/zip01.lc 2:22-4:40  {a} -> {b} -> 'List a -> 'List b -> 'List ('Tuple2 a b)
+testdata/zip01.lc 2:22-4:40  {a} -> 'List V1 -> 'List a -> 'List ('Tuple2 V3 a)
+testdata/zip01.lc 2:22-4:40  'List V1 -> 'List V1 -> 'List ('Tuple2 V3 V2)
+testdata/zip01.lc 2:22-4:40  'List V1 -> 'List ('Tuple2 V3 V2)
+testdata/zip01.lc 2:22-4:40  'List ('Tuple2 V3 V2)
+testdata/zip01.lc 2:22-2:24  V0
+testdata/zip01.lc 2:22-2:24  {a} -> 'List a
+testdata/zip01.lc 3:22-4:40  V1 -> 'List V2 -> 'List V2
+testdata/zip01.lc 3:22-4:40  'List V2 -> 'List V2
+testdata/zip01.lc 3:22-4:40  'List V2
+testdata/zip01.lc 3:22-3:24  V0
+testdata/zip01.lc 3:22-3:24  {a} -> 'List a
 testdata/zip01.lc 4:22-4:40  V1 -> 'List V2 -> 'List V2
 testdata/zip01.lc 4:22-4:40  'List V2 -> 'List V2
 testdata/zip01.lc 4:22-4:40  'List V2
 testdata/zip01.lc 4:28-4:29  {a} -> a -> 'List a -> 'List a
 testdata/zip01.lc 4:22-4:27  V0
-testdata/zip01.lc 4:22-4:27  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/zip01.lc 4:23-4:24  V1
 testdata/zip01.lc 4:23-4:24  V10
 testdata/zip01.lc 4:25-4:26  V0