9 files changed, 107 insertions, 314 deletions
diff --git a/src/LambdaCube/Compiler/Parser.hs b/src/LambdaCube/Compiler/Parser.hs
index 917af44b..ef410eaf 100644
--- a/src/LambdaCube/Compiler/Parser.hs
+++ b/src/LambdaCube/Compiler/Parser.hs
@@ -272,6 +272,12 @@ rUp n l = rearrange l $ \k -> if k >= 0 then k + n else k
 instance Rearrange a => Rearrange [a] where
    rearrange l f = map $ rearrange l f
+instance (Rearrange a, Rearrange b) => Rearrange (Either a b) where
+    rearrange l f = rearrange l f +++ rearrange l f
+instance (Rearrange a, Rearrange b) => Rearrange (a, b) where
+    rearrange l f = rearrange l f *** rearrange l f
 instance Rearrange SExp where
    rearrange i f = mapS (\_ -> elimVoid) (const . SGlobal) (\sn j i -> SVar sn $ if j < i then j else i + f (j - i)) i
@@ -498,7 +504,7 @@ parseTerm_ ge = \case
        exp <- parseTerm PrecLam
        return $ \e ->
                 SBuiltin "concatMap"
-         `SAppV` SLamV (compileGuardTree id id ge $ compilePatts [(pat, 0)] (Right $ deBruijnify dbs e) `mappend` In (GuardLeaf BNil))
+         `SAppV` SLamV (compileGuardTree id id ge $ compilePatts [pat] (Right $ deBruijnify dbs e) `mappend` In (GuardLeaf BNil))
         `SAppV` exp
    letdecl = mkLets ge <$ reserved "let" <*> (compileFunAlts' =<< valueDef)
@@ -528,7 +534,7 @@ getList (BCons x (getList -> Just y)) = Just (x:y)
 getList _ = Nothing
 patLam :: (SExp -> SExp) -> DesugarInfo -> (Visibility, SExp) -> Pat -> SExp -> SExp
-patLam f ge (v, t) p e = SLam v t $ compileGuardTree f f ge $ compilePatts [(p, 0)] $ Right e
+patLam f ge (v, t) p e = SLam v t $ compileGuardTree f f ge $ compilePatts [p] $ Right e
 -------------------------------------------------------------------------------- pattern representation
@@ -543,7 +549,7 @@ data Pat
 newtype ParPat = ParPat [Pat]
  deriving Show
-pattern PWildcard si = PVar (si, "")
+pattern PWildcard = ParPat []
 pattern PCon n pp <- PCon_ _ n pp
  where PCon n pp =  PCon_ (fst n <> sourceInfo pp) n pp
 pattern ViewPat e pp <- ViewPat_ _ e pp
@@ -620,7 +626,7 @@ instance SetSourceInfo Pat where
 parsePat p = appRange $ flip setSI <$> parsePat_ p
-parsePat_ :: Prec -> BodyParser Pat
+parsePat_ :: Prec -> BodyParser Pat -- TODO: ParPat
 parsePat_ = \case
    PrecAnn ->
        patType <$> parsePat PrecOp <*> parseType (Just $ Wildcard SType)
@@ -637,7 +643,7 @@ parsePat_ = \case
    PrecAtom ->
         mkLit <$> asks namespace <*> try "literal" parseLit
     <|> flip PCon [] <$> upperCase_
-     <|> PVar <$> patVar
+     <|> PVar <$> patVar        -- TODO: PWildcard
     <|> char '\'' *> ppa switchNamespace
     <|> ppa id
  where
@@ -657,7 +663,6 @@ parsePat_ = \case
    mkListPat ns ps      = foldr (\p ps -> PBuiltin "Cons" [p, ps]) (PBuiltin "Nil" []) ps
    --mkTupPat :: [Pat] -> Pat
-    -- TODO: tup type pattern in type namespace
    mkTupPat TypeNS [PParens x] = mkTTup [x]
    mkTupPat ns     [PParens x] = mkTup [x]
    mkTupPat _      [x]         = PParens x
@@ -713,10 +718,9 @@ instance Rearrange a => Rearrange (Lets a) where
 -- TODO: support type signature?
 data GuardTree
-    = GuardNode SExp SName{-TODO:SIName-} [ParPat] GuardTrees GuardTrees
+    = GuardNode SExp SName{-TODO:SIName-} [SIName] GuardTrees GuardTrees
    | GuardLeaf SExp
    | GTError
--    | GuardLet SExp GuardTree
  deriving Show
 type GuardTrees = Lets GuardTree
@@ -730,8 +734,7 @@ instance Monoid GuardTrees where
 mapGT :: (Int -> ParPat -> ParPat) -> (Int -> SExp -> SExp) -> Int -> GuardTree -> GuardTree
 mapGT f h k = \case
-    GuardNode e c pps gt el -> GuardNode (h k e) c (upPats f k pps) (mapGTs f h (k + patVars pps) gt) (mapGTs f h k el)
+    GuardNode e c pps gt el -> GuardNode (h k e) c pps (mapGTs f h (k + length pps) gt) (mapGTs f h k el)
--    GuardLet e gt -> GuardLet (h k e) $ mapGT f h (k + 1) gt
    GuardLeaf e -> GuardLeaf $ h k e
    GTError -> GTError
@@ -740,38 +743,32 @@ mapGTs f h = mapLets h (mapGT f h)
 instance Rearrange GuardTree where
    rearrange l f = mapGT (`rearrange` f) (`rearrange` f) l
-- todo: clenup
+guardNode :: Pat -> SExp -> GuardTrees -> GuardTrees
-compilePatts :: [(Pat, Int)] -> Either [(SExp, SExp)] SExp -> GuardTrees
+guardNode (PVar sn) e gt = lLet e gt
-compilePatts ps gu = cp [] ps
+guardNode (PParens p) e gt = guardNode p e gt
+guardNode (ViewPat f p) e gt = guardNode' p (f `SAppV` e) gt
+guardNode (PCon sn ps) e gt = In $ GuardNode e (snd sn) ((\(v, _, _) -> v) <$> ws) gt' mempty
  where
-    cp ps' [] = rearrange 0 (f $ reverse ps') $ case gu of
+    n = length ps
-        Right e -> In $ GuardLeaf e
+    ws = [(ns, SVar ns (n-1-i+d), rUp n d p) | (i, p, d) <- zip3 [0..] ps $ sums $ map patVars ps, let ns = dummyName $ "gn" ++ show i] 
-        Left gs -> mconcat [In $ GuardNode ge "True" [] (In $ GuardLeaf e) mempty | (ge, e) <- gs]
+    gt' = foldr f (rUp n (patVars ps) gt) ws
-    cp ps' ((p@PVar{}, i): xs) = cp (p: ps') xs
+    f (v, e, p) gt = guardNode' p e gt
-    cp ps' ((p@(PCon (si, n) ps), i): xs) = In $ GuardNode (SVar (si, n) $ i + sum (map (fromMaybe 0 . ff) ps')) n ps (cp (p: ps') xs) mempty
-    cp ps' ((PParens p, i): xs) = cp ps' ((p, i): xs)
+guardNode' (ParPat ps) e gt = case ps of
-    cp ps' ((p@(ViewPatSimp f (PCon (si, n) ps)), i): xs)
+    [] -> gt
-        = In $ GuardNode (SAppV f $ SVar (si, n) $ i + sum (map (fromMaybe 0 . ff) ps')) n ps (cp (p: ps') xs) mempty
+    [p] -> guardNode p e gt
-    cp _ p = error $ "cp: " ++ show p
+    -- TODO: ps
-    m = length ps
+sums = scanl (+) 0
-    ff PVar{} = Nothing
-    ff p = Just $ patVars p
-    f ps i
-        | i >= s = i - s + m + sum vs'
-        | i < s = case vs_ !! n of
-        Nothing -> m + sum vs' - 1 - n
-        Just _ -> m + sum vs' - 1 - (m + sum (take n vs') + j)
-      where
-        i' = s - 1 - i
-        (n, j) = concat (zipWith (\k j -> zip (repeat j) [0..k-1]) vs [0..]) !! i'
-        vs_ = map ff ps
+compilePatts :: [Pat] -> Either [(SExp, SExp)] SExp -> GuardTrees
-        vs = map (fromMaybe 1) vs_
+compilePatts ps gu = foldr f gu' $ zip3 ps [0..] $ sums $ map patVars ps
-        vs' = map (fromMaybe 0) vs_
+  where
-        s = sum vs
+    n = length ps
+    f (p, i, d) g = guardNode (rUp n d p) (sVar "xcp" $ n-1-i + d) g
+    gu' = case rUp n (patVars ps) gu of
+        Right e -> In $ GuardLeaf e
+        Left gs -> mconcat [guardNode (PBuiltin "True" []) ge (In $ GuardLeaf e) | (ge, e) <- gs]
 compileGuardTree :: (SExp -> SExp) -> (SExp -> SExp) -> DesugarInfo -> GuardTrees -> SExp
 compileGuardTree ulend lend adts = guardTreeToCases
@@ -794,46 +791,27 @@ compileGuardTree ulend lend adts = guardTreeToCases
    filterGuardTree' :: SExp -> SName{-constr.-} -> GuardTrees -> GuardTrees
    filterGuardTree' f s = \case
-        In (GuardNode f' s' ps gs el)
+        In (GuardNode f' s' ps gs (filterGuardTree' f s -> el))
-            | f /= f' || s /= s' -> In $ GuardNode f' s' ps (filterGuardTree' (up su f) s gs) (filterGuardTree' f s el)
+            | f /= f' || s /= s' -> In $ GuardNode f' s' ps (filterGuardTree' (up (length ps) f) s gs) el
-            | otherwise -> filterGuardTree' f s el
+            | otherwise -> el
-          where
-            su = patVars ps
        In x -> In x
    filterGuardTree :: SExp -> SName{-constr.-} -> Int -> Int{-number of constr. params-} -> GuardTrees -> GuardTrees
    filterGuardTree f s k ns = \case
-        In (GuardNode f' s' ps gs el)
+        In (GuardNode f' s' ps gs (filterGuardTree f s k ns -> el))
-            | f /= f'  -> In $ GuardNode f' s' ps (filterGuardTree (up su f) s (su + k) ns gs) el'
+            | f /= f'   -> In $ GuardNode f' s' ps (filterGuardTree (up su f) s (su + k) ns gs) el
-            | s == s'  -> filterGuardTree f s k ns $ guardNodes (zips [k+ns-1, k+ns-2..] ps) gs <> el'
+            | s == s'   -> filterGuardTree f s k ns $ foldr lLet gs (replicate su $ sVar "30" $ k+ns-1) <> el
-            | otherwise -> el'
+            | otherwise -> el
          where
-            el' = filterGuardTree f s k ns el
+            su = length ps
-            zips is ps = zip (map (sVar "30") $ zipWith (+) is $ sums $ map patVars ps) ps
-            su = patVars ps
-            sums = scanl (+) 0
        In x -> In x
-    guardNodes :: [(SExp, ParPat)] -> GuardTrees -> GuardTrees
-    guardNodes [] l = l
-    guardNodes ((v, ParPat ws): vs) e = guardNode' v ws $ guardNodes vs e
-    guardNode' :: SExp -> [Pat] -> GuardTrees -> GuardTrees
-    guardNode' v [] e = e
-    guardNode' v [w] e = case w of
-        PVar _ -> {-todo guardNode v (subst x v ws) $ -} varGuardNode 0 v e
-        PParens p -> guardNode' v [p] e
-        ViewPat f (ParPat p) -> guardNode' (f `SAppV` v) p {- -$ guardNode v ws -} e
-        PCon (_, s) ps' -> In $ GuardNode v s ps' {- -$ guardNode v ws -} e mempty
-    varGuardNode v (SVar _ e) = rSubst v e
 compileGuardTrees ulend adts = compileGuardTree ulend SRHS adts . mconcat
 compileGuardTrees' ge = foldr1 (SAppV2 $ SBuiltin "parEval" `SAppV` Wildcard SType) . map (compileGuardTrees id ge . (:[]))
 compileCase ge x cs
-    = SLamV (compileGuardTree id id ge $ mconcat [compilePatts [(p, 0)] e | (p, e) <- cs]) `SAppV` x
+    = SLamV (compileGuardTree id id ge $ mconcat [compilePatts [p] e | (p, e) <- cs]) `SAppV` x
 -------------------------------------------------------------------------------- declaration representation
@@ -1125,10 +1103,7 @@ compileFunAlts (compilegt :: DesugarInfo -> [GuardTrees] -> SExp) ds xs = dsInfo
          | otherwise -> return
            [ Let n
                (listToMaybe [t | TypeAnn n' t <- ds, n' == n])
-                $ foldr (uncurry SLam . fst) (compilegt ge
+                $ foldr (uncurry SLam . fst) (compilegt ge [compilePatts (map snd vs) gsx | FunAlt _ vs gsx <- fs]) vs
-                    [ compilePatts (zip (map snd vs) $ reverse [0.. num - 1]) gsx
-                    | FunAlt _ vs gsx <- fs
-                    ]) vs
            ]
        _ -> fail $ "different number of arguments of " ++ snd n ++ " at " ++ ppShow (fst n)
    x -> return x
diff --git a/testdata/Builtins.out b/testdata/Builtins.out
index 8898f2fc..5826eb89 100644
--- a/testdata/Builtins.out
+++ b/testdata/Builtins.out
@@ -453,13 +453,11 @@ testdata/Builtins.lc 19:35-19:43  Type
 testdata/Builtins.lc 19:40-19:41  Type
 testdata/Builtins.lc 19:42-19:43  Nat
 testdata/Builtins.lc 20:1-20:7  {a} -> {b} -> {c:Nat} -> a->b -> VecS a c -> VecS b c
-testdata/Builtins.lc 20:11-20:13  VecS V5 V3
-testdata/Builtins.lc 20:11-22:51  V2->V2 -> VecS V3 V1 -> VecS V3 V2 | VecS V3 V1 -> VecS V3 V2 | VecS V3 V2
 testdata/Builtins.lc 20:21-20:23  {a} -> a -> a -> VecS a 2
 testdata/Builtins.lc 20:21-20:29  V5 -> VecS V6 2
 testdata/Builtins.lc 20:21-20:35  V0 -> V1 -> VecS V6 2 | V1 -> VecS V6 2 | VecS V5 2
 testdata/Builtins.lc 20:21-21:43  (V4 -> V5 -> V6 -> V7 -> VecS V7 4) -> {f:Nat} -> VecS V6 f -> VecS V6 f
-testdata/Builtins.lc 20:21-22:51  {a:Nat} -> VecS V5 a -> VecS V5 a
+testdata/Builtins.lc 20:21-22:51  V2->V2 -> VecS V3 V1 -> VecS V3 V2 | VecS V3 V1 -> VecS V3 V2 | {a:Nat} -> VecS V5 a -> VecS V5 a
 testdata/Builtins.lc 20:25-20:26  V8->V8
 testdata/Builtins.lc 20:25-20:28  V5
 testdata/Builtins.lc 20:27-20:28  V2
@@ -777,29 +775,16 @@ testdata/Builtins.lc 41:75-41:84  Mat 4 4 Float -> Type
 testdata/Builtins.lc 41:77-41:78  V1
 testdata/Builtins.lc 41:79-41:84  Type
 testdata/Builtins.lc 44:5-44:21  Type->Type
-testdata/Builtins.lc 44:22-44:27  Type
-testdata/Builtins.lc 44:22-44:35  Type->Type
-testdata/Builtins.lc 44:22-48:37  Type | Type->Type
 testdata/Builtins.lc 44:30-44:35  Type
-testdata/Builtins.lc 45:22-45:26  Type
+testdata/Builtins.lc 44:30-48:37  Type | Type->Type
-testdata/Builtins.lc 45:22-45:33  Type->Type
-testdata/Builtins.lc 45:22-48:37  Type
 testdata/Builtins.lc 45:29-45:33  Type
-testdata/Builtins.lc 46:22-46:25  Type
+testdata/Builtins.lc 45:29-48:37  Type
-testdata/Builtins.lc 46:22-46:31  Type->Type
-testdata/Builtins.lc 46:22-48:37  Type
 testdata/Builtins.lc 46:28-46:31  Type
-testdata/Builtins.lc 47:23-47:27  Type
+testdata/Builtins.lc 46:28-48:37  Type
-testdata/Builtins.lc 47:23-47:36  Type->Type
-testdata/Builtins.lc 47:23-48:37  Type
 testdata/Builtins.lc 47:35-47:36  Nat->Type | Type | Type -> Nat->Type
-testdata/Builtins.lc 48:23-48:26  Type
+testdata/Builtins.lc 47:35-48:37  Type
-testdata/Builtins.lc 48:23-48:37  Type->Type
 testdata/Builtins.lc 48:36-48:37  Nat -> Nat -> Type->Type | Nat -> Type->Type | Type | Type->Type
 testdata/Builtins.lc 52:7-52:13  Type->Type
-testdata/Builtins.lc 54:25-54:28  Type
-testdata/Builtins.lc 54:25-55:30  Type | Type->Type
-testdata/Builtins.lc 55:25-55:30  Type
 testdata/Builtins.lc 57:7-57:16  Type->Type
 testdata/Builtins.lc 57:7-58:12  Type
 testdata/Builtins.lc 57:7-59:11  Type
@@ -807,38 +792,22 @@ testdata/Builtins.lc 58:3-58:7  {a} -> {b : Component a}->a
 testdata/Builtins.lc 58:11-58:12  Type
 testdata/Builtins.lc 59:3-59:6  {a} -> {b : Component a}->a
 testdata/Builtins.lc 59:10-59:11  Type
-testdata/Builtins.lc 61:20-61:23  Type
-testdata/Builtins.lc 61:20-62:18  V1->V2
-testdata/Builtins.lc 61:20-63:17  V1->V2
-testdata/Builtins.lc 61:20-79:24  Type | Type->Type
-testdata/Builtins.lc 61:20-89:36  V1 | {a : Component V0}->V1 | {a} -> {b : Component a}->a
-testdata/Builtins.lc 61:20-90:31  V1 | {a : Component V0}->V1 | {a} -> {b : Component a}->a
 testdata/Builtins.lc 62:10-62:11  V1
+testdata/Builtins.lc 62:10-89:36  V1 | {a : Component V0}->V1 | {a} -> {b : Component a}->a
 testdata/Builtins.lc 62:15-62:18  Type
 testdata/Builtins.lc 63:9-63:10  V1
+testdata/Builtins.lc 63:9-90:31  V1 | {a : Component V0}->V1 | {a} -> {b : Component a}->a
 testdata/Builtins.lc 63:14-63:17  Type
-testdata/Builtins.lc 64:20-64:24  Type
-testdata/Builtins.lc 64:20-65:19  V1->V2
-testdata/Builtins.lc 64:20-66:18  V1->V2
-testdata/Builtins.lc 64:20-79:24  Type
-testdata/Builtins.lc 64:20-89:36  V1
-testdata/Builtins.lc 64:20-90:31  V1
 testdata/Builtins.lc 65:10-65:11  V1
+testdata/Builtins.lc 65:10-89:36  V1
 testdata/Builtins.lc 65:15-65:19  Type
 testdata/Builtins.lc 66:9-66:10  V1
+testdata/Builtins.lc 66:9-90:31  V1
 testdata/Builtins.lc 66:14-66:18  Type
-testdata/Builtins.lc 67:20-67:25  Type
-testdata/Builtins.lc 67:20-68:13  V1->V2
-testdata/Builtins.lc 67:20-69:12  V1->V2
-testdata/Builtins.lc 67:20-79:24  Type
-testdata/Builtins.lc 67:20-89:36  V1
-testdata/Builtins.lc 67:20-90:31  V1
 testdata/Builtins.lc 68:10-68:13  Float
+testdata/Builtins.lc 68:10-89:36  V1
 testdata/Builtins.lc 69:9-69:12  Float
-testdata/Builtins.lc 70:21-70:25  Type
+testdata/Builtins.lc 69:9-90:31  V1
-testdata/Builtins.lc 70:21-79:24  Type
-testdata/Builtins.lc 70:21-89:36  V1->V2
-testdata/Builtins.lc 70:21-90:31  V1->V2
 testdata/Builtins.lc 71:10-71:12  {a} -> a -> a -> VecS a 2
 testdata/Builtins.lc 71:10-71:16  Float -> VecS Float 2
 testdata/Builtins.lc 71:10-71:20  VecS Float 2
@@ -887,9 +856,6 @@ testdata/Builtins.lc 78:12-78:15  Float
 testdata/Builtins.lc 78:16-78:19  Float
 testdata/Builtins.lc 78:20-78:23  Float
 testdata/Builtins.lc 78:24-78:27  Float
-testdata/Builtins.lc 79:20-79:24  Type
-testdata/Builtins.lc 79:20-80:15  V1->V2
-testdata/Builtins.lc 79:20-81:13  V1->V2
 testdata/Builtins.lc 80:10-80:15  Bool
 testdata/Builtins.lc 81:9-81:13  Bool
 testdata/Builtins.lc 83:10-83:12  {a} -> a -> a -> VecS a 2
@@ -939,15 +905,7 @@ testdata/Builtins.lc 90:17-90:21  Bool
 testdata/Builtins.lc 90:22-90:26  Bool
 testdata/Builtins.lc 90:27-90:31  Bool
 testdata/Builtins.lc 92:7-92:15  Type->Type
-testdata/Builtins.lc 94:25-94:28  Type
-testdata/Builtins.lc 94:25-95:29  Type | Type->Type
-testdata/Builtins.lc 95:25-95:29  Type
 testdata/Builtins.lc 97:7-97:15  Type->Type
-testdata/Builtins.lc 99:25-99:30  Type
-testdata/Builtins.lc 99:25-103:29  Type | Type->Type
-testdata/Builtins.lc 100:26-100:30  Type
-testdata/Builtins.lc 100:26-103:29  Type
-testdata/Builtins.lc 103:26-103:29  Type
 testdata/Builtins.lc 118:1-118:8  {a} -> {b : Num (MatVecScalarElem a)} -> a -> a->a
 testdata/Builtins.lc 118:10-118:17  {a} -> {b : Num (MatVecScalarElem a)} -> a -> a->a
 testdata/Builtins.lc 118:19-118:26  {a} -> {b : Num (MatVecScalarElem a)} -> a -> a->a
@@ -1907,8 +1865,6 @@ testdata/Builtins.lc 187:55-187:66  Type
 testdata/Builtins.lc 187:59-187:60  V1
 testdata/Builtins.lc 187:61-187:66  Type
 testdata/Builtins.lc 201:1-201:5  {a} -> List a -> a
-testdata/Builtins.lc 201:8-201:9  V2
-testdata/Builtins.lc 201:8-201:16  V0
 testdata/Builtins.lc 201:15-201:16  List V2 -> V2 | V1 -> List V2 -> V2 | V3
 testdata/Builtins.lc 203:6-203:8  {a} -> List a -> List a -> List a
 testdata/Builtins.lc 203:14-203:16  V3
@@ -2149,7 +2105,7 @@ testdata/Builtins.lc 270:53-270:54  V1
 testdata/Builtins.lc 272:6-272:20  Type | Type->Type
 testdata/Builtins.lc 272:6-272:39  Type
 testdata/Builtins.lc 272:6-274:29  Type
-testdata/Builtins.lc 272:25-272:39  SimpleFragment V3 | Type | V2 | {a} -> Vec 3 Float -> a -> SimpleFragment a
+testdata/Builtins.lc 272:25-272:39  SimpleFragment V3 | Type | {a} -> Vec 3 Float -> a -> SimpleFragment a
 testdata/Builtins.lc 273:7-273:22  {a} -> SimpleFragment a -> VecS Float 3
 testdata/Builtins.lc 273:28-273:31  Nat -> Type->Type
 testdata/Builtins.lc 273:28-273:33  Type->Type
@@ -2279,11 +2235,9 @@ testdata/Builtins.lc 299:7-299:14  ImageKind
 testdata/Builtins.lc 301:14-301:23  Type
 testdata/Builtins.lc 301:27-301:31  Type
 testdata/Builtins.lc 302:1-302:10  ImageKind->Type
-testdata/Builtins.lc 302:12-302:17  ImageKind
-testdata/Builtins.lc 302:12-304:25  ImageKind->Type | Type
 testdata/Builtins.lc 302:23-302:24  Type | Type->V1
 testdata/Builtins.lc 302:23-303:25  Type -> ImageKind->Type
-testdata/Builtins.lc 302:23-304:25  ImageKind->Type
+testdata/Builtins.lc 302:23-304:25  ImageKind->Type | Type
 testdata/Builtins.lc 303:19-303:25  Type
 testdata/Builtins.lc 304:21-304:25  Type
 testdata/Builtins.lc 306:6-306:11  Nat -> ImageKind->Type | Type
@@ -2355,28 +2309,20 @@ testdata/Builtins.lc 339:38-339:43  Type
 testdata/Builtins.lc 339:38-339:48  Type
 testdata/Builtins.lc 339:47-339:48  Type
 testdata/Builtins.lc 340:1-340:12  {a} -> {b:Nat} -> Vec b a -> Swizz->a
-testdata/Builtins.lc 340:14-340:16  Vec V4 V5
-testdata/Builtins.lc 340:14-348:32  Swizz->V3 | V3 | Vec V0 V1 -> Swizz->V3
-testdata/Builtins.lc 340:22-340:24  Swizz
-testdata/Builtins.lc 340:22-341:28  V1 -> V2->V2 | V2 | V2->V2
-testdata/Builtins.lc 340:22-344:30  (V0 -> V1 -> V2 -> V3->V4) -> {f:Nat} -> VecS V2 f -> V3
-testdata/Builtins.lc 340:22-348:32  {a:Nat} -> VecS V1 a -> V2
 testdata/Builtins.lc 340:27-340:28  V4
-testdata/Builtins.lc 340:27-341:28  V3 -> V4 -> Swizz->V6
+testdata/Builtins.lc 340:27-341:28  V1 -> V2->V2 | V2 | V2->V2 | V3 -> V4 -> Swizz->V6
+testdata/Builtins.lc 340:27-344:30  (V0 -> V1 -> V2 -> V3->V4) -> {f:Nat} -> VecS V2 f -> V3
+testdata/Builtins.lc 340:27-348:32  Swizz->V3 | V3 | Vec V0 V1 -> Swizz->V3 | {a:Nat} -> VecS V1 a -> V2
 testdata/Builtins.lc 341:27-341:28  V3
-testdata/Builtins.lc 342:24-342:26  Swizz
-testdata/Builtins.lc 342:24-344:30  V0 -> V1 -> V2->V3 | V1 -> V2->V3 | V2->V3 | V3
 testdata/Builtins.lc 342:29-342:30  V4
 testdata/Builtins.lc 342:29-343:30  V3 -> V4 -> Swizz->V6
-testdata/Builtins.lc 342:29-344:30  V3 -> Swizz->V5
+testdata/Builtins.lc 342:29-344:30  V0 -> V1 -> V2->V3 | V1 -> V2->V3 | V2->V3 | V3 | V3 -> Swizz->V5
 testdata/Builtins.lc 343:29-343:30  V3
 testdata/Builtins.lc 344:29-344:30  V3
-testdata/Builtins.lc 345:26-345:28  Swizz
-testdata/Builtins.lc 345:26-348:32  V0 -> V1 -> V2 -> V3->V4 | V1 -> V2 -> V3->V4 | V2 -> V3->V4 | V3->V4 | V4
 testdata/Builtins.lc 345:31-345:32  V5
 testdata/Builtins.lc 345:31-346:32  V4 -> V5 -> Swizz->V7
 testdata/Builtins.lc 345:31-347:32  V4 -> Swizz->V6
-testdata/Builtins.lc 345:31-348:32  Swizz->V5
+testdata/Builtins.lc 345:31-348:32  Swizz->V5 | V0 -> V1 -> V2 -> V3->V4 | V1 -> V2 -> V3->V4 | V2 -> V3->V4 | V3->V4 | V4
 testdata/Builtins.lc 346:31-346:32  V4
 testdata/Builtins.lc 347:31-347:32  V4
 testdata/Builtins.lc 348:31-348:32  V4
@@ -2388,11 +2334,9 @@ testdata/Builtins.lc 351:32-351:33  V1
 testdata/Builtins.lc 351:34-351:35  V2
 testdata/Builtins.lc 351:39-351:43  Type
 testdata/Builtins.lc 352:1-352:11  {a} -> {b:Nat} -> Vec b a -> Bool
-testdata/Builtins.lc 352:13-352:15  Vec V3 V4
-testdata/Builtins.lc 352:13-354:31  Bool | Vec V0 V1 -> Bool
 testdata/Builtins.lc 352:23-352:27  Bool | V1 -> V2->V2 | V2->V2
 testdata/Builtins.lc 352:23-353:29  (V0 -> V1 -> V2 -> V3->Bool) -> {f:Nat} -> VecS V2 f -> Bool
-testdata/Builtins.lc 352:23-354:31  {a:Nat} -> VecS V1 a -> Bool
+testdata/Builtins.lc 352:23-354:31  Bool | Vec V0 V1 -> Bool | {a:Nat} -> VecS V1 a -> Bool
 testdata/Builtins.lc 353:25-353:29  Bool | V0 -> V1 -> V2->Bool | V1 -> V2->Bool | V2->Bool
 testdata/Builtins.lc 354:27-354:31  Bool | V0 -> V1 -> V2 -> V3->Bool | V1 -> V2 -> V3->Bool | V2 -> V3->Bool | V3->Bool
 testdata/Builtins.lc 356:16-356:71  Type
@@ -2769,9 +2713,7 @@ testdata/Builtins.lc 488:67-488:70  V7
 testdata/Builtins.lc 488:72-488:73  V3
 testdata/Builtins.lc 490:26-490:29  Type
 testdata/Builtins.lc 490:36-490:43  Type->Nat
-testdata/Builtins.lc 490:45-490:50  Type
+testdata/Builtins.lc 490:58-490:59  ImageKind->Nat | Nat | Nat -> ImageKind->Nat | Type->Nat
-testdata/Builtins.lc 490:45-490:59  Nat->Nat | Type->Nat
-testdata/Builtins.lc 490:58-490:59  ImageKind->Nat | Nat | Nat -> ImageKind->Nat
 testdata/Builtins.lc 492:12-492:15  Type
 testdata/Builtins.lc 492:12-492:23  Type
 testdata/Builtins.lc 492:12-495:50  V0->V1 | {a} -> List a -> Type
@@ -2815,12 +2757,10 @@ testdata/Builtins.lc 511:16-511:25  Type
 testdata/Builtins.lc 511:30-511:36  Type
 testdata/Builtins.lc 511:31-511:35  Type
 testdata/Builtins.lc 512:1-512:11  List ImageKind -> List Type
-testdata/Builtins.lc 512:18-512:19  List ImageKind
-testdata/Builtins.lc 512:18-513:31  List ImageKind -> List Type | List Type
 testdata/Builtins.lc 512:25-512:28  {a} -> {b} -> a->b -> List a -> List b
 testdata/Builtins.lc 512:25-512:38  List ImageKind -> List Type
 testdata/Builtins.lc 512:25-512:40  List Type
-testdata/Builtins.lc 512:25-513:31  List Type | List Type -> ImageKind -> List Type | List V1 -> List Type | V0 -> List V1 -> List Type
+testdata/Builtins.lc 512:25-513:31  List ImageKind -> List Type | List Type | List Type -> ImageKind -> List Type | List V1 -> List Type | V0 -> List V1 -> List Type
 testdata/Builtins.lc 512:29-512:38  ImageKind->Type
 testdata/Builtins.lc 512:39-512:40  List V2
 testdata/Builtins.lc 513:16-513:19  {a} -> {b} -> a->b -> List a -> List b
@@ -2830,9 +2770,7 @@ testdata/Builtins.lc 513:20-513:29  ImageKind->Type
 testdata/Builtins.lc 513:30-513:31  List ImageKind
 testdata/Builtins.lc 515:40-515:49  Type
 testdata/Builtins.lc 515:56-515:77  Type->ImageKind
-testdata/Builtins.lc 515:79-515:96  Type
+testdata/Builtins.lc 515:102-515:103  ImageKind | ImageKind->ImageKind | Type->ImageKind
-testdata/Builtins.lc 515:79-515:103  ImageKind->ImageKind | Type->ImageKind
-testdata/Builtins.lc 515:102-515:103  ImageKind | ImageKind->ImageKind
 testdata/Builtins.lc 517:1-517:11  {a : List ImageKind} -> {b:Nat} -> {c : List Type} -> {d : a ~ 'map Type ImageKind FragmentOperationKind c} -> HList c -> FragmentStream b (HList ('imageType' a)) -> FrameBuffer b a -> FrameBuffer b a
 testdata/Builtins.lc 517:15-517:174  Type
 testdata/Builtins.lc 517:28-517:31  Type
@@ -2888,9 +2826,7 @@ testdata/Builtins.lc 520:40-520:43  V7
 testdata/Builtins.lc 520:44-520:46  V13
 testdata/Builtins.lc 524:31-524:40  Type
 testdata/Builtins.lc 524:47-524:59  Type->ImageKind
-testdata/Builtins.lc 524:61-524:66  Type
+testdata/Builtins.lc 524:74-524:75  ImageKind | ImageKind->ImageKind | Nat -> ImageKind->ImageKind | Type->ImageKind
-testdata/Builtins.lc 524:61-524:75  ImageKind->ImageKind | Type->ImageKind
-testdata/Builtins.lc 524:74-524:75  ImageKind | ImageKind->ImageKind | Nat -> ImageKind->ImageKind
 testdata/Builtins.lc 530:1-530:12  {a : List Type} -> {b : 'sameLayerCounts a} -> HList a -> FrameBuffer (ImageLC ('head Type a)) ('map Type ImageKind GetImageKind a)
 testdata/Builtins.lc 530:30-530:36  Type
 testdata/Builtins.lc 530:31-530:35  Type
diff --git a/testdata/Internals.out b/testdata/Internals.out
index 0d1624b3..568351c5 100644
--- a/testdata/Internals.out
+++ b/testdata/Internals.out
@@ -235,14 +235,10 @@ testdata/Internals.lc 74:32-74:33  Type
 testdata/Internals.lc 74:32-74:38  Type
 testdata/Internals.lc 74:37-74:38  Type
 testdata/Internals.lc 75:1-75:15  {a} -> Bool -> a -> a->a
-testdata/Internals.lc 75:16-75:20  Bool
-testdata/Internals.lc 75:16-76:29  Bool -> V1 -> V2->V3 | V1 -> V2->V3 | V2->V3 | V3
 testdata/Internals.lc 75:28-75:29  V3
-testdata/Internals.lc 75:28-76:29  Bool->V4
+testdata/Internals.lc 75:28-76:29  Bool -> V1 -> V2->V3 | Bool->V4 | V1 -> V2->V3 | V2->V3 | V3
 testdata/Internals.lc 76:28-76:29  V4
 testdata/Internals.lc 78:1-78:5  Ordering->Bool
-testdata/Internals.lc 78:6-78:8  V1
-testdata/Internals.lc 78:6-79:15  Bool
 testdata/Internals.lc 78:11-78:15  Bool
 testdata/Internals.lc 78:11-79:15  Bool -> Ordering->Bool
 testdata/Internals.lc 79:10-79:15  Bool
@@ -264,43 +260,24 @@ testdata/Internals.lc 85:3-85:9  {a} -> {b : Num a} -> a->a
 testdata/Internals.lc 85:13-85:14  Type
 testdata/Internals.lc 85:13-85:19  Type
 testdata/Internals.lc 85:18-85:19  Type
-testdata/Internals.lc 87:14-87:17  Type
+testdata/Internals.lc 88:13-100:25  Int->V2 | {a : Num V0} -> Int->V2 | {a} -> {b : Num a} -> Int->a
-testdata/Internals.lc 87:14-88:20  Int->V2 -> Int->V3
-testdata/Internals.lc 87:14-89:27  (V1 -> V2->Ordering) -> V2 -> V3->Ordering
-testdata/Internals.lc 87:14-90:26  V1->V2 -> V2->V3
-testdata/Internals.lc 87:14-99:17  Type | Type->Type
-testdata/Internals.lc 87:14-100:25  Int->V2 | {a : Num V0} -> Int->V2 | {a} -> {b : Num a} -> Int->a
-testdata/Internals.lc 87:14-101:22  V1 -> V2->Ordering | {a : Num V0} -> V1 -> V2->Ordering | {a} -> {b : Num a} -> a -> a->Ordering
-testdata/Internals.lc 87:14-102:22  V1->V2 | {a : Num V0} -> V1->V2 | {a} -> {b : Num a} -> a->a
 testdata/Internals.lc 88:19-88:20  V1
 testdata/Internals.lc 89:13-89:27  Int -> Int->Ordering
+testdata/Internals.lc 89:13-101:22  V1 -> V2->Ordering | {a : Num V0} -> V1 -> V2->Ordering | {a} -> {b : Num a} -> a -> a->Ordering
 testdata/Internals.lc 90:13-90:26  Int->Int
-testdata/Internals.lc 91:14-91:18  Type
+testdata/Internals.lc 90:13-102:22  V1->V2 | {a : Num V0} -> V1->V2 | {a} -> {b : Num a} -> a->a
-testdata/Internals.lc 91:14-92:26  Int->V2 -> Int->V3
-testdata/Internals.lc 91:14-93:28  (V1 -> V2->Ordering) -> V2 -> V3->Ordering
-testdata/Internals.lc 91:14-94:27  V1->V2 -> V2->V3
-testdata/Internals.lc 91:14-99:17  Type
-testdata/Internals.lc 91:14-100:25  Int->V2
-testdata/Internals.lc 91:14-101:22  V1 -> V2->Ordering
-testdata/Internals.lc 91:14-102:22  V1->V2
 testdata/Internals.lc 92:13-92:26  Int->Word
+testdata/Internals.lc 92:13-100:25  Int->V2
 testdata/Internals.lc 93:13-93:28  Word -> Word->Ordering
+testdata/Internals.lc 93:13-101:22  V1 -> V2->Ordering
 testdata/Internals.lc 94:13-94:27  Word->Word
-testdata/Internals.lc 95:14-95:19  Type
+testdata/Internals.lc 94:13-102:22  V1->V2
-testdata/Internals.lc 95:14-96:27  Int->V2 -> Int->V3
-testdata/Internals.lc 95:14-97:29  (V1 -> V2->Ordering) -> V2 -> V3->Ordering
-testdata/Internals.lc 95:14-98:28  V1->V2 -> V2->V3
-testdata/Internals.lc 95:14-99:17  Type
-testdata/Internals.lc 95:14-100:25  Int->V2
-testdata/Internals.lc 95:14-101:22  V1 -> V2->Ordering
-testdata/Internals.lc 95:14-102:22  V1->V2
 testdata/Internals.lc 96:13-96:27  Int->Float
+testdata/Internals.lc 96:13-100:25  Int->V2
 testdata/Internals.lc 97:13-97:29  Float -> Float->Ordering
+testdata/Internals.lc 97:13-101:22  V1 -> V2->Ordering
 testdata/Internals.lc 98:13-98:28  Float->Float
-testdata/Internals.lc 99:14-99:17  Type
+testdata/Internals.lc 98:13-102:22  V1->V2
-testdata/Internals.lc 99:14-100:25  Int->V2 -> Int->V3
-testdata/Internals.lc 99:14-101:22  (V1 -> V2->Ordering) -> V2 -> V3->Ordering
-testdata/Internals.lc 99:14-102:22  V1->V2 -> V2->V3
 testdata/Internals.lc 100:13-100:25  Int->Nat
 testdata/Internals.lc 101:13-101:22  {a}->a
 testdata/Internals.lc 102:13-102:22  {a}->a
@@ -313,75 +290,46 @@ testdata/Internals.lc 105:13-105:27  Type
 testdata/Internals.lc 105:18-105:19  Type
 testdata/Internals.lc 105:18-105:27  Type
 testdata/Internals.lc 105:23-105:27  Type
-testdata/Internals.lc 109:13-109:19  Type
-testdata/Internals.lc 109:13-109:63  (V1 -> V2->Bool) -> V2 -> V3->Bool
-testdata/Internals.lc 109:13-117:16  Type | Type->Type
-testdata/Internals.lc 109:13-120:29  V1 -> V2->Bool | {a : Eq V0} -> V1 -> V2->Bool | {a} -> {b : Eq a} -> a -> a->Bool
 testdata/Internals.lc 109:35-109:39  Ordering->Bool
 testdata/Internals.lc 109:35-109:63  Bool
+testdata/Internals.lc 109:35-120:29  V1 -> V2->Bool | {a : Eq V0} -> V1 -> V2->Bool | {a} -> {b : Eq a} -> a -> a->Bool
 testdata/Internals.lc 109:41-109:58  String -> String->Ordering
 testdata/Internals.lc 109:41-109:60  String->Ordering
 testdata/Internals.lc 109:41-109:62  Ordering
 testdata/Internals.lc 109:59-109:60  V3
 testdata/Internals.lc 109:61-109:62  V1
-testdata/Internals.lc 110:13-110:17  Type
-testdata/Internals.lc 110:13-110:59  (V1 -> V2->Bool) -> V2 -> V3->Bool
-testdata/Internals.lc 110:13-117:16  Type
-testdata/Internals.lc 110:13-120:29  V1 -> V2->Bool
 testdata/Internals.lc 110:33-110:37  Ordering->Bool
 testdata/Internals.lc 110:33-110:59  Bool
+testdata/Internals.lc 110:33-120:29  V1 -> V2->Bool
 testdata/Internals.lc 110:39-110:54  Char -> Char->Ordering
 testdata/Internals.lc 110:39-110:56  Char->Ordering
 testdata/Internals.lc 110:39-110:58  Ordering
 testdata/Internals.lc 110:55-110:56  V3
 testdata/Internals.lc 110:57-110:58  V1
-testdata/Internals.lc 111:13-111:16  Type
-testdata/Internals.lc 111:13-111:57  (V1 -> V2->Bool) -> V2 -> V3->Bool
-testdata/Internals.lc 111:13-117:16  Type
-testdata/Internals.lc 111:13-120:29  V1 -> V2->Bool
 testdata/Internals.lc 111:32-111:36  Ordering->Bool
 testdata/Internals.lc 111:32-111:57  Bool
+testdata/Internals.lc 111:32-120:29  V1 -> V2->Bool
 testdata/Internals.lc 111:38-111:52  Int -> Int->Ordering
 testdata/Internals.lc 111:38-111:54  Int->Ordering
 testdata/Internals.lc 111:38-111:56  Ordering
 testdata/Internals.lc 111:53-111:54  V3
 testdata/Internals.lc 111:55-111:56  V1
-testdata/Internals.lc 112:13-112:18  Type
-testdata/Internals.lc 112:13-112:61  (V1 -> V2->Bool) -> V2 -> V3->Bool
-testdata/Internals.lc 112:13-117:16  Type
-testdata/Internals.lc 112:13-120:29  V1 -> V2->Bool
 testdata/Internals.lc 112:34-112:38  Ordering->Bool
 testdata/Internals.lc 112:34-112:61  Bool
+testdata/Internals.lc 112:34-120:29  V1 -> V2->Bool
 testdata/Internals.lc 112:40-112:56  Float -> Float->Ordering
 testdata/Internals.lc 112:40-112:58  Float->Ordering
 testdata/Internals.lc 112:40-112:60  Ordering
 testdata/Internals.lc 112:57-112:58  V3
 testdata/Internals.lc 112:59-112:60  V1
-testdata/Internals.lc 113:13-113:17  Type
-testdata/Internals.lc 113:13-116:19  (V1 -> V2->Bool) -> V2 -> V3->Bool
-testdata/Internals.lc 113:13-117:16  Type
-testdata/Internals.lc 113:13-120:29  V1 -> V2->Bool
-testdata/Internals.lc 114:5-114:9  V2
-testdata/Internals.lc 114:5-116:19  Bool
-testdata/Internals.lc 114:13-114:17  Bool
-testdata/Internals.lc 114:13-116:19  Bool
 testdata/Internals.lc 114:20-114:24  Bool
-testdata/Internals.lc 114:20-116:19  Bool->Bool
+testdata/Internals.lc 114:20-116:19  Bool | Bool->Bool
-testdata/Internals.lc 115:14-115:19  V1
+testdata/Internals.lc 114:20-120:29  V1 -> V2->Bool
-testdata/Internals.lc 115:14-116:19  Bool
 testdata/Internals.lc 115:22-115:26  Bool
-testdata/Internals.lc 115:22-116:19  Bool->Bool
+testdata/Internals.lc 115:22-116:19  Bool | Bool->Bool
 testdata/Internals.lc 116:14-116:19  Bool
-testdata/Internals.lc 117:13-117:16  Type
-testdata/Internals.lc 117:13-120:29  (V1 -> V2->Bool) -> V2 -> V3->Bool
-testdata/Internals.lc 118:5-118:9  V2
-testdata/Internals.lc 118:5-120:29  Bool
-testdata/Internals.lc 118:15-118:19  V1
-testdata/Internals.lc 118:15-120:29  Bool
 testdata/Internals.lc 118:24-118:28  Bool
 testdata/Internals.lc 118:24-120:29  Nat->Bool
-testdata/Internals.lc 119:15-119:19  Nat
-testdata/Internals.lc 119:15-120:29  Bool | Nat->Bool
 testdata/Internals.lc 119:24-119:25  Nat
 testdata/Internals.lc 119:24-119:28  Nat->Bool
 testdata/Internals.lc 119:24-119:30  Bool | Nat->Bool
diff --git a/testdata/Material.out b/testdata/Material.out
index 816ce7ad..2972a98e 100644
--- a/testdata/Material.out
+++ b/testdata/Material.out
@@ -163,7 +163,7 @@ testdata/Material.lc 8:17-8:18  V1
 testdata/Material.lc 10:6-10:12  Type
 testdata/Material.lc 10:6-11:13  Type
 testdata/Material.lc 10:6-15:39  Type
-testdata/Material.lc 11:7-11:13  Entity | Type | V1 | Vec 4 Float -> Vec 4 Float -> Vec 3 Float -> Vec 4 Float -> Entity
+testdata/Material.lc 11:7-11:13  Entity | Type | Vec 4 Float -> Vec 4 Float -> Vec 3 Float -> Vec 4 Float -> Entity
 testdata/Material.lc 12:7-12:20  Entity -> VecS Float 4
 testdata/Material.lc 12:28-12:31  Nat -> Type->Type
 testdata/Material.lc 12:28-12:33  Type->Type
@@ -360,7 +360,7 @@ testdata/Material.lc 127:7-127:15  DepthFunction
 testdata/Material.lc 130:6-130:16  Type
 testdata/Material.lc 130:6-131:17  Type
 testdata/Material.lc 130:6-144:34  Type
-testdata/Material.lc 131:7-131:17  Maybe (Blending', Blending') -> RGBGen -> AlphaGen -> TCGen -> List TCMod -> StageTexture -> Bool -> DepthFunction -> Maybe AlphaFunction -> Bool -> String->StageAttrs | StageAttrs | Type | V1
+testdata/Material.lc 131:7-131:17  Maybe (Blending', Blending') -> RGBGen -> AlphaGen -> TCGen -> List TCMod -> StageTexture -> Bool -> DepthFunction -> Maybe AlphaFunction -> Bool -> String->StageAttrs | StageAttrs | Type
 testdata/Material.lc 132:7-132:14  StageAttrs -> Maybe (Blending', Blending')
 testdata/Material.lc 132:25-132:30  Type->Type
 testdata/Material.lc 132:25-132:53  Type
@@ -419,7 +419,7 @@ testdata/Material.lc 160:27-160:29  String
 testdata/Material.lc 163:6-163:17  Type
 testdata/Material.lc 163:6-164:18  Type
 testdata/Material.lc 163:6-178:32  Type
-testdata/Material.lc 164:7-164:18  () -> () -> Bool -> Float -> Bool -> Bool -> CullType -> List Deform -> Bool -> Bool -> List StageAttrs -> Bool->CommonAttrs | CommonAttrs | Type | V1
+testdata/Material.lc 164:7-164:18  () -> () -> Bool -> Float -> Bool -> Bool -> CullType -> List Deform -> Bool -> Bool -> List StageAttrs -> Bool->CommonAttrs | CommonAttrs | Type
 testdata/Material.lc 165:7-165:17  CommonAttrs->()
 testdata/Material.lc 165:28-165:30  Type
 testdata/Material.lc 166:7-166:17  CommonAttrs->()
diff --git a/testdata/Prelude.out b/testdata/Prelude.out
index 89f6b9ac..a5c55c09 100644
--- a/testdata/Prelude.out
+++ b/testdata/Prelude.out
@@ -270,8 +270,6 @@ testdata/Prelude.lc 41:21-44:49  List V0 -> List V1 | V0->V1
 testdata/Prelude.lc 42:22-44:49  List V2 | List V2 -> List V2 | V1 -> List V2 -> List V2
 testdata/Prelude.lc 42:27-42:31  V6
 testdata/Prelude.lc 42:32-42:33  V5
-testdata/Prelude.lc 43:24-43:28  V1
-testdata/Prelude.lc 43:24-44:49  List V4
 testdata/Prelude.lc 43:32-44:49  Bool -> List V6
 testdata/Prelude.lc 43:33-43:34  V7
 testdata/Prelude.lc 43:33-43:36  List V6 -> List V7
@@ -291,9 +289,7 @@ testdata/Prelude.lc 49:10-49:11  V1
 testdata/Prelude.lc 49:16-49:19  Type
 testdata/Prelude.lc 49:17-49:18  Type
 testdata/Prelude.lc 50:1-50:5  {a} -> List a -> List a
-testdata/Prelude.lc 50:8-50:9  List V1
+testdata/Prelude.lc 50:16-50:18  List V0 -> List V1 | List V1 | List V2 -> V2 | List V3 | V1 -> List V2 -> V2
-testdata/Prelude.lc 50:8-50:18  List V0 -> List V1 | List V1
-testdata/Prelude.lc 50:16-50:18  List V2 -> V2 | List V3 | V1 -> List V2 -> V2
 testdata/Prelude.lc 52:10-52:13  Type
 testdata/Prelude.lc 52:10-52:25  Type
 testdata/Prelude.lc 52:11-52:12  V1
@@ -321,8 +317,6 @@ testdata/Prelude.lc 56:34-56:35  V13
 testdata/Prelude.lc 56:36-56:37  V10
 testdata/Prelude.lc 56:39-56:41  List V7
 testdata/Prelude.lc 58:1-58:7  {a} -> (a -> a->a) -> List a -> a
-testdata/Prelude.lc 58:12-58:13  V2
-testdata/Prelude.lc 58:12-58:32  V0
 testdata/Prelude.lc 58:20-58:25  {a} -> {b} -> (b -> a->a) -> a -> List b -> a
 testdata/Prelude.lc 58:20-58:27  V1 -> List V1 -> V3
 testdata/Prelude.lc 58:20-58:29  List V0 -> V5
@@ -349,17 +343,11 @@ testdata/Prelude.lc 61:41-61:43  HList V2 -> V2 | V2 | V2 -> HList V2 -> V2 | V5
 testdata/Prelude.lc 61:47-61:52  V8
 testdata/Prelude.lc 61:53-61:55  List V7
 testdata/Prelude.lc 63:1-63:8  {a} -> (a -> a->Ordering) -> List a -> List a -> List a
-testdata/Prelude.lc 63:13-63:14  List V0
-testdata/Prelude.lc 63:13-67:21  List V0 | V0->V1
-testdata/Prelude.lc 63:20-63:21  List V2
-testdata/Prelude.lc 63:20-67:21  List V1 -> V4 | List V2 | V0 -> List V1 -> V4
 testdata/Prelude.lc 63:27-65:32  List V1 -> V9 | List V4 | V0 -> List V1 -> V9
-testdata/Prelude.lc 63:27-67:21  List V2 -> List V3
+testdata/Prelude.lc 63:27-67:21  List V1 -> V4 | List V2 | List V2 -> List V3 | V0 -> List V1 -> V4 | V0->V1
 testdata/Prelude.lc 63:32-63:33  V9
 testdata/Prelude.lc 63:34-63:35  V7
 testdata/Prelude.lc 63:36-63:37  V8
-testdata/Prelude.lc 64:5-64:7  V1
-testdata/Prelude.lc 64:5-65:32  List V5
 testdata/Prelude.lc 64:11-64:12  V9
 testdata/Prelude.lc 64:11-64:13  List V8 -> List V9
 testdata/Prelude.lc 64:11-64:33  List V7
@@ -438,14 +426,10 @@ testdata/Prelude.lc 76:1-76:4  {a} -> {b} -> (a, b)->a
 testdata/Prelude.lc 76:14-76:15  HList V2 -> V2 | V10 | V2 -> HList V2 -> V2 | V3 | V7
 testdata/Prelude.lc 77:1-77:4  {a} -> {b} -> (a, b)->b
 testdata/Prelude.lc 77:14-77:15  HList V2 -> V2 | V2 | V2 -> HList V2 -> V2 | V5
-testdata/Prelude.lc 79:1-79:6  V2
-testdata/Prelude.lc 79:1-80:18  Bool
 testdata/Prelude.lc 79:7-79:10  Bool -> Bool->Bool
 testdata/Prelude.lc 79:15-79:16  V2
 testdata/Prelude.lc 79:15-80:18  Bool->Bool
 testdata/Prelude.lc 80:14-80:18  Bool
-testdata/Prelude.lc 84:1-84:5  V2
-testdata/Prelude.lc 84:1-85:20  Bool
 testdata/Prelude.lc 84:6-84:9  Bool -> Bool->Bool
 testdata/Prelude.lc 84:14-84:15  V1
 testdata/Prelude.lc 84:14-85:20  Bool->Bool
@@ -457,8 +441,6 @@ testdata/Prelude.lc 122:16-122:23  RecItem | String -> Type->RecItem | Type
 testdata/Prelude.lc 122:24-122:30  Type
 testdata/Prelude.lc 122:31-122:35  Type
 testdata/Prelude.lc 124:1-124:12  RecItem->Type
-testdata/Prelude.lc 124:14-124:21  V1
-testdata/Prelude.lc 124:14-124:30  Type
 testdata/Prelude.lc 124:29-124:30  String -> Type->V2 | Type | Type->V2
 testdata/Prelude.lc 126:6-126:13  List RecItem -> Type | Type
 testdata/Prelude.lc 126:6-127:17  Type
@@ -495,12 +477,8 @@ testdata/Prelude.lc 130:69-130:70  String
 testdata/Prelude.lc 130:71-130:72  Type
 testdata/Prelude.lc 130:73-130:75  List V8
 testdata/Prelude.lc 132:1-132:7  {a} -> {b : List Type} -> HList ('Cons a b) -> a
-testdata/Prelude.lc 132:9-132:14  V3
-testdata/Prelude.lc 132:9-132:23  V1
 testdata/Prelude.lc 132:22-132:23  HList V2 -> V2 | V2 -> HList V2 -> V2 | V4
 testdata/Prelude.lc 133:1-133:7  {a} -> {b : List Type} -> HList ('Cons a b) -> HList b
-testdata/Prelude.lc 133:9-133:14  V3
-testdata/Prelude.lc 133:9-133:23  HList V0
 testdata/Prelude.lc 133:22-133:23  HList V2 -> V2 | HList V3 | V2 -> HList V2 -> V2
 testdata/Prelude.lc 136:12-138:181  V0->V1 | {a} -> {b : List RecItem} -> c:String -> {d : 'isKeyC c a b} -> RecordC b -> a
 testdata/Prelude.lc 136:28-136:37  Type
@@ -522,14 +500,10 @@ testdata/Prelude.lc 136:82-136:97  Type
 testdata/Prelude.lc 136:90-136:92  List RecItem
 testdata/Prelude.lc 136:96-136:97  Type
 testdata/Prelude.lc 137:1-137:8  {a} -> {b : List RecItem} -> c:String -> {d : 'isKeyC c a b} -> RecordC b -> a
-testdata/Prelude.lc 137:28-137:29  List RecItem
-testdata/Prelude.lc 137:28-138:181  RecordC V2 -> V4 | V4 | a:String -> {b : 'isKeyC a V2 V1} -> RecordC V2 -> V4 | {a : 'isKeyC V0 V2 V1} -> RecordC V2 -> V4 | {a : List RecItem} -> b:String -> {c : 'isKeyC b V2 a} -> RecordC a -> V4 | {a} -> {b : List RecItem} -> c:String -> {d : 'isKeyC c a b} -> RecordC b -> a
-testdata/Prelude.lc 137:40-137:50  RecordC V9
-testdata/Prelude.lc 137:40-138:181  List V2 -> V2 | String -> Type->V2 | Type->V2 | V1 -> List V2 -> V2 | V6 | V9
 testdata/Prelude.lc 137:57-137:58  String
 testdata/Prelude.lc 137:57-137:61  String->Bool
 testdata/Prelude.lc 137:57-137:64  Bool
-testdata/Prelude.lc 137:57-138:181  HList ('map RecItem Type 'recItemType V1) -> V1 | V12
+testdata/Prelude.lc 137:57-138:181  HList ('map RecItem Type 'recItemType V1) -> V1 | List V2 -> V2 | RecordC V2 -> V4 | String -> Type->V2 | Type->V2 | V1 -> List V2 -> V2 | V12 | V4 | V6 | V9 | a:String -> {b : 'isKeyC a V2 V1} -> RecordC V2 -> V4 | {a : 'isKeyC V0 V2 V1} -> RecordC V2 -> V4 | {a : List RecItem} -> b:String -> {c : 'isKeyC b V2 a} -> RecordC a -> V4 | {a} -> {b : List RecItem} -> c:String -> {d : 'isKeyC c a b} -> RecordC b -> a
 testdata/Prelude.lc 137:59-137:61  {a} -> {b : Eq a} -> a -> a->Bool
 testdata/Prelude.lc 137:62-137:64  String
 testdata/Prelude.lc 137:67-137:73  {a} -> {b : List Type} -> HList ('Cons a b) -> a
@@ -1595,11 +1569,9 @@ testdata/Prelude.lc 387:10-387:11  V1
 testdata/Prelude.lc 387:16-387:19  Type
 testdata/Prelude.lc 387:16-387:24  Type
 testdata/Prelude.lc 387:23-387:24  Type
-testdata/Prelude.lc 388:4-388:5  List V2
-testdata/Prelude.lc 388:4-389:30  Int->V2 | List V0 -> Int->V2 | V2
 testdata/Prelude.lc 388:10-388:12  {a} -> List a -> Int->a
 testdata/Prelude.lc 388:19-388:20  V3
-testdata/Prelude.lc 388:19-389:30  Bool->V4 | List V2 -> V2 | V1 -> List V2 -> V2 | V2
+testdata/Prelude.lc 388:19-389:30  Bool->V4 | Int->V2 | List V0 -> Int->V2 | List V2 -> V2 | V1 -> List V2 -> V2 | V2
 testdata/Prelude.lc 389:19-389:21  List V5
 testdata/Prelude.lc 389:19-389:24  Int->V5
 testdata/Prelude.lc 389:19-389:30  V3
diff --git a/testdata/complex.out b/testdata/complex.out
index 16af3496..4fcc18c8 100644
--- a/testdata/complex.out
+++ b/testdata/complex.out
@@ -77,13 +77,9 @@ testdata/complex.lc 18:20-18:38  Type
 testdata/complex.lc 18:28-18:29  V1
 testdata/complex.lc 18:33-18:38  Type
 testdata/complex.lc 19:1-19:5  {a:Repr} -> Complex a -> Float
-testdata/complex.lc 19:7-19:14  Repr
-testdata/complex.lc 19:7-20:35  Complex V0 -> Float | Float | {a:Repr} -> Complex a -> Float
-testdata/complex.lc 19:16-19:23  Complex V3
-testdata/complex.lc 19:16-19:50  Float
-testdata/complex.lc 19:16-20:35  Repr->Float
 testdata/complex.lc 19:34-19:38  {a} -> {b:Nat} -> {c : a ~ VecScalar b Float} -> a->a
-testdata/complex.lc 19:34-19:50  Float -> Float->V3 | Float->V3 | VecScalar 1 Float
+testdata/complex.lc 19:34-19:50  Float | Float -> Float->V3 | Float->V3 | VecScalar 1 Float
+testdata/complex.lc 19:34-20:35  Complex V0 -> Float | Float | Repr->Float | {a:Repr} -> Complex a -> Float
 testdata/complex.lc 19:40-19:41  Float
 testdata/complex.lc 19:40-19:42  Float->Float
 testdata/complex.lc 19:40-19:43  Float
@@ -97,8 +93,6 @@ testdata/complex.lc 19:46-19:48  Float->Float
 testdata/complex.lc 19:46-19:49  Float
 testdata/complex.lc 19:47-19:48  {a} -> {b : Num (MatVecScalarElem a)} -> a -> a->a
 testdata/complex.lc 19:48-19:49  Float
-testdata/complex.lc 20:16-20:23  Complex V2
-testdata/complex.lc 20:16-20:35  Float
 testdata/complex.lc 20:34-20:35  Float | Float -> Float->V3 | Float->V3
 testdata/complex.lc 22:12-22:19  Repr->Type
 testdata/complex.lc 22:12-22:26  Type
@@ -107,10 +101,8 @@ testdata/complex.lc 22:30-22:37  Repr->Type
 testdata/complex.lc 22:30-22:43  Type
 testdata/complex.lc 22:38-22:43  Repr
 testdata/complex.lc 23:1-23:8  Complex 'Normal -> Complex 'Polar
-testdata/complex.lc 23:10-23:17  Complex 'Normal
-testdata/complex.lc 23:10-31:25  Complex 'Normal -> Complex 'Polar | Complex 'Polar
 testdata/complex.lc 24:8-29:17  Complex 'Polar
-testdata/complex.lc 24:8-31:25  Float -> Float->V3 | Float->V3
+testdata/complex.lc 24:8-31:25  Complex 'Normal -> Complex 'Polar | Complex 'Polar | Float -> Float->V3 | Float->V3
 testdata/complex.lc 24:11-24:12  Float
 testdata/complex.lc 24:11-24:14  VecScalar 1 Float -> VecScalar 1 Bool
 testdata/complex.lc 24:11-24:19  VecScalar 1 Bool
@@ -261,11 +253,9 @@ testdata/complex.lc 64:30-64:37  Repr->Type
 testdata/complex.lc 64:30-64:44  Type
 testdata/complex.lc 64:38-64:44  Repr
 testdata/complex.lc 65:1-65:9  Complex 'Polar -> Complex 'Normal
-testdata/complex.lc 65:11-65:18  Complex 'Polar
-testdata/complex.lc 65:11-65:63  Complex 'Polar -> Complex 'Normal | Complex V0
 testdata/complex.lc 65:28-65:35  {a:Repr} -> Float -> Float -> Complex a
 testdata/complex.lc 65:28-65:49  Float -> Complex V1
-testdata/complex.lc 65:28-65:63  Complex V0 | Float -> Float->V3 | Float->V3
+testdata/complex.lc 65:28-65:63  Complex 'Polar -> Complex 'Normal | Complex V0 | Float -> Float->V3 | Float->V3
 testdata/complex.lc 65:37-65:38  Float
 testdata/complex.lc 65:37-65:40  Float->Float
 testdata/complex.lc 65:37-65:48  Float
@@ -281,8 +271,6 @@ testdata/complex.lc 65:55-65:58  {a} -> {b:Nat} -> {c : a ~ VecScalar b Float} -
 testdata/complex.lc 65:55-65:62  VecScalar 1 Float
 testdata/complex.lc 65:59-65:62  Float
 testdata/complex.lc 111:1-111:15  {a:Repr} -> Complex a -> Float
-testdata/complex.lc 111:17-111:24  V2
-testdata/complex.lc 111:17-111:39  Float
 testdata/complex.lc 111:38-111:39  Float | Float -> Float->V3 | Float->V3
 testdata/complex.lc 113:20-113:70  Type
 testdata/complex.lc 113:32-113:39  Repr->Type
@@ -297,17 +285,9 @@ testdata/complex.lc 113:60-113:67  Repr->Type
 testdata/complex.lc 113:60-113:70  Type
 testdata/complex.lc 113:68-113:70  Repr
 testdata/complex.lc 114:1-114:4  {a:Repr} -> {b:Repr} -> Complex a -> Complex b -> Complex a
-testdata/complex.lc 114:6-114:13  Repr
-testdata/complex.lc 114:6-114:76  Complex V1 -> Complex V1 -> Complex V3 | Complex V1 -> Complex V3 | Complex V3 | {a:Repr} -> Complex V1 -> Complex a -> Complex V3 | {a:Repr} -> {b:Repr} -> Complex a -> Complex b -> Complex a
-testdata/complex.lc 114:15-114:22  Repr
-testdata/complex.lc 114:15-114:76  Complex V0
-testdata/complex.lc 114:24-114:31  Complex V7
-testdata/complex.lc 114:24-114:76  Complex V0
-testdata/complex.lc 114:38-114:45  Complex V10
-testdata/complex.lc 114:38-114:76  Complex V0 | Float -> Float->V3 | Float->V3
 testdata/complex.lc 114:53-114:60  {a:Repr} -> Float -> Float -> Complex a
 testdata/complex.lc 114:53-114:68  Float -> Complex V1
-testdata/complex.lc 114:53-114:76  Complex V0 | Float -> Float->V3 | Float->V3
+testdata/complex.lc 114:53-114:76  Complex V0 | Complex V1 -> Complex V1 -> Complex V3 | Complex V1 -> Complex V3 | Complex V3 | Float -> Float->V3 | Float->V3 | {a:Repr} -> Complex V1 -> Complex a -> Complex V3 | {a:Repr} -> {b:Repr} -> Complex a -> Complex b -> Complex a
 testdata/complex.lc 114:62-114:63  Float
 testdata/complex.lc 114:62-114:65  Float->Float
 testdata/complex.lc 114:62-114:67  Float
@@ -330,17 +310,9 @@ testdata/complex.lc 128:51-128:58  Repr->Type
 testdata/complex.lc 128:51-128:61  Type
 testdata/complex.lc 128:59-128:61  Repr
 testdata/complex.lc 129:1-129:4  {a:Repr} -> {b:Repr} -> Complex a -> Complex b -> Complex a
-testdata/complex.lc 129:6-129:13  Repr
-testdata/complex.lc 129:6-129:84  Complex V1 -> Complex V1 -> Complex V3 | Complex V1 -> Complex V3 | Complex V3 | {a:Repr} -> Complex V1 -> Complex a -> Complex V3 | {a:Repr} -> {b:Repr} -> Complex a -> Complex b -> Complex a
-testdata/complex.lc 129:15-129:22  Repr
-testdata/complex.lc 129:15-129:84  Complex V0
-testdata/complex.lc 129:24-129:31  Complex V7
-testdata/complex.lc 129:24-129:84  Complex V0
-testdata/complex.lc 129:38-129:45  Complex V10
-testdata/complex.lc 129:38-129:84  Complex V0 | Float -> Float->V3 | Float->V3
 testdata/complex.lc 129:53-129:60  {a:Repr} -> Float -> Float -> Complex a
 testdata/complex.lc 129:53-129:72  Float -> Complex V1
-testdata/complex.lc 129:53-129:84  Complex V0 | Float -> Float->V3 | Float->V3
+testdata/complex.lc 129:53-129:84  Complex V0 | Complex V1 -> Complex V1 -> Complex V3 | Complex V1 -> Complex V3 | Complex V3 | Float -> Float->V3 | Float->V3 | {a:Repr} -> Complex V1 -> Complex a -> Complex V3 | {a:Repr} -> {b:Repr} -> Complex a -> Complex b -> Complex a
 testdata/complex.lc 129:62-129:63  Float
 testdata/complex.lc 129:62-129:64  Float->Float
 testdata/complex.lc 129:62-129:65  Float
diff --git a/testdata/data.out b/testdata/data.out
index 235e193c..5ad6b9d7 100644
--- a/testdata/data.out
+++ b/testdata/data.out
@@ -42,7 +42,7 @@ testdata/data.lc 5:6-6:39  Type
 testdata/data.lc 5:6-8:20  Type
 testdata/data.lc 5:14-5:20  Data2 | Int->Data2 | Type
 testdata/data.lc 5:21-5:24  Type
-testdata/data.lc 6:14-6:20  Data2 | Int -> Int->Data2 | Type | V1
+testdata/data.lc 6:14-6:20  Data2 | Int -> Int->Data2 | Type
 testdata/data.lc 6:23-6:24  Data2->Int
 testdata/data.lc 6:28-6:31  Type
 testdata/data.lc 6:33-6:34  Data2->Int
@@ -55,10 +55,10 @@ testdata/data.lc 10:6-10:38  Type
 testdata/data.lc 10:6-11:54  Type
 testdata/data.lc 10:6-12:29  Type
 testdata/data.lc 10:6-12:48  Type
-testdata/data.lc 10:23-10:29  Data5 V4 V3 V2 | Type | V4 | {a} -> {b} -> {c} -> a -> Data5 a b c
+testdata/data.lc 10:23-10:29  Data5 V4 V3 V2 | Type | {a} -> {b} -> {c} -> a -> Data5 a b c
 testdata/data.lc 10:32-10:34  {a} -> {b} -> {c} -> Data5 a b c -> a
 testdata/data.lc 10:36-10:38  Type
-testdata/data.lc 11:23-11:29  Data5 V7 V6 V5 | Type | V4 | {a} -> {b} -> {c} -> a -> b -> c -> Data5 a b c
+testdata/data.lc 11:23-11:29  Data5 V7 V6 V5 | Type | {a} -> {b} -> {c} -> a -> b -> c -> Data5 a b c
 testdata/data.lc 11:36-11:38  Type
 testdata/data.lc 11:40-11:42  {a} -> {b} -> {c} -> Data5 a b c -> b
 testdata/data.lc 11:44-11:46  Type
diff --git a/testdata/performance/Material.out b/testdata/performance/Material.out
index b67330c2..e7de752a 100644
--- a/testdata/performance/Material.out
+++ b/testdata/performance/Material.out
@@ -163,7 +163,7 @@ testdata/performance/Material.lc 8:17-8:18  V1
 testdata/performance/Material.lc 10:6-10:12  Type
 testdata/performance/Material.lc 10:6-11:13  Type
 testdata/performance/Material.lc 10:6-15:39  Type
-testdata/performance/Material.lc 11:7-11:13  Entity | Type | V1 | Vec 4 Float -> Vec 4 Float -> Vec 3 Float -> Vec 4 Float -> Entity
+testdata/performance/Material.lc 11:7-11:13  Entity | Type | Vec 4 Float -> Vec 4 Float -> Vec 3 Float -> Vec 4 Float -> Entity
 testdata/performance/Material.lc 12:7-12:20  Entity -> VecS Float 4
 testdata/performance/Material.lc 12:28-12:31  Nat -> Type->Type
 testdata/performance/Material.lc 12:28-12:33  Type->Type
@@ -360,7 +360,7 @@ testdata/performance/Material.lc 127:7-127:15  DepthFunction
 testdata/performance/Material.lc 130:6-130:16  Type
 testdata/performance/Material.lc 130:6-131:17  Type
 testdata/performance/Material.lc 130:6-144:34  Type
-testdata/performance/Material.lc 131:7-131:17  Maybe (Blending', Blending') -> RGBGen -> AlphaGen -> TCGen -> List TCMod -> StageTexture -> Bool -> DepthFunction -> Maybe AlphaFunction -> Bool -> String->StageAttrs | StageAttrs | Type | V1
+testdata/performance/Material.lc 131:7-131:17  Maybe (Blending', Blending') -> RGBGen -> AlphaGen -> TCGen -> List TCMod -> StageTexture -> Bool -> DepthFunction -> Maybe AlphaFunction -> Bool -> String->StageAttrs | StageAttrs | Type
 testdata/performance/Material.lc 132:7-132:14  StageAttrs -> Maybe (Blending', Blending')
 testdata/performance/Material.lc 132:25-132:30  Type->Type
 testdata/performance/Material.lc 132:25-132:53  Type
@@ -419,7 +419,7 @@ testdata/performance/Material.lc 160:27-160:29  String
 testdata/performance/Material.lc 163:6-163:17  Type
 testdata/performance/Material.lc 163:6-164:18  Type
 testdata/performance/Material.lc 163:6-178:32  Type
-testdata/performance/Material.lc 164:7-164:18  () -> () -> Bool -> Float -> Bool -> Bool -> CullType -> List Deform -> Bool -> Bool -> List StageAttrs -> Bool->CommonAttrs | CommonAttrs | Type | V1
+testdata/performance/Material.lc 164:7-164:18  () -> () -> Bool -> Float -> Bool -> Bool -> CullType -> List Deform -> Bool -> Bool -> List StageAttrs -> Bool->CommonAttrs | CommonAttrs | Type
 testdata/performance/Material.lc 165:7-165:17  CommonAttrs->()
 testdata/performance/Material.lc 165:28-165:30  Type
 testdata/performance/Material.lc 166:7-166:17  CommonAttrs->()
diff --git a/testdata/typeclass.out b/testdata/typeclass.out
index 63f5f771..8eb6907a 100644
--- a/testdata/typeclass.out
+++ b/testdata/typeclass.out
@@ -8,19 +8,13 @@ not :: [32m'Bool->'Bool[39m[K
 /= :: [32m{a} -> {b : 'Eq a} -> a -> a->'Bool[39m[K
 ------------ tooltips
 testdata/typeclass.lc 8:1-8:4  Bool->Bool
-testdata/typeclass.lc 8:5-8:9  V1
-testdata/typeclass.lc 8:5-9:17  Bool
 testdata/typeclass.lc 8:12-8:17  Bool
 testdata/typeclass.lc 8:12-9:17  Bool->Bool
 testdata/typeclass.lc 9:13-9:17  Bool
-testdata/typeclass.lc 11:1-11:5  V2
-testdata/typeclass.lc 11:1-12:19  Bool
 testdata/typeclass.lc 11:6-11:8  Bool -> Bool->Bool
 testdata/typeclass.lc 11:13-11:14  V1
 testdata/typeclass.lc 11:13-12:19  Bool->Bool
 testdata/typeclass.lc 12:14-12:19  Bool
-testdata/typeclass.lc 14:1-14:6  V2
-testdata/typeclass.lc 14:1-15:17  Bool
 testdata/typeclass.lc 14:7-14:9  Bool -> Bool->Bool
 testdata/typeclass.lc 14:14-14:15  V2
 testdata/typeclass.lc 14:14-15:17  Bool->Bool
@@ -41,12 +35,8 @@ testdata/typeclass.lc 20:15-20:19  V4->Bool
 testdata/typeclass.lc 20:15-20:21  Bool
 testdata/typeclass.lc 20:17-20:19  {a} -> {b : Eq a} -> a -> a->Bool
 testdata/typeclass.lc 20:20-20:21  V2
-testdata/typeclass.lc 22:13-22:17  Type | Type->Type
-testdata/typeclass.lc 22:13-24:23  (V1 -> V2->Bool) -> V2 -> V3->Bool | {a : Eq V0} -> V1 -> V2->Bool | {a} -> {b : Eq a} -> a -> a->Bool
-testdata/typeclass.lc 23:5-23:9  V2
-testdata/typeclass.lc 23:5-24:23  Bool
 testdata/typeclass.lc 23:17-23:18  Bool
-testdata/typeclass.lc 23:17-24:23  Bool->Bool
+testdata/typeclass.lc 23:17-24:23  Bool->Bool | {a : Eq V0} -> V1 -> V2->Bool | {a} -> {b : Eq a} -> a -> a->Bool
 testdata/typeclass.lc 24:18-24:21  Bool->Bool
 testdata/typeclass.lc 24:18-24:23  Bool
 testdata/typeclass.lc 24:22-24:23  V1