105 files changed, 1235 insertions, 1226 deletions

diff --git a/src/LambdaCube/Compiler/DesugaredSource.hs b/src/LambdaCube/Compiler/DesugaredSource.hs
index 8f92f18a..75244d14 100644
--- a/src/LambdaCube/Compiler/DesugaredSource.hs
+++ b/src/LambdaCube/Compiler/DesugaredSource.hs
@@ -242,7 +242,7 @@ infixl 2 `SAppV`, `SAppH`
 pattern SBuiltin s <- SGlobal (SIName _ s)
   where SBuiltin s =  SGlobal (SIName (debugSI $ "builtin " ++ s) s)
 
-pattern SRHS a      = SBuiltin "^rhs"     `SAppV` a
+pattern SRHS a      = SBuiltin "_rhs"     `SAppV` a
 pattern Section e   = SBuiltin "^section" `SAppV` e
 pattern SType       = SBuiltin "'Type"
 pattern Parens e    = SBuiltin "parens"   `SAppV` e
@@ -381,11 +381,13 @@ instance (Up a, PShow a) => PShow (SExp' a) where
     pShow = \case
         SGlobal op | Just p <- getFixity op -> DOp0 (sName op) p
         SGlobal ns      -> pShow ns
-        SAnn a b        -> shAnn False (pShow a) (pShow b)
+        SAnn a b        -> shAnn (pShow a) (pShow b)
         TyType a        -> text "tyType" `dApp` pShow a
         SAppV a b       -> pShow a `dApp` pShow b
         SApp h a b      -> shApp h (pShow a) (pShow b)
-        Wildcard t      -> shAnn True (text "_") (pShow t)
+        Wildcard SType  -> text "_"
+        Wildcard t      -> shAnn (text "_") (pShow t)
+        SBind_ _ h _ SType b -> shLam_ (usedVar 0 b) h Nothing (pShow b)
         SBind_ _ h _ a b -> shLam (usedVar 0 b) h (pShow a) (pShow b)
         SLet _ a b      -> shLet_ (pShow a) (pShow b)
         STyped a        -> pShow a
@@ -395,7 +397,9 @@ instance (Up a, PShow a) => PShow (SExp' a) where
 shApp Visible a b = DApp a b
 shApp Hidden a b = DApp a (DAt b)
 
-shLam usedVar h a b = DFreshName usedVar $ lam (p $ DUp 0 a) b
+shLam usedVar h a b = shLam_ usedVar h (Just a) b
+
+shLam_ usedVar h a b = DFreshName usedVar $ lam (p $ DUp 0 <$> a) b
   where
     lam = case h of
         BPi Visible
@@ -406,13 +410,15 @@ shLam usedVar h a b = DFreshName usedVar $ lam (p $ DUp 0 a) b
             | otherwise -> showContext
         _ -> showLam
 
+    shAnn' a = maybe a (shAnn a)
+
     p = case h of
-        BMeta -> shAnn True (blue $ DVar 0)
+        BMeta -> shAnn' (blue $ DVar 0)
         BLam Hidden -> DAt . ann
         _ -> ann
 
-    ann | usedVar = shAnn True (DVar 0)
-        | otherwise = id
+    ann | usedVar = shAnn' (DVar 0)
+        | otherwise = fromMaybe (text "Type")
 
     showForall s x (DFreshName u d) = DFreshName u $ showForall s (DUp 0 x) d
     showForall s x (DForall s' xs y) | s == s' = DForall s (DSep (InfixR 11) x xs) y
@@ -441,9 +447,9 @@ pattern Primitive n t = Let n (Just t) (SBuiltin "undefined")
 
 instance PShow Stmt where
     pShow = \case
-        Primitive n t -> shAnn False (pShow n) (pShow t)
-        Let n ty e -> DLet "=" (pShow n) $ maybe (pShow e) (\ty -> shAnn False (pShow e) (pShow ty)) ty 
-        Data n ps ty cs -> "data" <+> text (sName n)
+        Primitive n t -> shAnn (pShow n) (pShow t)
+        Let n ty e -> DLet "=" (pShow n) $ maybe (pShow e) (\ty -> shAnn (pShow e) (pShow ty)) ty 
+        Data n ps ty cs -> "data" <+> shAnn (foldl dApp (pShow n) [shAnn (text "_") (pShow t) | (v, t) <- ps]) (pShow ty) <+> "where"
         PrecDef n i -> pShow i <+> DOp0 (sName n) i
 
 instance DeBruijnify SIName Stmt where
diff --git a/src/LambdaCube/Compiler/Infer.hs b/src/LambdaCube/Compiler/Infer.hs
index 88860d62..61a50814 100644
--- a/src/LambdaCube/Compiler/Infer.hs
+++ b/src/LambdaCube/Compiler/Infer.hs
@@ -1280,7 +1280,7 @@ instance NFData Info where rnf = rnf . ppShow
 instance PShow Info where
     pShow = \case
         Info r s -> shortForm (pShow r) <+> "" <+> text s
-        IType a b -> shAnn False (pShow a) (pShow b)
+        IType a b -> shAnn (pShow a) (pShow b)
         ITrace i s -> text i <> ": " <+> text s
         IError e -> "!" <> pShow e
         ParseWarning w -> pShow w
@@ -1451,100 +1451,95 @@ joinEnv e1 e2 = do
 
 downTo n m = map Var [n+m-1, n+m-2..n]
 
-tellType si t = tell $ mkInfoItem (sourceInfo si) $ plainShow $ mkDoc False True (t, TType)
+tellType si t = tell $ mkInfoItem (sourceInfo si) $ plainShow $ DTypeNamespace True $ mkDoc False (t, TType)
 
 
 -------------------------------------------------------------------------------- pretty print
 -- todo: do this via conversion to SExp?
 
 instance PShow Exp where
-    pShow = mkDoc False False
+    pShow = mkDoc False
 
 instance PShow (CEnv Exp) where
-    pShow = mkDoc False False
+    pShow = mkDoc False
 
 instance PShow Env where
     pShow e = envDoc e $ underline $ text "<<HERE>>"
 
 showEnvExp :: Env -> ExpType -> String
-showEnvExp e c = show $ envDoc e $ underline $ mkDoc False False c
+showEnvExp e c = show $ envDoc e $ underline $ mkDoc False c
 
 showEnvSExp :: (PShow a, Up a) => Env -> SExp' a -> String
 showEnvSExp e c = show $ envDoc e $ underline $ pShow c
 
 showEnvSExpType :: (PShow a, Up a) => Env -> SExp' a -> Exp -> String
-showEnvSExpType e c t = show $ envDoc e $ underline $ (shAnn False (pShow c) (mkDoc False False (t, TType)))
+showEnvSExpType e c t = show $ envDoc e $ underline $ (shAnn (pShow c) (mkDoc False (t, TType)))
 
 envDoc :: Env -> Doc -> Doc
 envDoc x m = case x of
     EGlobal{}           -> m
     EBind1 _ h ts b     -> envDoc ts $ shLam (usedVar 0 b) h m (pShow b)
-    EBind2 h a ts       -> envDoc ts $ shLam True h (mkDoc False ts' (a, TType)) m
+    EBind2 h a ts       -> envDoc ts $ shLam True h (mkDoc False (a, TType)) m
     EApp1 _ h ts b      -> envDoc ts $ shApp h m (pShow b)
     EApp2 _ h (Lam (Var 0), Pi Visible TType _) ts -> envDoc ts $ shApp h (text "tyType") m
-    EApp2 _ h a ts      -> envDoc ts $ shApp h (mkDoc False ts' a) m
+    EApp2 _ h a ts      -> envDoc ts $ shApp h (mkDoc False a) m
     ELet1 _ ts b        -> envDoc ts $ shLet_ m (pShow b)
-    ELet2 _ x ts        -> envDoc ts $ shLet_ (mkDoc False ts' x) m
-    EAssign i x ts      -> envDoc ts $ shLet i (mkDoc False ts' x) m
-    CheckType t ts      -> envDoc ts $ shAnn False m $ mkDoc False ts' (t, TType)
-    CheckIType t ts     -> envDoc ts $ shAnn False m (text "??") -- mkDoc ts' t
+    ELet2 _ x ts        -> envDoc ts $ shLet_ (mkDoc False x) m
+    EAssign i x ts      -> envDoc ts $ shLet i (mkDoc False x) m
+    CheckType t ts      -> envDoc ts $ shAnn m $ mkDoc False (t, TType)
+    CheckIType t ts     -> envDoc ts $ shAnn m (text "??") -- mkDoc ts' t
 --    CheckSame t ts      -> envDoc ts $ shCstr <$> m <*> mkDoc ts' t
     CheckAppType si h t te b -> envDoc (EApp1 si h (CheckType_ (sourceInfo b) t te) b) m
     ELabelEnd ts        -> envDoc ts $ shApp Visible (text "labEnd") m
     x   -> error $ "envDoc: " ++ ppShow x
-  where
-    ts' = False
 
 class MkDoc a where
-    mkDoc :: Bool {-print reduced-} -> Bool -> a -> Doc
+    mkDoc :: Bool {-print reduced-} -> a -> Doc
 
 instance MkDoc ExpType where
-    mkDoc pr ts e = mkDoc pr ts $ fst e
+    mkDoc pr e = mkDoc pr $ fst e
 
 instance MkDoc Exp where
-    mkDoc pr ts e = green $ f e
+    mkDoc pr e = green $ f e
       where
         f = \case
 --            Lam h a b       -> join $ shLam (usedVar 0 b) (BLam h) <$> f a <*> pure (f b)
             Lam b           -> shLam True (BLam Visible) (f TType{-todo!-}) (f b)
+            Pi h TType b    -> shLam_ (usedVar 0 b) (BPi h) Nothing (f b)
             Pi h a b        -> shLam (usedVar 0 b) (BPi h) (f a) (f b)
             ENat' n         -> text $ ppShow n
             (getTTup -> Just xs) -> shTuple $ f <$> xs
             (getTup -> Just xs)  -> shTuple $ f <$> xs
-            Con s _ xs      -> foldl (shApp Visible) (text_ $ ppShow s) (f <$> xs)
-            TyConN s xs     -> foldl (shApp Visible) (text_ $ ppShow s) (f <$> xs)
+            Con s _ xs      -> foldl (shApp Visible) (pShow s) (f <$> xs)
+            TyConN s xs     -> foldl (shApp Visible) (pShow s) (f <$> xs)
             TType           -> text "Type"
             ELit l          -> pShow l
-            Neut x          -> mkDoc pr ts x
-
-        text_ = text . if ts then switchTick else id
+            Neut x          -> mkDoc pr x
 
 instance MkDoc Neutral where
-    mkDoc pr ts e = green $ f e
+    mkDoc pr e = green $ f e
       where
-        g = mkDoc pr ts
+        g = mkDoc pr
         f = \case
             CstrT' t a b     -> shCstr (g (a, t)) (g (b, t))
             FL' a | pr -> g a
-            Fun' s vs i (mkExpTypes (nType s) . reverse -> xs) _ -> foldl (shApp Visible) (text_ $ ppShow s) (g <$> xs)
+            Fun' s vs i (mkExpTypes (nType s) . reverse -> xs) _ -> foldl (shApp Visible) (pShow s) (g <$> xs)
             Var_ k           -> shVar k
             App_ a b         -> shApp Visible (g a) (g b)
-            CaseFun_ s xs n  -> foldl (shApp Visible) (text_ $ ppShow s) (map g $ {-mkExpTypes (nType s) $ makeCaseFunPars te n ++ -} xs ++ [Neut n])
-            TyCaseFun_ s [m, t, f] n  -> foldl (shApp Visible) (text_ $ ppShow s) (g <$> mkExpTypes (nType s) [m, t, Neut n, f])
+            CaseFun_ s xs n  -> foldl (shApp Visible) (pShow s) (map g $ {-mkExpTypes (nType s) $ makeCaseFunPars te n ++ -} xs ++ [Neut n])
+            TyCaseFun_ s [m, t, f] n  -> foldl (shApp Visible) (pShow s) (g <$> mkExpTypes (nType s) [m, t, Neut n, f])
             TyCaseFun_ s _ n -> error $ "mkDoc TyCaseFun"
             LabelEnd_ x      -> shApp Visible (text "labend") (g x)
             Delta{}          -> text "^delta"
 
-        text_ = text . if ts then switchTick else id
-
 instance MkDoc (CEnv Exp) where
-    mkDoc pr ts e = green $ f e
+    mkDoc pr e = green $ f e
       where
         f :: CEnv Exp -> Doc
         f = \case
-            MEnd a          -> mkDoc pr ts a
-            Meta a b        -> shLam True BMeta (mkDoc pr ts a) (f b)
-            Assign i (x, _) e -> shLet i (mkDoc pr ts x) (f e)
+            MEnd a          -> mkDoc pr a
+            Meta a b        -> shLam True BMeta (mkDoc pr a) (f b)
+            Assign i (x, _) e -> shLet i (mkDoc pr x) (f e)
 
 getTup (unfixlabel -> ConN FHCons [_, _, x, xs]) = (x:) <$> getTup xs
 getTup (unfixlabel -> ConN FHNil []) = Just []
diff --git a/src/LambdaCube/Compiler/Pretty.hs b/src/LambdaCube/Compiler/Pretty.hs
index fb6cfb22..911290db 100644
--- a/src/LambdaCube/Compiler/Pretty.hs
+++ b/src/LambdaCube/Compiler/Pretty.hs
@@ -61,6 +61,7 @@ rightPrecedence f = precedence f + 1
 data Doc
     = forall f . Traversable f => DDocOp (f P.Doc -> P.Doc) (f Doc)
     | DFormat (P.Doc -> P.Doc) Doc
+    | DTypeNamespace Bool Doc
 
     | DAtom DocAtom
     | DInfix Fixity Doc DocAtom Doc
@@ -91,14 +92,14 @@ instance Monoid Doc where
 
 instance NFData Doc where
     rnf x = rnf $ show x    -- TODO
-
+{-
 strip :: Doc -> Doc
 strip = \case
     DFormat _ x    -> strip x
     DUp _ x        -> strip x
     DFreshName _ x -> strip x
     x              -> x
-
+-}
 instance Show Doc where
     show = show . renderDoc
 
@@ -108,7 +109,7 @@ plainShow = show . P.plain . renderDoc . pShow
 renderDoc :: Doc -> P.Doc
 renderDoc
     = render
-    . addPar (Infix (-10))
+    . addPar False (Infix (-10))
     . flip runReader ((\s n -> '_': n: s) <$> iterate ('\'':) "" <*> ['a'..'z'])
     . flip evalStateT (flip (:) <$> iterate ('\'':) "" <*> ['a'..'z'])
     . showVars
@@ -118,6 +119,7 @@ renderDoc
     expand full = \case
         DExpand short long -> expand full $ if full then long else short
         DFormat c x -> DFormat c $ expand full x
+        DTypeNamespace c x -> DTypeNamespace c $ expand full x
         DDocOp x d -> DDocOp x $ expand full <$> d
         DAtom s -> DAtom $ mapDocAtom (\_ _ -> noexpand) s
         DInfix pr x op y -> DInfix pr (noexpand x) (mapDocAtom (\_ _ -> noexpand) op) (noexpand y)
@@ -129,6 +131,7 @@ renderDoc
     showVars = \case
         DAtom s -> DAtom <$> showVarA s
         DFormat c x -> DFormat c <$> showVars x
+        DTypeNamespace c x -> DTypeNamespace c <$> showVars x
         DDocOp x d -> DDocOp x <$> traverse showVars d
         DInfix pr x op y -> DInfix pr <$> showVars x <*> showVarA op <*> showVars y
         DPreOp pr op y -> DPreOp pr <$> showVarA op <*> showVars y
@@ -140,20 +143,27 @@ renderDoc
         showVarA (SimpleAtom s) = pure $ SimpleAtom s
         showVarA (ComplexAtom s i d a) = ComplexAtom s i <$> showVars d <*> showVarA a
 
-    addPar :: Fixity -> Doc -> Doc
-    addPar pr x = case x of
+    addPar :: Bool -> Fixity -> Doc -> Doc
+    addPar tn pr x = case x of
         DAtom x -> DAtom $ addParA x
         DOp0 s f -> DParen $ DOp0 s f
-        DOpL s f x -> DParen $ DOpL s f $ addPar (InfixL $ leftPrecedence f) x
-        DOpR s f x -> DParen $ DOpR s f $ addPar (InfixR $ rightPrecedence f) x
+        DOpL s f x -> DParen $ DOpL s f $ addPar tn (InfixL $ leftPrecedence f) x
+        DOpR s f x -> DParen $ DOpR s f $ addPar tn (InfixR $ rightPrecedence f) x
         DInfix pr' x op y -> (if protect then DParen else id)
-                       $ DInfix pr' (addPar (InfixL $ leftPrecedence pr') x) (addParA op) (addPar (InfixR $ rightPrecedence pr') y)
+                       $ DInfix pr' (addPar tn (InfixL $ leftPrecedence pr') x) (addParA op) (addPar tn (InfixR $ rightPrecedence pr') y)
         DPreOp pr' op y -> (if protect then DParen else id)
-                       $ DPreOp pr' (addParA op) (addPar (Infix pr') y)
-        DFormat c x -> DFormat c $ addPar pr x
-        DDocOp x d -> DDocOp x $ addPar (Infix (-10)) <$> d
+                       $ DPreOp pr' (addParA op) (addPar tn (Infix pr') y)
+        DFormat c x -> DFormat c $ addPar tn pr x
+        DTypeNamespace c x -> addPar c pr x
+        DDocOp x d -> DDocOp x $ addPar tn (Infix (-10)) <$> d
       where
-        addParA = mapDocAtom (\_ -> addPar . Infix)
+        addParA (SimpleAtom s) = SimpleAtom $ switch tn s
+        addParA (ComplexAtom s i d a) = ComplexAtom s i (addPar tn (Infix i) d) $ addParA a
+
+        switch True ('\'': cs@(c: _)) | isUpper c {- && last cs /= '\'' -} = cs
+        switch True "Type" = "Type"  -- TODO: remove
+        switch True cs@(c:_) | isUpper c = '\'': cs
+        switch _ x = x
 
         protect = case x of
             DInfix f _ _ _ -> precedence f < precedence pr
@@ -236,7 +246,7 @@ pattern DAt x       = DGlue     (InfixR   20) (DText "@") x
 pattern DApp x y    = DSep      (InfixL   10)  x y
 pattern DArr_ s x y = DOp s     (InfixR  (-1)) x y      -- -> => .
 pattern DCstr x y   = DOp "~"   (Infix   (-2)) x y
-pattern DAnn x y    = DOp "::"  (Infix   (-3)) x y
+pattern DAnn x y    = DOp "::"  (Infix   (-3)) x (DTypeNamespace True y)
 pattern DLet s x y  = DOp s     (Infix   (-4)) x y      -- := =
 pattern DComma a b  = DOp ","   (InfixR (-20)) a b
 pattern DPar l d r  = DAtom (ComplexAtom l (-20) d (SimpleAtom r))
@@ -265,9 +275,7 @@ shTuple [] = "()"
 shTuple [x] = DParen $ DParen x
 shTuple xs = DParen $ foldr1 DComma xs
 
-shAnn True x (strip -> DText "Type") = x
-shAnn True x (strip -> DText "'Type") = x
-shAnn _ x y = DAnn x y
+shAnn = DAnn
 
 shArr = DArr
 
diff --git a/test/runTests.hs b/test/runTests.hs
index 96ea6383..2375befd 100644
--- a/test/runTests.hs
+++ b/test/runTests.hs
@@ -207,7 +207,7 @@ doTest Config{..} (i, fn) = do
         Left (show -> e)         -> Left (unlines $ tab "!Failed" e: listTraceInfos i, Failed)
         Right (fname, Left (show -> e))
                                  -> Right ("typechecked module"
-                                          , unlines $ --"------------ desugared source code": map ppShow desug ++ 
+                                          , unlines $ -- "------------ desugared source code": map ppShow desug ++ 
                                                       e: listAllInfos i)
         Right (fname, Right (e, te))
             | te == outputType   -> Right ("compiled pipeline", prettyShowUnlines $ compilePipeline OpenGL33 (e, te))
diff --git a/testdata/Builtins.out b/testdata/Builtins.out
index 9eff75a3..cf554d40 100644
--- a/testdata/Builtins.out
+++ b/testdata/Builtins.out
@@ -1,394 +1,394 @@
 main is not found
 ------------ trace
 id :: forall a . a -> a
-'VecS :: Type -> 'Nat -> Type
-V2 :: forall a . a -> a -> 'VecS a 2
-V3 :: forall a . a -> a -> a -> 'VecS a 3
-V4 :: forall a . a -> a -> a -> a -> 'VecS a 4
-'VecSCase :: forall a . forall (b :: forall (c :: 'Nat) -> 'VecS a c -> Type) -> (forall (d :: a) (e :: a) -> b 2 (V2 d e)) -> (forall (f :: a) (g :: a) (h :: a) -> b 3 (V3 f g h)) -> (forall (i :: a) (j :: a) (k :: a) (l :: a) -> b 4 (V4 i j k l)) -> forall (m :: 'Nat) . forall (n :: 'VecS a m) -> b m n
-match'VecS :: forall (a :: Type -> Type) -> (forall b (c :: 'Nat) -> a ('VecS b c)) -> forall d -> a d -> a d
-mapVec :: forall a b (c :: 'Nat) . (a -> b) -> 'VecS a c -> 'VecS b c
-'Vec :: 'Nat -> Type -> Type
-'VecScalar :: 'Nat -> Type -> Type
-'Mat :: 'Nat -> 'Nat -> Type -> Type
-M22F :: 'Vec 2 'Float -> 'Vec 2 'Float -> 'Mat 2 2 'Float
-M32F :: 'Vec 3 'Float -> 'Vec 3 'Float -> 'Mat 3 2 'Float
-M42F :: 'Vec 4 'Float -> 'Vec 4 'Float -> 'Mat 4 2 'Float
-M23F :: 'Vec 2 'Float -> 'Vec 2 'Float -> 'Vec 2 'Float -> 'Mat 2 3 'Float
-M33F :: 'Vec 3 'Float -> 'Vec 3 'Float -> 'Vec 3 'Float -> 'Mat 3 3 'Float
-M43F :: 'Vec 4 'Float -> 'Vec 4 'Float -> 'Vec 4 'Float -> 'Mat 4 3 'Float
-M24F :: 'Vec 2 'Float -> 'Vec 2 'Float -> 'Vec 2 'Float -> 'Vec 2 'Float -> 'Mat 2 4 'Float
-M34F :: 'Vec 3 'Float -> 'Vec 3 'Float -> 'Vec 3 'Float -> 'Vec 3 'Float -> 'Mat 3 4 'Float
-M44F :: 'Vec 4 'Float -> 'Vec 4 'Float -> 'Vec 4 'Float -> 'Vec 4 'Float -> 'Mat 4 4 'Float
-'MatCase :: forall (a :: forall (b :: 'Nat) (c :: 'Nat) d -> 'Mat b c d -> Type) -> (forall (e :: 'Vec 2 'Float) (f :: 'Vec 2 'Float) -> a 2 2 'Float (M22F e f)) -> (forall (g :: 'Vec 3 'Float) (h :: 'Vec 3 'Float) -> a 3 2 'Float (M32F g h)) -> (forall (i :: 'Vec 4 'Float) (j :: 'Vec 4 'Float) -> a 4 2 'Float (M42F i j)) -> (forall (k :: 'Vec 2 'Float) (l :: 'Vec 2 'Float) (m :: 'Vec 2 'Float) -> a 2 3 'Float (M23F k l m)) -> (forall (n :: 'Vec 3 'Float) (o :: 'Vec 3 'Float) (p :: 'Vec 3 'Float) -> a 3 3 'Float (M33F n o p)) -> (forall (q :: 'Vec 4 'Float) (r :: 'Vec 4 'Float) (s :: 'Vec 4 'Float) -> a 4 3 'Float (M43F q r s)) -> (forall (t :: 'Vec 2 'Float) (u :: 'Vec 2 'Float) (v :: 'Vec 2 'Float) (w :: 'Vec 2 'Float) -> a 2 4 'Float (M24F t u v w)) -> (forall (x :: 'Vec 3 'Float) (y :: 'Vec 3 'Float) (z :: 'Vec 3 'Float) (a' :: 'Vec 3 'Float) -> a 3 4 'Float (M34F x y z a')) -> (forall (b' :: 'Vec 4 'Float) (c' :: 'Vec 4 'Float) (d' :: 'Vec 4 'Float) (e' :: 'Vec 4 'Float) -> a 4 4 'Float (M44F b' c' d' e')) -> forall (f' :: 'Nat) (g' :: 'Nat) h' . forall (i' :: 'Mat f' g' h') -> a f' g' h' i'
-match'Mat :: forall (a :: Type -> Type) -> (forall (b :: 'Nat) (c :: 'Nat) d -> a ('Mat b c d)) -> forall e -> a e -> a e
+'VecS :: Type -> Nat -> Type
+V2 :: forall a . a -> a -> VecS a 2
+V3 :: forall a . a -> a -> a -> VecS a 3
+V4 :: forall a . a -> a -> a -> a -> VecS a 4
+'VecSCase :: forall a . forall (b :: forall (c :: Nat) -> VecS a c -> Type) -> (forall (d :: a) (e :: a) -> b 2 ('V2 d e)) -> (forall (f :: a) (g :: a) (h :: a) -> b 3 ('V3 f g h)) -> (forall (i :: a) (j :: a) (k :: a) (l :: a) -> b 4 ('V4 i j k l)) -> forall (m :: Nat) . forall (n :: VecS a m) -> b m n
+match'VecS :: forall (a :: Type -> Type) -> (forall b (c :: Nat) -> a (VecS b c)) -> forall d -> a d -> a d
+mapVec :: forall a b (c :: Nat) . (a -> b) -> VecS a c -> VecS b c
+'Vec :: Nat -> Type -> Type
+'VecScalar :: Nat -> Type -> Type
+'Mat :: Nat -> Nat -> Type -> Type
+M22F :: Vec 2 Float -> Vec 2 Float -> Mat 2 2 Float
+M32F :: Vec 3 Float -> Vec 3 Float -> Mat 3 2 Float
+M42F :: Vec 4 Float -> Vec 4 Float -> Mat 4 2 Float
+M23F :: Vec 2 Float -> Vec 2 Float -> Vec 2 Float -> Mat 2 3 Float
+M33F :: Vec 3 Float -> Vec 3 Float -> Vec 3 Float -> Mat 3 3 Float
+M43F :: Vec 4 Float -> Vec 4 Float -> Vec 4 Float -> Mat 4 3 Float
+M24F :: Vec 2 Float -> Vec 2 Float -> Vec 2 Float -> Vec 2 Float -> Mat 2 4 Float
+M34F :: Vec 3 Float -> Vec 3 Float -> Vec 3 Float -> Vec 3 Float -> Mat 3 4 Float
+M44F :: Vec 4 Float -> Vec 4 Float -> Vec 4 Float -> Vec 4 Float -> Mat 4 4 Float
+'MatCase :: forall (a :: forall (b :: Nat) (c :: Nat) d -> Mat b c d -> Type) -> (forall (e :: Vec 2 Float) (f :: Vec 2 Float) -> a 2 2 Float ('M22F e f)) -> (forall (g :: Vec 3 Float) (h :: Vec 3 Float) -> a 3 2 Float ('M32F g h)) -> (forall (i :: Vec 4 Float) (j :: Vec 4 Float) -> a 4 2 Float ('M42F i j)) -> (forall (k :: Vec 2 Float) (l :: Vec 2 Float) (m :: Vec 2 Float) -> a 2 3 Float ('M23F k l m)) -> (forall (n :: Vec 3 Float) (o :: Vec 3 Float) (p :: Vec 3 Float) -> a 3 3 Float ('M33F n o p)) -> (forall (q :: Vec 4 Float) (r :: Vec 4 Float) (s :: Vec 4 Float) -> a 4 3 Float ('M43F q r s)) -> (forall (t :: Vec 2 Float) (u :: Vec 2 Float) (v :: Vec 2 Float) (w :: Vec 2 Float) -> a 2 4 Float ('M24F t u v w)) -> (forall (x :: Vec 3 Float) (y :: Vec 3 Float) (z :: Vec 3 Float) (a' :: Vec 3 Float) -> a 3 4 Float ('M34F x y z a')) -> (forall (b' :: Vec 4 Float) (c' :: Vec 4 Float) (d' :: Vec 4 Float) (e' :: Vec 4 Float) -> a 4 4 Float ('M44F b' c' d' e')) -> forall (f' :: Nat) (g' :: Nat) h' . forall (i' :: Mat f' g' h') -> a f' g' h' i'
+match'Mat :: forall (a :: Type -> Type) -> (forall (b :: Nat) (c :: Nat) d -> a (Mat b c d)) -> forall e -> a e -> a e
 'MatVecScalarElem :: Type -> Type
 'Signed :: Type -> Type
 'Component :: Type -> Type
-zero :: forall a . 'Component a => a
-one :: forall a . 'Component a => a
+zero :: forall a . Component a => a
+one :: forall a . Component a => a
 'Integral :: Type -> Type
 'Floating :: Type -> Type
-PrimAdd :: forall a . 'Num ('MatVecScalarElem a) => a -> a -> a
-PrimSub :: forall a . 'Num ('MatVecScalarElem a) => a -> a -> a
-PrimMul :: forall a . 'Num ('MatVecScalarElem a) => a -> a -> a
-PrimAddS :: forall a b . (a ~ 'MatVecScalarElem b, 'Num a) => b -> a -> b
-PrimSubS :: forall a b . (a ~ 'MatVecScalarElem b, 'Num a) => b -> a -> b
-PrimMulS :: forall a b . (a ~ 'MatVecScalarElem b, 'Num a) => b -> a -> b
-PrimDiv :: forall a b (c :: 'Nat) . ('Num a, b ~ 'VecScalar c a) => b -> b -> b
-PrimMod :: forall a b (c :: 'Nat) . ('Num a, b ~ 'VecScalar c a) => b -> b -> b
-PrimDivS :: forall a b (c :: 'Nat) . ('Num a, b ~ 'VecScalar c a) => b -> a -> b
-PrimModS :: forall a b (c :: 'Nat) . ('Num a, b ~ 'VecScalar c a) => b -> a -> b
-PrimNeg :: forall a . 'Signed ('MatVecScalarElem a) => a -> a
-PrimBAnd :: forall a b (c :: 'Nat) . ('Integral a, b ~ 'VecScalar c a) => b -> b -> b
-PrimBOr :: forall a b (c :: 'Nat) . ('Integral a, b ~ 'VecScalar c a) => b -> b -> b
-PrimBXor :: forall a b (c :: 'Nat) . ('Integral a, b ~ 'VecScalar c a) => b -> b -> b
-PrimBAndS :: forall a b (c :: 'Nat) . ('Integral a, b ~ 'VecScalar c a) => b -> a -> b
-PrimBOrS :: forall a b (c :: 'Nat) . ('Integral a, b ~ 'VecScalar c a) => b -> a -> b
-PrimBXorS :: forall a b (c :: 'Nat) . ('Integral a, b ~ 'VecScalar c a) => b -> a -> b
-PrimBNot :: forall a b (c :: 'Nat) . ('Integral a, b ~ 'VecScalar c a) => b -> b
-PrimBShiftL :: forall a b (c :: 'Nat) d . ('Integral a, b ~ 'VecScalar c a, d ~ 'VecScalar c 'Word) => b -> d -> b
-PrimBShiftR :: forall a b (c :: 'Nat) d . ('Integral a, b ~ 'VecScalar c a, d ~ 'VecScalar c 'Word) => b -> d -> b
-PrimBShiftLS :: forall a b (c :: 'Nat) . ('Integral a, b ~ 'VecScalar c a) => b -> 'Word -> b
-PrimBShiftRS :: forall a b (c :: 'Nat) . ('Integral a, b ~ 'VecScalar c a) => b -> 'Word -> b
-PrimAnd :: 'Bool -> 'Bool -> 'Bool
-PrimOr :: 'Bool -> 'Bool -> 'Bool
-PrimXor :: 'Bool -> 'Bool -> 'Bool
-PrimNot :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Bool) => a -> a
-PrimAny :: forall (a :: 'Nat) . 'VecScalar a 'Bool -> 'Bool
-PrimAll :: forall (a :: 'Nat) . 'VecScalar a 'Bool -> 'Bool
-PrimACos :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimACosH :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimASin :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimASinH :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimATan :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimATanH :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimCos :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimCosH :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimDegrees :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimRadians :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimSin :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimSinH :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimTan :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimTanH :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimExp :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimLog :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimExp2 :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimLog2 :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimSqrt :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimInvSqrt :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimPow :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a -> a
-PrimATan2 :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a -> a
-PrimFloor :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimTrunc :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimRound :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimRoundEven :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimCeil :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimFract :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimMin :: forall a b (c :: 'Nat) . ('Num a, b ~ 'VecScalar c a) => b -> b -> b
-PrimMax :: forall a b (c :: 'Nat) . ('Num a, b ~ 'VecScalar c a) => b -> b -> b
-PrimMinS :: forall a b (c :: 'Nat) . ('Num a, b ~ 'VecScalar c a) => b -> a -> b
-PrimMaxS :: forall a b (c :: 'Nat) . ('Num a, b ~ 'VecScalar c a) => b -> a -> b
-PrimIsNan :: forall a (b :: 'Nat) c . (a ~ 'VecScalar b 'Float, c ~ 'VecScalar b 'Bool) => a -> c
-PrimIsInf :: forall a (b :: 'Nat) c . (a ~ 'VecScalar b 'Float, c ~ 'VecScalar b 'Bool) => a -> c
-PrimAbs :: forall a b (c :: 'Nat) . ('Signed a, b ~ 'VecScalar c a) => b -> b
-PrimSign :: forall a b (c :: 'Nat) . ('Signed a, b ~ 'VecScalar c a) => b -> b
-PrimModF :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> (a, a)
-PrimClamp :: forall a b (c :: 'Nat) . ('Num a, b ~ 'VecScalar c a) => b -> b -> b -> b
-PrimClampS :: forall a b (c :: 'Nat) . ('Num a, b ~ 'VecScalar c a) => b -> a -> a -> b
-PrimMix :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a -> a -> a
-PrimMixS :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a -> 'Float -> a
-PrimMixB :: forall a (b :: 'Nat) c . (a ~ 'VecScalar b 'Float, c ~ 'VecScalar b 'Bool) => a -> a -> c -> a
-PrimStep :: forall a (b :: 'Nat) . (a ~ 'VecS 'Float b) => a -> a -> a
-PrimStepS :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => 'Float -> a -> a
-PrimSmoothStep :: forall a (b :: 'Nat) . (a ~ 'VecS 'Float b) => a -> a -> a -> a
-PrimSmoothStepS :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => 'Float -> 'Float -> a -> a
-PrimFloatBitsToInt :: forall (a :: 'Nat) . 'VecScalar a 'Float -> 'VecScalar a 'Int
-PrimFloatBitsToUInt :: forall (a :: 'Nat) . 'VecScalar a 'Float -> 'VecScalar a 'Word
-PrimIntBitsToFloat :: forall (a :: 'Nat) . 'VecScalar a 'Int -> 'VecScalar a 'Float
-PrimUIntBitsToFloat :: forall (a :: 'Nat) . 'VecScalar a 'Word -> 'VecScalar a 'Float
-PrimLength :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> 'Float
-PrimDistance :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a -> 'Float
-PrimDot :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a -> 'Float
-PrimCross :: forall a . (a ~ 'VecS 'Float 3) => a -> a -> a
-PrimNormalize :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimFaceForward :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a -> a -> a
-PrimRefract :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a -> a -> a
-PrimReflect :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a -> a
-PrimTranspose :: forall (a :: 'Nat) (b :: 'Nat) c . 'Mat a b c -> 'Mat b a c
-PrimDeterminant :: forall (a :: 'Nat) b . 'Mat a a b -> 'Float
-PrimInverse :: forall (a :: 'Nat) b . 'Mat a a b -> 'Mat a a b
-PrimOuterProduct :: forall (a :: 'Nat) b (c :: 'Nat) . 'Vec a b -> 'Vec c b -> 'Mat c a b
-PrimMulMatVec :: forall (a :: 'Nat) (b :: 'Nat) c . 'Mat a b c -> 'Vec b c -> 'Vec a c
-PrimMulVecMat :: forall (a :: 'Nat) b (c :: 'Nat) . 'Vec a b -> 'Mat a c b -> 'Vec c b
-PrimMulMatMat :: forall (a :: 'Nat) (b :: 'Nat) c (d :: 'Nat) . 'Mat a b c -> 'Mat b d c -> 'Mat a d c
-PrimLessThan :: forall a (b :: 'Nat) c d . ('Num c, a ~ 'VecScalar b c, d ~ 'VecScalar b 'Bool) => a -> a -> d
-PrimLessThanEqual :: forall a (b :: 'Nat) c d . ('Num c, a ~ 'VecScalar b c, d ~ 'VecScalar b 'Bool) => a -> a -> d
-PrimGreaterThan :: forall a (b :: 'Nat) c d . ('Num c, a ~ 'VecScalar b c, d ~ 'VecScalar b 'Bool) => a -> a -> d
-PrimGreaterThanEqual :: forall a (b :: 'Nat) c d . ('Num c, a ~ 'VecScalar b c, d ~ 'VecScalar b 'Bool) => a -> a -> d
-PrimEqualV :: forall a (b :: 'Nat) c d . ('Num c, a ~ 'VecScalar b c, d ~ 'VecScalar b 'Bool) => a -> a -> d
-PrimNotEqualV :: forall a (b :: 'Nat) c d . ('Num c, a ~ 'VecScalar b c, d ~ 'VecScalar b 'Bool) => a -> a -> d
-PrimEqual :: forall a b . (b ~ 'MatVecScalarElem a) => a -> a -> 'Bool
-PrimNotEqual :: forall a b . (b ~ 'MatVecScalarElem a) => a -> a -> 'Bool
-PrimDFdx :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimDFdy :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimFWidth :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-PrimNoise1 :: forall (a :: 'Nat) . 'VecScalar a 'Float -> 'Float
-PrimNoise2 :: forall (a :: 'Nat) . 'VecScalar a 'Float -> 'Vec 2 'Float
-PrimNoise3 :: forall (a :: 'Nat) . 'VecScalar a 'Float -> 'Vec 3 'Float
-PrimNoise4 :: forall (a :: 'Nat) . 'VecScalar a 'Float -> 'Vec 4 'Float
-head :: forall a . 'List a -> a
-++ :: forall a . 'List a -> 'List a -> 'List a
-foldr :: forall a b . (b -> a -> a) -> a -> 'List b -> a
-concat :: forall a . 'List ('List a) -> 'List a
-map :: forall a b . (a -> b) -> 'List a -> 'List b
-concatMap :: forall a b . (a -> 'List b) -> 'List a -> 'List b
-len :: forall a . 'List a -> 'Int
+PrimAdd :: forall a . Num (MatVecScalarElem a) => a -> a -> a
+PrimSub :: forall a . Num (MatVecScalarElem a) => a -> a -> a
+PrimMul :: forall a . Num (MatVecScalarElem a) => a -> a -> a
+PrimAddS :: forall a b . (a ~ MatVecScalarElem b, Num a) => b -> a -> b
+PrimSubS :: forall a b . (a ~ MatVecScalarElem b, Num a) => b -> a -> b
+PrimMulS :: forall a b . (a ~ MatVecScalarElem b, Num a) => b -> a -> b
+PrimDiv :: forall a b (c :: Nat) . (Num a, b ~ VecScalar c a) => b -> b -> b
+PrimMod :: forall a b (c :: Nat) . (Num a, b ~ VecScalar c a) => b -> b -> b
+PrimDivS :: forall a b (c :: Nat) . (Num a, b ~ VecScalar c a) => b -> a -> b
+PrimModS :: forall a b (c :: Nat) . (Num a, b ~ VecScalar c a) => b -> a -> b
+PrimNeg :: forall a . Signed (MatVecScalarElem a) => a -> a
+PrimBAnd :: forall a b (c :: Nat) . (Integral a, b ~ VecScalar c a) => b -> b -> b
+PrimBOr :: forall a b (c :: Nat) . (Integral a, b ~ VecScalar c a) => b -> b -> b
+PrimBXor :: forall a b (c :: Nat) . (Integral a, b ~ VecScalar c a) => b -> b -> b
+PrimBAndS :: forall a b (c :: Nat) . (Integral a, b ~ VecScalar c a) => b -> a -> b
+PrimBOrS :: forall a b (c :: Nat) . (Integral a, b ~ VecScalar c a) => b -> a -> b
+PrimBXorS :: forall a b (c :: Nat) . (Integral a, b ~ VecScalar c a) => b -> a -> b
+PrimBNot :: forall a b (c :: Nat) . (Integral a, b ~ VecScalar c a) => b -> b
+PrimBShiftL :: forall a b (c :: Nat) d . (Integral a, b ~ VecScalar c a, d ~ VecScalar c Word) => b -> d -> b
+PrimBShiftR :: forall a b (c :: Nat) d . (Integral a, b ~ VecScalar c a, d ~ VecScalar c Word) => b -> d -> b
+PrimBShiftLS :: forall a b (c :: Nat) . (Integral a, b ~ VecScalar c a) => b -> Word -> b
+PrimBShiftRS :: forall a b (c :: Nat) . (Integral a, b ~ VecScalar c a) => b -> Word -> b
+PrimAnd :: Bool -> Bool -> Bool
+PrimOr :: Bool -> Bool -> Bool
+PrimXor :: Bool -> Bool -> Bool
+PrimNot :: forall a (b :: Nat) . (a ~ VecScalar b Bool) => a -> a
+PrimAny :: forall (a :: Nat) . VecScalar a Bool -> Bool
+PrimAll :: forall (a :: Nat) . VecScalar a Bool -> Bool
+PrimACos :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimACosH :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimASin :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimASinH :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimATan :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimATanH :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimCos :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimCosH :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimDegrees :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimRadians :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimSin :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimSinH :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimTan :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimTanH :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimExp :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimLog :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimExp2 :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimLog2 :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimSqrt :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimInvSqrt :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimPow :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a -> a
+PrimATan2 :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a -> a
+PrimFloor :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimTrunc :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimRound :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimRoundEven :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimCeil :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimFract :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimMin :: forall a b (c :: Nat) . (Num a, b ~ VecScalar c a) => b -> b -> b
+PrimMax :: forall a b (c :: Nat) . (Num a, b ~ VecScalar c a) => b -> b -> b
+PrimMinS :: forall a b (c :: Nat) . (Num a, b ~ VecScalar c a) => b -> a -> b
+PrimMaxS :: forall a b (c :: Nat) . (Num a, b ~ VecScalar c a) => b -> a -> b
+PrimIsNan :: forall a (b :: Nat) c . (a ~ VecScalar b Float, c ~ VecScalar b Bool) => a -> c
+PrimIsInf :: forall a (b :: Nat) c . (a ~ VecScalar b Float, c ~ VecScalar b Bool) => a -> c
+PrimAbs :: forall a b (c :: Nat) . (Signed a, b ~ VecScalar c a) => b -> b
+PrimSign :: forall a b (c :: Nat) . (Signed a, b ~ VecScalar c a) => b -> b
+PrimModF :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> (a, a)
+PrimClamp :: forall a b (c :: Nat) . (Num a, b ~ VecScalar c a) => b -> b -> b -> b
+PrimClampS :: forall a b (c :: Nat) . (Num a, b ~ VecScalar c a) => b -> a -> a -> b
+PrimMix :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a -> a -> a
+PrimMixS :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a -> Float -> a
+PrimMixB :: forall a (b :: Nat) c . (a ~ VecScalar b Float, c ~ VecScalar b Bool) => a -> a -> c -> a
+PrimStep :: forall a (b :: Nat) . (a ~ VecS Float b) => a -> a -> a
+PrimStepS :: forall a (b :: Nat) . (a ~ VecScalar b Float) => Float -> a -> a
+PrimSmoothStep :: forall a (b :: Nat) . (a ~ VecS Float b) => a -> a -> a -> a
+PrimSmoothStepS :: forall a (b :: Nat) . (a ~ VecScalar b Float) => Float -> Float -> a -> a
+PrimFloatBitsToInt :: forall (a :: Nat) . VecScalar a Float -> VecScalar a Int
+PrimFloatBitsToUInt :: forall (a :: Nat) . VecScalar a Float -> VecScalar a Word
+PrimIntBitsToFloat :: forall (a :: Nat) . VecScalar a Int -> VecScalar a Float
+PrimUIntBitsToFloat :: forall (a :: Nat) . VecScalar a Word -> VecScalar a Float
+PrimLength :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> Float
+PrimDistance :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a -> Float
+PrimDot :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a -> Float
+PrimCross :: forall a . (a ~ VecS Float 3) => a -> a -> a
+PrimNormalize :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimFaceForward :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a -> a -> a
+PrimRefract :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a -> a -> a
+PrimReflect :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a -> a
+PrimTranspose :: forall (a :: Nat) (b :: Nat) c . Mat a b c -> Mat b a c
+PrimDeterminant :: forall (a :: Nat) b . Mat a a b -> Float
+PrimInverse :: forall (a :: Nat) b . Mat a a b -> Mat a a b
+PrimOuterProduct :: forall (a :: Nat) b (c :: Nat) . Vec a b -> Vec c b -> Mat c a b
+PrimMulMatVec :: forall (a :: Nat) (b :: Nat) c . Mat a b c -> Vec b c -> Vec a c
+PrimMulVecMat :: forall (a :: Nat) b (c :: Nat) . Vec a b -> Mat a c b -> Vec c b
+PrimMulMatMat :: forall (a :: Nat) (b :: Nat) c (d :: Nat) . Mat a b c -> Mat b d c -> Mat a d c
+PrimLessThan :: forall a (b :: Nat) c d . (Num c, a ~ VecScalar b c, d ~ VecScalar b Bool) => a -> a -> d
+PrimLessThanEqual :: forall a (b :: Nat) c d . (Num c, a ~ VecScalar b c, d ~ VecScalar b Bool) => a -> a -> d
+PrimGreaterThan :: forall a (b :: Nat) c d . (Num c, a ~ VecScalar b c, d ~ VecScalar b Bool) => a -> a -> d
+PrimGreaterThanEqual :: forall a (b :: Nat) c d . (Num c, a ~ VecScalar b c, d ~ VecScalar b Bool) => a -> a -> d
+PrimEqualV :: forall a (b :: Nat) c d . (Num c, a ~ VecScalar b c, d ~ VecScalar b Bool) => a -> a -> d
+PrimNotEqualV :: forall a (b :: Nat) c d . (Num c, a ~ VecScalar b c, d ~ VecScalar b Bool) => a -> a -> d
+PrimEqual :: forall a b . (b ~ MatVecScalarElem a) => a -> a -> Bool
+PrimNotEqual :: forall a b . (b ~ MatVecScalarElem a) => a -> a -> Bool
+PrimDFdx :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimDFdy :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimFWidth :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+PrimNoise1 :: forall (a :: Nat) . VecScalar a Float -> Float
+PrimNoise2 :: forall (a :: Nat) . VecScalar a Float -> Vec 2 Float
+PrimNoise3 :: forall (a :: Nat) . VecScalar a Float -> Vec 3 Float
+PrimNoise4 :: forall (a :: Nat) . VecScalar a Float -> Vec 4 Float
+head :: forall a . List a -> a
+++ :: forall a . List a -> List a -> List a
+foldr :: forall a b . (b -> a -> a) -> a -> List b -> a
+concat :: forall a . List (List a) -> List a
+map :: forall a b . (a -> b) -> List a -> List b
+concatMap :: forall a b . (a -> List b) -> List a -> List b
+len :: forall a . List a -> Int
 'Maybe :: Type -> Type
-Nothing :: forall a . 'Maybe a
-Just :: forall a . a -> 'Maybe a
-'MaybeCase :: forall a . forall (b :: 'Maybe a -> Type) -> b Nothing -> (forall (c :: a) -> b (Just c)) -> forall (d :: 'Maybe a) -> b d
-match'Maybe :: forall (a :: Type -> Type) -> (forall b -> a ('Maybe b)) -> forall c -> a c -> a c
-'Vector :: 'Nat -> Type -> Type
-'VectorCase :: forall (a :: 'Nat) b . forall (c :: 'Vector a b -> Type) (d :: 'Vector a b) -> c d
-match'Vector :: forall (a :: Type -> Type) -> (forall (b :: 'Nat) c -> a ('Vector b c)) -> forall d -> a d -> a d
+Nothing :: forall a . Maybe a
+Just :: forall a . a -> Maybe a
+'MaybeCase :: forall a . forall (b :: Maybe a -> Type) -> b 'Nothing -> (forall (c :: a) -> b ('Just c)) -> forall (d :: Maybe a) -> b d
+match'Maybe :: forall (a :: Type -> Type) -> (forall b -> a (Maybe b)) -> forall c -> a c -> a c
+'Vector :: Nat -> Type -> Type
+'VectorCase :: forall (a :: Nat) b . forall (c :: Vector a b -> Type) (d :: Vector a b) -> c d
+match'Vector :: forall (a :: Type -> Type) -> (forall (b :: Nat) c -> a (Vector b c)) -> forall d -> a d -> a d
 'PrimitiveType :: Type
-Triangle :: 'PrimitiveType
-Line :: 'PrimitiveType
-Point :: 'PrimitiveType
-TriangleAdjacency :: 'PrimitiveType
-LineAdjacency :: 'PrimitiveType
-'PrimitiveTypeCase :: forall (a :: 'PrimitiveType -> Type) -> a Triangle -> a Line -> a Point -> a TriangleAdjacency -> a LineAdjacency -> forall (b :: 'PrimitiveType) -> a b
-match'PrimitiveType :: forall (a :: Type -> Type) -> a 'PrimitiveType -> forall b -> a b -> a b
-'Primitive :: Type -> 'PrimitiveType -> Type
-PrimPoint :: forall a . a -> 'Primitive a Point
-PrimLine :: forall a . a -> a -> 'Primitive a Line
-PrimTriangle :: forall a . a -> a -> a -> 'Primitive a Triangle
-'PrimitiveCase :: forall a . forall (b :: forall (c :: 'PrimitiveType) -> 'Primitive a c -> Type) -> (forall (d :: a) -> b Point (PrimPoint d)) -> (forall (e :: a) (f :: a) -> b Line (PrimLine e f)) -> (forall (g :: a) (h :: a) (i :: a) -> b Triangle (PrimTriangle g h i)) -> forall (j :: 'PrimitiveType) . forall (k :: 'Primitive a j) -> b j k
-match'Primitive :: forall (a :: Type -> Type) -> (forall b (c :: 'PrimitiveType) -> a ('Primitive b c)) -> forall d -> a d -> a d
-mapPrimitive :: forall a b (c :: 'PrimitiveType) . (a -> b) -> 'Primitive a c -> 'Primitive b c
-'PrimitiveStream :: 'PrimitiveType -> Type -> Type
-mapPrimitives :: forall a b (c :: 'PrimitiveType) . (a -> b) -> 'List ('Primitive a c) -> 'List ('Primitive b c)
+Triangle :: PrimitiveType
+Line :: PrimitiveType
+Point :: PrimitiveType
+TriangleAdjacency :: PrimitiveType
+LineAdjacency :: PrimitiveType
+'PrimitiveTypeCase :: forall (a :: PrimitiveType -> Type) -> a 'Triangle -> a 'Line -> a 'Point -> a 'TriangleAdjacency -> a 'LineAdjacency -> forall (b :: PrimitiveType) -> a b
+match'PrimitiveType :: forall (a :: Type -> Type) -> a PrimitiveType -> forall b -> a b -> a b
+'Primitive :: Type -> PrimitiveType -> Type
+PrimPoint :: forall a . a -> Primitive a 'Point
+PrimLine :: forall a . a -> a -> Primitive a 'Line
+PrimTriangle :: forall a . a -> a -> a -> Primitive a 'Triangle
+'PrimitiveCase :: forall a . forall (b :: forall (c :: PrimitiveType) -> Primitive a c -> Type) -> (forall (d :: a) -> b 'Point ('PrimPoint d)) -> (forall (e :: a) (f :: a) -> b 'Line ('PrimLine e f)) -> (forall (g :: a) (h :: a) (i :: a) -> b 'Triangle ('PrimTriangle g h i)) -> forall (j :: PrimitiveType) . forall (k :: Primitive a j) -> b j k
+match'Primitive :: forall (a :: Type -> Type) -> (forall b (c :: PrimitiveType) -> a (Primitive b c)) -> forall d -> a d -> a d
+mapPrimitive :: forall a b (c :: PrimitiveType) . (a -> b) -> Primitive a c -> Primitive b c
+'PrimitiveStream :: PrimitiveType -> Type -> Type
+mapPrimitives :: forall a b (c :: PrimitiveType) . (a -> b) -> List (Primitive a c) -> List (Primitive b c)
 'ListElem :: Type -> Type
-fetchArrays :: forall (a :: 'PrimitiveType) (b :: 'List Type) (c :: 'List Type) . (b ~ map Type Type 'ListElem c) => 'HList c -> 'PrimitiveStream a ('HList b)
-fetch :: forall (a :: 'PrimitiveType) (b :: 'List Type) . 'String -> 'HList b -> 'PrimitiveStream a ('HList b)
-Attribute :: forall a . 'String -> a
-fetchStream :: forall (a :: 'PrimitiveType) (b :: 'List Type) . 'String -> forall (c :: 'List 'String) -> (len 'String c ~ len Type b) => 'PrimitiveStream a ('HList b)
+fetchArrays :: forall (a :: PrimitiveType) (b :: List Type) (c :: List Type) . (b ~ map Type Type ListElem c) => HList c -> PrimitiveStream a (HList b)
+fetch :: forall (a :: PrimitiveType) (b :: List Type) . String -> HList b -> PrimitiveStream a (HList b)
+Attribute :: forall a . String -> a
+fetchStream :: forall (a :: PrimitiveType) (b :: List Type) . String -> forall (c :: List String) -> (len String c ~ len Type b) => PrimitiveStream a (HList b)
 'SimpleFragment :: Type -> Type
-SimpleFragment :: forall a . 'Vec 3 'Float -> a -> 'SimpleFragment a
-'SimpleFragmentCase :: forall a . forall (b :: 'SimpleFragment a -> Type) -> (forall (c :: 'Vec 3 'Float) (d :: a) -> b (SimpleFragment c d)) -> forall (e :: 'SimpleFragment a) -> b e
-match'SimpleFragment :: forall (a :: Type -> Type) -> (forall b -> a ('SimpleFragment b)) -> forall c -> a c -> a c
-'Fragment :: 'Nat -> Type -> Type
-sFragmentCoords :: forall a . 'SimpleFragment a -> 'VecS 'Float 3
-sFragmentValue :: forall a . 'SimpleFragment a -> a
-'FragmentStream :: 'Nat -> Type -> Type
-customizeDepth :: forall a (b :: 'Nat) . (a -> 'Float) -> 'Fragment b a -> 'Fragment b a
-customizeDepths :: forall a (b :: 'Nat) . (a -> 'Float) -> 'List ('Vector b ('Maybe ('SimpleFragment a))) -> 'List ('Vector b ('Maybe ('SimpleFragment a)))
-filterFragment :: forall a (b :: 'Nat) . (a -> 'Bool) -> 'Fragment b a -> 'Fragment b a
-filterFragments :: forall a (b :: 'Nat) . (a -> 'Bool) -> 'List ('Vector b ('Maybe ('SimpleFragment a))) -> 'List ('Vector b ('Maybe ('SimpleFragment a)))
-mapFragment :: forall a b (c :: 'Nat) . (a -> b) -> 'Fragment c a -> 'Fragment c b
-mapFragments :: forall a b (c :: 'Nat) . (a -> b) -> 'List ('Vector c ('Maybe ('SimpleFragment a))) -> 'List ('Vector c ('Maybe ('SimpleFragment b)))
+SimpleFragment :: forall a . Vec 3 Float -> a -> SimpleFragment a
+'SimpleFragmentCase :: forall a . forall (b :: SimpleFragment a -> Type) -> (forall (c :: Vec 3 Float) (d :: a) -> b ('SimpleFragment c d)) -> forall (e :: SimpleFragment a) -> b e
+match'SimpleFragment :: forall (a :: Type -> Type) -> (forall b -> a (SimpleFragment b)) -> forall c -> a c -> a c
+'Fragment :: Nat -> Type -> Type
+sFragmentCoords :: forall a . SimpleFragment a -> VecS Float 3
+sFragmentValue :: forall a . SimpleFragment a -> a
+'FragmentStream :: Nat -> Type -> Type
+customizeDepth :: forall a (b :: Nat) . (a -> Float) -> Fragment b a -> Fragment b a
+customizeDepths :: forall a (b :: Nat) . (a -> Float) -> List (Vector b (Maybe (SimpleFragment a))) -> List (Vector b (Maybe (SimpleFragment a)))
+filterFragment :: forall a (b :: Nat) . (a -> Bool) -> Fragment b a -> Fragment b a
+filterFragments :: forall a (b :: Nat) . (a -> Bool) -> List (Vector b (Maybe (SimpleFragment a))) -> List (Vector b (Maybe (SimpleFragment a)))
+mapFragment :: forall a b (c :: Nat) . (a -> b) -> Fragment c a -> Fragment c b
+mapFragments :: forall a b (c :: Nat) . (a -> b) -> List (Vector c (Maybe (SimpleFragment a))) -> List (Vector c (Maybe (SimpleFragment b)))
 'ImageKind :: Type
-Color :: Type -> 'ImageKind
-Depth :: 'ImageKind
-Stencil :: 'ImageKind
-'ImageKindCase :: forall (a :: 'ImageKind -> Type) -> (forall b -> a (Color b)) -> a Depth -> a Stencil -> forall (c :: 'ImageKind) -> a c
-match'ImageKind :: forall (a :: Type -> Type) -> a 'ImageKind -> forall b -> a b -> a b
-imageType :: 'ImageKind -> Type
-'Image :: 'Nat -> 'ImageKind -> Type
-'ImageCase :: forall (a :: 'Nat) (b :: 'ImageKind) . forall (c :: 'Image a b -> Type) (d :: 'Image a b) -> c d
-match'Image :: forall (a :: Type -> Type) -> (forall (b :: 'Nat) (c :: 'ImageKind) -> a ('Image b c)) -> forall d -> a d -> a d
-ColorImage :: forall (a :: 'Nat) (b :: 'Nat) c d . ('Num c, d ~ 'VecScalar b c) => d -> 'Image a (Color d)
-DepthImage :: forall (a :: 'Nat) . 'Float -> 'Image a Depth
-StencilImage :: forall (a :: 'Nat) . 'Int -> 'Image a Stencil
-emptyDepthImage :: 'Float -> 'Image 1 Depth
-emptyColorImage :: forall (a :: 'Nat) b c . ('Num b, c ~ 'VecScalar a b) => c -> 'Image 1 (Color c)
+Color :: Type -> ImageKind
+Depth :: ImageKind
+Stencil :: ImageKind
+'ImageKindCase :: forall (a :: ImageKind -> Type) -> (forall b -> a ('Color b)) -> a 'Depth -> a 'Stencil -> forall (c :: ImageKind) -> a c
+match'ImageKind :: forall (a :: Type -> Type) -> a ImageKind -> forall b -> a b -> a b
+imageType :: ImageKind -> Type
+'Image :: Nat -> ImageKind -> Type
+'ImageCase :: forall (a :: Nat) (b :: ImageKind) . forall (c :: Image a b -> Type) (d :: Image a b) -> c d
+match'Image :: forall (a :: Type -> Type) -> (forall (b :: Nat) (c :: ImageKind) -> a (Image b c)) -> forall d -> a d -> a d
+ColorImage :: forall (a :: Nat) (b :: Nat) c d . (Num c, d ~ VecScalar b c) => d -> Image a ('Color d)
+DepthImage :: forall (a :: Nat) . Float -> Image a 'Depth
+StencilImage :: forall (a :: Nat) . Int -> Image a 'Stencil
+emptyDepthImage :: Float -> Image 1 'Depth
+emptyColorImage :: forall (a :: Nat) b c . (Num b, c ~ VecScalar a b) => c -> Image 1 ('Color c)
 'Swizz :: Type
-Sx :: 'Swizz
-Sy :: 'Swizz
-Sz :: 'Swizz
-Sw :: 'Swizz
-'SwizzCase :: forall (a :: 'Swizz -> Type) -> a Sx -> a Sy -> a Sz -> a Sw -> forall (b :: 'Swizz) -> a b
-match'Swizz :: forall (a :: Type -> Type) -> a 'Swizz -> forall b -> a b -> a b
-swizzscalar :: forall a (b :: 'Nat) . 'Vec b a -> 'Swizz -> a
-definedVec :: forall a (b :: 'Nat) . 'Vec b a -> 'Bool
-swizzvector :: forall a (b :: 'Nat) (c :: 'Nat) . 'Vec b a -> 'Vec c 'Swizz -> 'VecS a c
+Sx :: Swizz
+Sy :: Swizz
+Sz :: Swizz
+Sw :: Swizz
+'SwizzCase :: forall (a :: Swizz -> Type) -> a 'Sx -> a 'Sy -> a 'Sz -> a 'Sw -> forall (b :: Swizz) -> a b
+match'Swizz :: forall (a :: Type -> Type) -> a Swizz -> forall b -> a b -> a b
+swizzscalar :: forall a (b :: Nat) . Vec b a -> Swizz -> a
+definedVec :: forall a (b :: Nat) . Vec b a -> Bool
+swizzvector :: forall a (b :: Nat) (c :: Nat) . Vec b a -> Vec c Swizz -> VecS a c
 'BlendingFactor :: Type
-ZeroBF :: 'BlendingFactor
-OneBF :: 'BlendingFactor
-SrcColor :: 'BlendingFactor
-OneMinusSrcColor :: 'BlendingFactor
-DstColor :: 'BlendingFactor
-OneMinusDstColor :: 'BlendingFactor
-SrcAlpha :: 'BlendingFactor
-OneMinusSrcAlpha :: 'BlendingFactor
-DstAlpha :: 'BlendingFactor
-OneMinusDstAlpha :: 'BlendingFactor
-ConstantColor :: 'BlendingFactor
-OneMinusConstantColor :: 'BlendingFactor
-ConstantAlpha :: 'BlendingFactor
-OneMinusConstantAlpha :: 'BlendingFactor
-SrcAlphaSaturate :: 'BlendingFactor
-'BlendingFactorCase :: forall (a :: 'BlendingFactor -> Type) -> a ZeroBF -> a OneBF -> a SrcColor -> a OneMinusSrcColor -> a DstColor -> a OneMinusDstColor -> a SrcAlpha -> a OneMinusSrcAlpha -> a DstAlpha -> a OneMinusDstAlpha -> a ConstantColor -> a OneMinusConstantColor -> a ConstantAlpha -> a OneMinusConstantAlpha -> a SrcAlphaSaturate -> forall (b :: 'BlendingFactor) -> a b
-match'BlendingFactor :: forall (a :: Type -> Type) -> a 'BlendingFactor -> forall b -> a b -> a b
+ZeroBF :: BlendingFactor
+OneBF :: BlendingFactor
+SrcColor :: BlendingFactor
+OneMinusSrcColor :: BlendingFactor
+DstColor :: BlendingFactor
+OneMinusDstColor :: BlendingFactor
+SrcAlpha :: BlendingFactor
+OneMinusSrcAlpha :: BlendingFactor
+DstAlpha :: BlendingFactor
+OneMinusDstAlpha :: BlendingFactor
+ConstantColor :: BlendingFactor
+OneMinusConstantColor :: BlendingFactor
+ConstantAlpha :: BlendingFactor
+OneMinusConstantAlpha :: BlendingFactor
+SrcAlphaSaturate :: BlendingFactor
+'BlendingFactorCase :: forall (a :: BlendingFactor -> Type) -> a 'ZeroBF -> a 'OneBF -> a 'SrcColor -> a 'OneMinusSrcColor -> a 'DstColor -> a 'OneMinusDstColor -> a 'SrcAlpha -> a 'OneMinusSrcAlpha -> a 'DstAlpha -> a 'OneMinusDstAlpha -> a 'ConstantColor -> a 'OneMinusConstantColor -> a 'ConstantAlpha -> a 'OneMinusConstantAlpha -> a 'SrcAlphaSaturate -> forall (b :: BlendingFactor) -> a b
+match'BlendingFactor :: forall (a :: Type -> Type) -> a BlendingFactor -> forall b -> a b -> a b
 'BlendEquation :: Type
-FuncAdd :: 'BlendEquation
-FuncSubtract :: 'BlendEquation
-FuncReverseSubtract :: 'BlendEquation
-Min :: 'BlendEquation
-Max :: 'BlendEquation
-'BlendEquationCase :: forall (a :: 'BlendEquation -> Type) -> a FuncAdd -> a FuncSubtract -> a FuncReverseSubtract -> a Min -> a Max -> forall (b :: 'BlendEquation) -> a b
-match'BlendEquation :: forall (a :: Type -> Type) -> a 'BlendEquation -> forall b -> a b -> a b
+FuncAdd :: BlendEquation
+FuncSubtract :: BlendEquation
+FuncReverseSubtract :: BlendEquation
+Min :: BlendEquation
+Max :: BlendEquation
+'BlendEquationCase :: forall (a :: BlendEquation -> Type) -> a 'FuncAdd -> a 'FuncSubtract -> a 'FuncReverseSubtract -> a 'Min -> a 'Max -> forall (b :: BlendEquation) -> a b
+match'BlendEquation :: forall (a :: Type -> Type) -> a BlendEquation -> forall b -> a b -> a b
 'LogicOperation :: Type
-Clear :: 'LogicOperation
-And :: 'LogicOperation
-AndReverse :: 'LogicOperation
-Copy :: 'LogicOperation
-AndInverted :: 'LogicOperation
-Noop :: 'LogicOperation
-Xor :: 'LogicOperation
-Or :: 'LogicOperation
-Nor :: 'LogicOperation
-Equiv :: 'LogicOperation
-Invert :: 'LogicOperation
-OrReverse :: 'LogicOperation
-CopyInverted :: 'LogicOperation
-OrInverted :: 'LogicOperation
-Nand :: 'LogicOperation
-Set :: 'LogicOperation
-'LogicOperationCase :: forall (a :: 'LogicOperation -> Type) -> a Clear -> a And -> a AndReverse -> a Copy -> a AndInverted -> a Noop -> a Xor -> a Or -> a Nor -> a Equiv -> a Invert -> a OrReverse -> a CopyInverted -> a OrInverted -> a Nand -> a Set -> forall (b :: 'LogicOperation) -> a b
-match'LogicOperation :: forall (a :: Type -> Type) -> a 'LogicOperation -> forall b -> a b -> a b
+Clear :: LogicOperation
+And :: LogicOperation
+AndReverse :: LogicOperation
+Copy :: LogicOperation
+AndInverted :: LogicOperation
+Noop :: LogicOperation
+Xor :: LogicOperation
+Or :: LogicOperation
+Nor :: LogicOperation
+Equiv :: LogicOperation
+Invert :: LogicOperation
+OrReverse :: LogicOperation
+CopyInverted :: LogicOperation
+OrInverted :: LogicOperation
+Nand :: LogicOperation
+Set :: LogicOperation
+'LogicOperationCase :: forall (a :: LogicOperation -> Type) -> a 'Clear -> a 'And -> a 'AndReverse -> a 'Copy -> a 'AndInverted -> a 'Noop -> a 'Xor -> a 'Or -> a 'Nor -> a 'Equiv -> a 'Invert -> a 'OrReverse -> a 'CopyInverted -> a 'OrInverted -> a 'Nand -> a 'Set -> forall (b :: LogicOperation) -> a b
+match'LogicOperation :: forall (a :: Type -> Type) -> a LogicOperation -> forall b -> a b -> a b
 'StencilOperation :: Type
-OpZero :: 'StencilOperation
-OpKeep :: 'StencilOperation
-OpReplace :: 'StencilOperation
-OpIncr :: 'StencilOperation
-OpIncrWrap :: 'StencilOperation
-OpDecr :: 'StencilOperation
-OpDecrWrap :: 'StencilOperation
-OpInvert :: 'StencilOperation
-'StencilOperationCase :: forall (a :: 'StencilOperation -> Type) -> a OpZero -> a OpKeep -> a OpReplace -> a OpIncr -> a OpIncrWrap -> a OpDecr -> a OpDecrWrap -> a OpInvert -> forall (b :: 'StencilOperation) -> a b
-match'StencilOperation :: forall (a :: Type -> Type) -> a 'StencilOperation -> forall b -> a b -> a b
+OpZero :: StencilOperation
+OpKeep :: StencilOperation
+OpReplace :: StencilOperation
+OpIncr :: StencilOperation
+OpIncrWrap :: StencilOperation
+OpDecr :: StencilOperation
+OpDecrWrap :: StencilOperation
+OpInvert :: StencilOperation
+'StencilOperationCase :: forall (a :: StencilOperation -> Type) -> a 'OpZero -> a 'OpKeep -> a 'OpReplace -> a 'OpIncr -> a 'OpIncrWrap -> a 'OpDecr -> a 'OpDecrWrap -> a 'OpInvert -> forall (b :: StencilOperation) -> a b
+match'StencilOperation :: forall (a :: Type -> Type) -> a StencilOperation -> forall b -> a b -> a b
 'ComparisonFunction :: Type
-Never :: 'ComparisonFunction
-Less :: 'ComparisonFunction
-Equal :: 'ComparisonFunction
-Lequal :: 'ComparisonFunction
-Greater :: 'ComparisonFunction
-Notequal :: 'ComparisonFunction
-Gequal :: 'ComparisonFunction
-Always :: 'ComparisonFunction
-'ComparisonFunctionCase :: forall (a :: 'ComparisonFunction -> Type) -> a Never -> a Less -> a Equal -> a Lequal -> a Greater -> a Notequal -> a Gequal -> a Always -> forall (b :: 'ComparisonFunction) -> a b
-match'ComparisonFunction :: forall (a :: Type -> Type) -> a 'ComparisonFunction -> forall b -> a b -> a b
+Never :: ComparisonFunction
+Less :: ComparisonFunction
+Equal :: ComparisonFunction
+Lequal :: ComparisonFunction
+Greater :: ComparisonFunction
+Notequal :: ComparisonFunction
+Gequal :: ComparisonFunction
+Always :: ComparisonFunction
+'ComparisonFunctionCase :: forall (a :: ComparisonFunction -> Type) -> a 'Never -> a 'Less -> a 'Equal -> a 'Lequal -> a 'Greater -> a 'Notequal -> a 'Gequal -> a 'Always -> forall (b :: ComparisonFunction) -> a b
+match'ComparisonFunction :: forall (a :: Type -> Type) -> a ComparisonFunction -> forall b -> a b -> a b
 'ProvokingVertex :: Type
-LastVertex :: 'ProvokingVertex
-FirstVertex :: 'ProvokingVertex
-'ProvokingVertexCase :: forall (a :: 'ProvokingVertex -> Type) -> a LastVertex -> a FirstVertex -> forall (b :: 'ProvokingVertex) -> a b
-match'ProvokingVertex :: forall (a :: Type -> Type) -> a 'ProvokingVertex -> forall b -> a b -> a b
+LastVertex :: ProvokingVertex
+FirstVertex :: ProvokingVertex
+'ProvokingVertexCase :: forall (a :: ProvokingVertex -> Type) -> a 'LastVertex -> a 'FirstVertex -> forall (b :: ProvokingVertex) -> a b
+match'ProvokingVertex :: forall (a :: Type -> Type) -> a ProvokingVertex -> forall b -> a b -> a b
 'CullMode :: Type
-CullFront :: 'CullMode
-CullBack :: 'CullMode
-CullNone :: 'CullMode
-'CullModeCase :: forall (a :: 'CullMode -> Type) -> a CullFront -> a CullBack -> a CullNone -> forall (b :: 'CullMode) -> a b
-match'CullMode :: forall (a :: Type -> Type) -> a 'CullMode -> forall b -> a b -> a b
+CullFront :: CullMode
+CullBack :: CullMode
+CullNone :: CullMode
+'CullModeCase :: forall (a :: CullMode -> Type) -> a 'CullFront -> a 'CullBack -> a 'CullNone -> forall (b :: CullMode) -> a b
+match'CullMode :: forall (a :: Type -> Type) -> a CullMode -> forall b -> a b -> a b
 'PointSize :: Type -> Type
-PointSize :: forall a . 'Float -> 'PointSize a
-ProgramPointSize :: forall a . (a -> 'Float) -> 'PointSize a
-'PointSizeCase :: forall a . forall (b :: 'PointSize a -> Type) -> (forall (c :: 'Float) -> b (PointSize c)) -> (forall (d :: a -> 'Float) -> b (ProgramPointSize d)) -> forall (e :: 'PointSize a) -> b e
-match'PointSize :: forall (a :: Type -> Type) -> (forall b -> a ('PointSize b)) -> forall c -> a c -> a c
+PointSize :: forall a . Float -> PointSize a
+ProgramPointSize :: forall a . (a -> Float) -> PointSize a
+'PointSizeCase :: forall a . forall (b :: PointSize a -> Type) -> (forall (c :: Float) -> b ('PointSize c)) -> (forall (d :: a -> Float) -> b ('ProgramPointSize d)) -> forall (e :: PointSize a) -> b e
+match'PointSize :: forall (a :: Type -> Type) -> (forall b -> a (PointSize b)) -> forall c -> a c -> a c
 'PolygonMode :: Type -> Type
-PolygonFill :: forall a . 'PolygonMode a
-PolygonPoint :: forall a . 'PointSize a -> 'PolygonMode a
-PolygonLine :: forall a . 'Float -> 'PolygonMode a
-'PolygonModeCase :: forall a . forall (b :: 'PolygonMode a -> Type) -> b PolygonFill -> (forall (c :: 'PointSize a) -> b (PolygonPoint c)) -> (forall (d :: 'Float) -> b (PolygonLine d)) -> forall (e :: 'PolygonMode a) -> b e
-match'PolygonMode :: forall (a :: Type -> Type) -> (forall b -> a ('PolygonMode b)) -> forall c -> a c -> a c
+PolygonFill :: forall a . PolygonMode a
+PolygonPoint :: forall a . PointSize a -> PolygonMode a
+PolygonLine :: forall a . Float -> PolygonMode a
+'PolygonModeCase :: forall a . forall (b :: PolygonMode a -> Type) -> b 'PolygonFill -> (forall (c :: PointSize a) -> b ('PolygonPoint c)) -> (forall (d :: Float) -> b ('PolygonLine d)) -> forall (e :: PolygonMode a) -> b e
+match'PolygonMode :: forall (a :: Type -> Type) -> (forall b -> a (PolygonMode b)) -> forall c -> a c -> a c
 'PolygonOffset :: Type
-NoOffset :: 'PolygonOffset
-Offset :: 'Float -> 'Float -> 'PolygonOffset
-'PolygonOffsetCase :: forall (a :: 'PolygonOffset -> Type) -> a NoOffset -> (forall (b :: 'Float) (c :: 'Float) -> a (Offset b c)) -> forall (d :: 'PolygonOffset) -> a d
-match'PolygonOffset :: forall (a :: Type -> Type) -> a 'PolygonOffset -> forall b -> a b -> a b
+NoOffset :: PolygonOffset
+Offset :: Float -> Float -> PolygonOffset
+'PolygonOffsetCase :: forall (a :: PolygonOffset -> Type) -> a 'NoOffset -> (forall (b :: Float) (c :: Float) -> a ('Offset b c)) -> forall (d :: PolygonOffset) -> a d
+match'PolygonOffset :: forall (a :: Type -> Type) -> a PolygonOffset -> forall b -> a b -> a b
 'PointSpriteCoordOrigin :: Type
-LowerLeft :: 'PointSpriteCoordOrigin
-UpperLeft :: 'PointSpriteCoordOrigin
-'PointSpriteCoordOriginCase :: forall (a :: 'PointSpriteCoordOrigin -> Type) -> a LowerLeft -> a UpperLeft -> forall (b :: 'PointSpriteCoordOrigin) -> a b
-match'PointSpriteCoordOrigin :: forall (a :: Type -> Type) -> a 'PointSpriteCoordOrigin -> forall b -> a b -> a b
-primTexture :: () -> 'Vec 2 'Float -> 'Vec 4 'Float
-Uniform :: forall a . 'String -> a
-'RasterContext :: Type -> 'PrimitiveType -> Type
-TriangleCtx :: forall a . 'CullMode -> 'PolygonMode a -> 'PolygonOffset -> 'ProvokingVertex -> 'RasterContext a Triangle
-PointCtx :: forall a . 'PointSize a -> 'Float -> 'PointSpriteCoordOrigin -> 'RasterContext a Point
-LineCtx :: forall a . 'Float -> 'ProvokingVertex -> 'RasterContext a Line
-'RasterContextCase :: forall a . forall (b :: forall (c :: 'PrimitiveType) -> 'RasterContext a c -> Type) -> (forall (d :: 'CullMode) (e :: 'PolygonMode a) (f :: 'PolygonOffset) (g :: 'ProvokingVertex) -> b Triangle (TriangleCtx d e f g)) -> (forall (h :: 'PointSize a) (i :: 'Float) (j :: 'PointSpriteCoordOrigin) -> b Point (PointCtx h i j)) -> (forall (k :: 'Float) (l :: 'ProvokingVertex) -> b Line (LineCtx k l)) -> forall (m :: 'PrimitiveType) . forall (n :: 'RasterContext a m) -> b m n
-match'RasterContext :: forall (a :: Type -> Type) -> (forall b (c :: 'PrimitiveType) -> a ('RasterContext b c)) -> forall d -> a d -> a d
+LowerLeft :: PointSpriteCoordOrigin
+UpperLeft :: PointSpriteCoordOrigin
+'PointSpriteCoordOriginCase :: forall (a :: PointSpriteCoordOrigin -> Type) -> a 'LowerLeft -> a 'UpperLeft -> forall (b :: PointSpriteCoordOrigin) -> a b
+match'PointSpriteCoordOrigin :: forall (a :: Type -> Type) -> a PointSpriteCoordOrigin -> forall b -> a b -> a b
+primTexture :: () -> Vec 2 Float -> Vec 4 Float
+Uniform :: forall a . String -> a
+'RasterContext :: Type -> PrimitiveType -> Type
+TriangleCtx :: forall a . CullMode -> PolygonMode a -> PolygonOffset -> ProvokingVertex -> RasterContext a 'Triangle
+PointCtx :: forall a . PointSize a -> Float -> PointSpriteCoordOrigin -> RasterContext a 'Point
+LineCtx :: forall a . Float -> ProvokingVertex -> RasterContext a 'Line
+'RasterContextCase :: forall a . forall (b :: forall (c :: PrimitiveType) -> RasterContext a c -> Type) -> (forall (d :: CullMode) (e :: PolygonMode a) (f :: PolygonOffset) (g :: ProvokingVertex) -> b 'Triangle ('TriangleCtx d e f g)) -> (forall (h :: PointSize a) (i :: Float) (j :: PointSpriteCoordOrigin) -> b 'Point ('PointCtx h i j)) -> (forall (k :: Float) (l :: ProvokingVertex) -> b 'Line ('LineCtx k l)) -> forall (m :: PrimitiveType) . forall (n :: RasterContext a m) -> b m n
+match'RasterContext :: forall (a :: Type -> Type) -> (forall b (c :: PrimitiveType) -> a (RasterContext b c)) -> forall d -> a d -> a d
 'Blending :: Type -> Type
-NoBlending :: forall a . 'Blending a
-BlendLogicOp :: forall a . 'Integral a => 'LogicOperation -> 'Blending a
-Blend :: ('BlendEquation, 'BlendEquation) -> (('BlendingFactor, 'BlendingFactor), ('BlendingFactor, 'BlendingFactor)) -> 'Vec 4 'Float -> 'Blending 'Float
-'BlendingCase :: forall (a :: forall b -> 'Blending b -> Type) -> (forall c . a c (NoBlending c)) -> (forall d (e :: 'Integral d) . forall (f :: 'LogicOperation) -> a d (BlendLogicOp d e f)) -> (forall (g :: ('BlendEquation, 'BlendEquation)) (h :: (('BlendingFactor, 'BlendingFactor), ('BlendingFactor, 'BlendingFactor))) (i :: 'Vec 4 'Float) -> a 'Float (Blend g h i)) -> forall j . forall (k :: 'Blending j) -> a j k
-match'Blending :: forall (a :: Type -> Type) -> (forall b -> a ('Blending b)) -> forall c -> a c -> a c
+NoBlending :: forall a . Blending a
+BlendLogicOp :: forall a . Integral a => LogicOperation -> Blending a
+Blend :: (BlendEquation, BlendEquation) -> ((BlendingFactor, BlendingFactor), (BlendingFactor, BlendingFactor)) -> Vec 4 Float -> Blending Float
+'BlendingCase :: forall (a :: forall b -> Blending b -> Type) -> (forall c . a c ('NoBlending c)) -> (forall d (e :: Integral d) . forall (f :: LogicOperation) -> a d ('BlendLogicOp d e f)) -> (forall (g :: (BlendEquation, BlendEquation)) (h :: ((BlendingFactor, BlendingFactor), (BlendingFactor, BlendingFactor))) (i :: Vec 4 Float) -> a Float ('Blend g h i)) -> forall j . forall (k :: Blending j) -> a j k
+match'Blending :: forall (a :: Type -> Type) -> (forall b -> a (Blending b)) -> forall c -> a c -> a c
 'StencilTests :: Type
-'StencilTestsCase :: forall (a :: 'StencilTests -> Type) (b :: 'StencilTests) -> a b
-match'StencilTests :: forall (a :: Type -> Type) -> a 'StencilTests -> forall b -> a b -> a b
+'StencilTestsCase :: forall (a :: StencilTests -> Type) (b :: StencilTests) -> a b
+match'StencilTests :: forall (a :: Type -> Type) -> a StencilTests -> forall b -> a b -> a b
 'StencilOps :: Type
-'StencilOpsCase :: forall (a :: 'StencilOps -> Type) (b :: 'StencilOps) -> a b
-match'StencilOps :: forall (a :: Type -> Type) -> a 'StencilOps -> forall b -> a b -> a b
-'FragmentOperation :: 'ImageKind -> Type
-ColorOp :: forall a (b :: 'Nat) . 'Num a => 'Blending a -> 'VecScalar b 'Bool -> 'FragmentOperation (Color ('VecScalar b a))
-DepthOp :: 'ComparisonFunction -> 'Bool -> 'FragmentOperation Depth
-StencilOp :: 'StencilTests -> 'StencilOps -> 'StencilOps -> 'FragmentOperation Stencil
-'FragmentOperationCase :: forall (a :: forall (b :: 'ImageKind) -> 'FragmentOperation b -> Type) -> (forall c (d :: 'Nat) (e :: 'Num c) . forall (f :: 'Blending c) (g :: 'VecScalar d 'Bool) -> a (Color ('VecScalar d c)) (ColorOp c d e f g)) -> (forall (h :: 'ComparisonFunction) (i :: 'Bool) -> a Depth (DepthOp h i)) -> (forall (j :: 'StencilTests) (k :: 'StencilOps) (l :: 'StencilOps) -> a Stencil (StencilOp j k l)) -> forall (m :: 'ImageKind) . forall (n :: 'FragmentOperation m) -> a m n
-match'FragmentOperation :: forall (a :: Type -> Type) -> (forall (b :: 'ImageKind) -> a ('FragmentOperation b)) -> forall c -> a c -> a c
+'StencilOpsCase :: forall (a :: StencilOps -> Type) (b :: StencilOps) -> a b
+match'StencilOps :: forall (a :: Type -> Type) -> a StencilOps -> forall b -> a b -> a b
+'FragmentOperation :: ImageKind -> Type
+ColorOp :: forall a (b :: Nat) . Num a => Blending a -> VecScalar b Bool -> FragmentOperation ('Color (VecScalar b a))
+DepthOp :: ComparisonFunction -> Bool -> FragmentOperation 'Depth
+StencilOp :: StencilTests -> StencilOps -> StencilOps -> FragmentOperation 'Stencil
+'FragmentOperationCase :: forall (a :: forall (b :: ImageKind) -> FragmentOperation b -> Type) -> (forall c (d :: Nat) (e :: Num c) . forall (f :: Blending c) (g :: VecScalar d Bool) -> a ('Color (VecScalar d c)) ('ColorOp c d e f g)) -> (forall (h :: ComparisonFunction) (i :: Bool) -> a 'Depth ('DepthOp h i)) -> (forall (j :: StencilTests) (k :: StencilOps) (l :: StencilOps) -> a 'Stencil ('StencilOp j k l)) -> forall (m :: ImageKind) . forall (n :: FragmentOperation m) -> a m n
+match'FragmentOperation :: forall (a :: Type -> Type) -> (forall (b :: ImageKind) -> a (FragmentOperation b)) -> forall c -> a c -> a c
 'Interpolated :: Type -> Type
-Smooth :: forall a . 'Floating a => 'Interpolated a
-NoPerspective :: forall a . 'Floating a => 'Interpolated a
-Flat :: forall a . 'Interpolated a
-'InterpolatedCase :: forall a . forall (b :: 'Interpolated a -> Type) -> (forall (c :: 'Floating a) . b (Smooth c)) -> (forall (d :: 'Floating a) . b (NoPerspective d)) -> b Flat -> forall (e :: 'Interpolated a) -> b e
-match'Interpolated :: forall (a :: Type -> Type) -> (forall b -> a ('Interpolated b)) -> forall c -> a c -> a c
-rasterizePrimitive :: forall (a :: 'List Type) (b :: 'List Type) (c :: 'List Type) (d :: 'PrimitiveType) . (map Type Type 'Interpolated a ~ b, c ~ Cons ('Vec 4 'Float) a) => 'HList b -> 'RasterContext ('HList c) d -> 'Primitive ('HList c) d -> 'FragmentStream 1 ('HList a)
-rasterizePrimitives :: forall (a :: 'List Type) (b :: 'PrimitiveType) . 'RasterContext ('HList (Cons ('Vec 4 'Float) a)) b -> 'HList (map Type Type 'Interpolated a) -> 'List ('Primitive ('HList (Cons ('Vec 4 'Float) a)) b) -> 'List ('Vector 1 ('Maybe ('SimpleFragment ('HList a))))
-'ImageLC :: Type -> 'Nat
-allSame :: forall a . 'List a -> Type
-sameLayerCounts :: 'List Type -> Type
-'FrameBuffer :: 'Nat -> 'List 'ImageKind -> Type
-'FrameBufferCase :: forall (a :: 'Nat) (b :: 'List 'ImageKind) . forall (c :: 'FrameBuffer a b -> Type) (d :: 'FrameBuffer a b) -> c d
-match'FrameBuffer :: forall (a :: Type -> Type) -> (forall (b :: 'Nat) (c :: 'List 'ImageKind) -> a ('FrameBuffer b c)) -> forall d -> a d -> a d
-imageType' :: 'List 'ImageKind -> 'List Type
-'FragmentOperationKind :: Type -> 'ImageKind
-Accumulate :: forall (a :: 'List 'ImageKind) (b :: 'Nat) (c :: 'List Type) . (a ~ map Type 'ImageKind 'FragmentOperationKind c) => 'HList c -> 'FragmentStream b ('HList (imageType' a)) -> 'FrameBuffer b a -> 'FrameBuffer b a
+Smooth :: forall a . Floating a => Interpolated a
+NoPerspective :: forall a . Floating a => Interpolated a
+Flat :: forall a . Interpolated a
+'InterpolatedCase :: forall a . forall (b :: Interpolated a -> Type) -> (forall (c :: Floating a) . b ('Smooth c)) -> (forall (d :: Floating a) . b ('NoPerspective d)) -> b 'Flat -> forall (e :: Interpolated a) -> b e
+match'Interpolated :: forall (a :: Type -> Type) -> (forall b -> a (Interpolated b)) -> forall c -> a c -> a c
+rasterizePrimitive :: forall (a :: List Type) (b :: List Type) (c :: List Type) (d :: PrimitiveType) . (map Type Type Interpolated a ~ b, c ~ 'Cons (Vec 4 Float) a) => HList b -> RasterContext (HList c) d -> Primitive (HList c) d -> FragmentStream 1 (HList a)
+rasterizePrimitives :: forall (a :: List Type) (b :: PrimitiveType) . RasterContext (HList ('Cons (Vec 4 Float) a)) b -> HList (map Type Type Interpolated a) -> List (Primitive (HList ('Cons (Vec 4 Float) a)) b) -> List (Vector 1 (Maybe (SimpleFragment (HList a))))
+'ImageLC :: Type -> Nat
+allSame :: forall a . List a -> Type
+sameLayerCounts :: List Type -> Type
+'FrameBuffer :: Nat -> List ImageKind -> Type
+'FrameBufferCase :: forall (a :: Nat) (b :: List ImageKind) . forall (c :: FrameBuffer a b -> Type) (d :: FrameBuffer a b) -> c d
+match'FrameBuffer :: forall (a :: Type -> Type) -> (forall (b :: Nat) (c :: List ImageKind) -> a (FrameBuffer b c)) -> forall d -> a d -> a d
+imageType' :: List ImageKind -> List Type
+'FragmentOperationKind :: Type -> ImageKind
+Accumulate :: forall (a :: List ImageKind) (b :: Nat) (c :: List Type) . (a ~ map Type ImageKind FragmentOperationKind c) => HList c -> FragmentStream b (HList (imageType' a)) -> FrameBuffer b a -> FrameBuffer b a
 accumulateWith :: forall a b . a -> b -> (a, b)
-overlay :: forall (a :: 'Nat) (b :: 'List Type) . 'FrameBuffer a (map Type 'ImageKind 'FragmentOperationKind b) -> ('HList b, 'List ('Fragment a ('HList (imageType' (map Type 'ImageKind 'FragmentOperationKind b))))) -> 'FrameBuffer a (map Type 'ImageKind 'FragmentOperationKind b)
-'GetImageKind :: Type -> 'ImageKind
-FrameBuffer :: forall (a :: 'List Type) . sameLayerCounts a => 'HList a -> 'FrameBuffer ('ImageLC (head Type a)) (map Type 'ImageKind 'GetImageKind a)
-imageFrame :: forall (a :: 'List Type) . sameLayerCounts a => 'HList a -> 'FrameBuffer ('ImageLC (head Type a)) (map Type 'ImageKind 'GetImageKind a)
-accumulate :: forall (a :: 'Nat) (b :: 'List Type) c . 'HList b -> (c -> 'HList (imageType' (map Type 'ImageKind 'FragmentOperationKind b))) -> 'List ('Vector a ('Maybe ('SimpleFragment c))) -> 'FrameBuffer a (map Type 'ImageKind 'FragmentOperationKind b) -> 'FrameBuffer a (map Type 'ImageKind 'FragmentOperationKind b)
-PrjImage :: forall (a :: 'ImageKind) . 'FrameBuffer 1 (Cons a Nil) -> 'Image 1 a
-PrjImageColor :: 'FrameBuffer 1 (Cons Depth (Cons (Color ('Vec 4 'Float)) Nil)) -> 'Image 1 (Color ('Vec 4 'Float))
+overlay :: forall (a :: Nat) (b :: List Type) . FrameBuffer a (map Type ImageKind FragmentOperationKind b) -> (HList b, List (Fragment a (HList (imageType' (map Type ImageKind FragmentOperationKind b))))) -> FrameBuffer a (map Type ImageKind FragmentOperationKind b)
+'GetImageKind :: Type -> ImageKind
+FrameBuffer :: forall (a :: List Type) . sameLayerCounts a => HList a -> FrameBuffer (ImageLC (head Type a)) (map Type ImageKind GetImageKind a)
+imageFrame :: forall (a :: List Type) . sameLayerCounts a => HList a -> FrameBuffer (ImageLC (head Type a)) (map Type ImageKind GetImageKind a)
+accumulate :: forall (a :: Nat) (b :: List Type) c . HList b -> (c -> HList (imageType' (map Type ImageKind FragmentOperationKind b))) -> List (Vector a (Maybe (SimpleFragment c))) -> FrameBuffer a (map Type ImageKind FragmentOperationKind b) -> FrameBuffer a (map Type ImageKind FragmentOperationKind b)
+PrjImage :: forall (a :: ImageKind) . FrameBuffer 1 ('Cons a 'Nil) -> Image 1 a
+PrjImageColor :: FrameBuffer 1 ('Cons 'Depth ('Cons ('Color (Vec 4 Float)) 'Nil)) -> Image 1 ('Color (Vec 4 Float))
 'Output :: Type
-ScreenOut :: forall (a :: 'Nat) (b :: 'List 'ImageKind) . 'FrameBuffer a b -> 'Output
-'OutputCase :: forall (a :: 'Output -> Type) -> (forall (b :: 'Nat) (c :: 'List 'ImageKind) . forall (d :: 'FrameBuffer b c) -> a (ScreenOut b c d)) -> forall (e :: 'Output) -> a e
-match'Output :: forall (a :: Type -> Type) -> a 'Output -> forall b -> a b -> a b
-renderFrame :: forall (a :: 'Nat) (b :: 'List 'ImageKind) . 'FrameBuffer a b -> 'Output
+ScreenOut :: forall (a :: Nat) (b :: List ImageKind) . FrameBuffer a b -> Output
+'OutputCase :: forall (a :: Output -> Type) -> (forall (b :: Nat) (c :: List ImageKind) . forall (d :: FrameBuffer b c) -> a ('ScreenOut b c d)) -> forall (e :: Output) -> a e
+match'Output :: forall (a :: Type -> Type) -> a Output -> forall b -> a b -> a b
+renderFrame :: forall (a :: Nat) (b :: List ImageKind) . FrameBuffer a b -> Output
 'Texture :: Type
-Texture2DSlot :: 'String -> 'Texture
-Texture2D :: 'Vec 2 'Int -> 'Image 1 (Color ('Vec 4 'Float)) -> 'Texture
-'TextureCase :: forall (a :: 'Texture -> Type) -> (forall (b :: 'String) -> a (Texture2DSlot b)) -> (forall (c :: 'Vec 2 'Int) (d :: 'Image 1 (Color ('Vec 4 'Float))) -> a (Texture2D c d)) -> forall (e :: 'Texture) -> a e
-match'Texture :: forall (a :: Type -> Type) -> a 'Texture -> forall b -> a b -> a b
+Texture2DSlot :: String -> Texture
+Texture2D :: Vec 2 Int -> Image 1 ('Color (Vec 4 Float)) -> Texture
+'TextureCase :: forall (a :: Texture -> Type) -> (forall (b :: String) -> a ('Texture2DSlot b)) -> (forall (c :: Vec 2 Int) (d :: Image 1 ('Color (Vec 4 Float))) -> a ('Texture2D c d)) -> forall (e :: Texture) -> a e
+match'Texture :: forall (a :: Type -> Type) -> a Texture -> forall b -> a b -> a b
 'Filter :: Type
-PointFilter :: 'Filter
-LinearFilter :: 'Filter
-'FilterCase :: forall (a :: 'Filter -> Type) -> a PointFilter -> a LinearFilter -> forall (b :: 'Filter) -> a b
-match'Filter :: forall (a :: Type -> Type) -> a 'Filter -> forall b -> a b -> a b
+PointFilter :: Filter
+LinearFilter :: Filter
+'FilterCase :: forall (a :: Filter -> Type) -> a 'PointFilter -> a 'LinearFilter -> forall (b :: Filter) -> a b
+match'Filter :: forall (a :: Type -> Type) -> a Filter -> forall b -> a b -> a b
 'EdgeMode :: Type
-Repeat :: 'EdgeMode
-MirroredRepeat :: 'EdgeMode
-ClampToEdge :: 'EdgeMode
-'EdgeModeCase :: forall (a :: 'EdgeMode -> Type) -> a Repeat -> a MirroredRepeat -> a ClampToEdge -> forall (b :: 'EdgeMode) -> a b
-match'EdgeMode :: forall (a :: Type -> Type) -> a 'EdgeMode -> forall b -> a b -> a b
+Repeat :: EdgeMode
+MirroredRepeat :: EdgeMode
+ClampToEdge :: EdgeMode
+'EdgeModeCase :: forall (a :: EdgeMode -> Type) -> a 'Repeat -> a 'MirroredRepeat -> a 'ClampToEdge -> forall (b :: EdgeMode) -> a b
+match'EdgeMode :: forall (a :: Type -> Type) -> a EdgeMode -> forall b -> a b -> a b
 'Sampler :: Type
-Sampler :: 'Filter -> 'EdgeMode -> 'Texture -> 'Sampler
-'SamplerCase :: forall (a :: 'Sampler -> Type) -> (forall (b :: 'Filter) (c :: 'EdgeMode) (d :: 'Texture) -> a (Sampler b c d)) -> forall (e :: 'Sampler) -> a e
-match'Sampler :: forall (a :: Type -> Type) -> a 'Sampler -> forall b -> a b -> a b
-texture2D :: 'Sampler -> 'Vec 2 'Float -> 'Vec 4 'Float
+Sampler :: Filter -> EdgeMode -> Texture -> Sampler
+'SamplerCase :: forall (a :: Sampler -> Type) -> (forall (b :: Filter) (c :: EdgeMode) (d :: Texture) -> a ('Sampler b c d)) -> forall (e :: Sampler) -> a e
+match'Sampler :: forall (a :: Type -> Type) -> a Sampler -> forall b -> a b -> a b
+texture2D :: Sampler -> Vec 2 Float -> Vec 4 Float
 accumulationContext :: forall a . a -> a
 ------------ tooltips
 testdata/Builtins.lc 10:1-10:3  forall a . a -> a
@@ -2028,7 +2028,7 @@ testdata/Builtins.lc 253:24-253:38  Primitive _g _a -> Primitive _f _a
 testdata/Builtins.lc 253:37-253:38  _i -> _h
 testdata/Builtins.lc 255:30-255:38  Type -> Type
 testdata/Builtins.lc 255:45-255:46  Type | Type -> Type
-testdata/Builtins.lc 260:1-260:12  forall (a :: PrimitiveType) (b :: List Type) (c :: List Type) . (b ~ 'map Type Type ListElem c) => HList c -> PrimitiveStream a (HList b)
+testdata/Builtins.lc 260:1-260:12  forall (a :: PrimitiveType) (b :: List Type) (c :: List Type) . (b ~ map Type Type ListElem c) => HList c -> PrimitiveStream a (HList b)
 testdata/Builtins.lc 260:32-260:119  Type
 testdata/Builtins.lc 260:56-260:57  _e
 testdata/Builtins.lc 260:56-260:59  _d -> Type
@@ -2068,7 +2068,7 @@ testdata/Builtins.lc 264:1-264:10  forall a . String -> a
 testdata/Builtins.lc 264:14-264:20  Type
 testdata/Builtins.lc 264:14-264:25  Type
 testdata/Builtins.lc 264:24-264:25  Type | _c
-testdata/Builtins.lc 266:1-266:12  forall (a :: PrimitiveType) (b :: List Type) . String -> forall (c :: List String) -> ('len String c ~ 'len Type b) => PrimitiveStream a (HList b)
+testdata/Builtins.lc 266:1-266:12  forall (a :: PrimitiveType) (b :: List Type) . String -> forall (c :: List String) -> (len String c ~ len Type b) => PrimitiveStream a (HList b)
 testdata/Builtins.lc 266:31-266:37  Type
 testdata/Builtins.lc 266:31-266:123  Type
 testdata/Builtins.lc 266:32-266:36  Type
@@ -2655,7 +2655,7 @@ testdata/Builtins.lc 478:3-478:7  Interpolated _d | forall a . Interpolated a
 testdata/Builtins.lc 478:42-478:54  Type -> Type
 testdata/Builtins.lc 478:42-478:56  Type
 testdata/Builtins.lc 478:55-478:56  Type
-testdata/Builtins.lc 480:1-480:19  forall (a :: List Type) (b :: List Type) (c :: List Type) (d :: PrimitiveType) . ('map Type Type Interpolated a ~ b, c ~ 'Cons (Vec 4 Float) a) => HList b -> RasterContext (HList c) d -> Primitive (HList c) d -> FragmentStream 1 (HList a)
+testdata/Builtins.lc 480:1-480:19  forall (a :: List Type) (b :: List Type) (c :: List Type) (d :: PrimitiveType) . (map Type Type Interpolated a ~ b, c ~ 'Cons (Vec 4 Float) a) => HList b -> RasterContext (HList c) d -> Primitive (HList c) d -> FragmentStream 1 (HList a)
 testdata/Builtins.lc 481:8-486:34  Type
 testdata/Builtins.lc 481:10-481:13  forall a b . (a -> b) -> List a -> List b
 testdata/Builtins.lc 481:10-481:26  List Type -> List Type
@@ -2707,13 +2707,13 @@ testdata/Builtins.lc 486:23-486:24  _b
 testdata/Builtins.lc 486:26-486:31  List Type -> Type
 testdata/Builtins.lc 486:26-486:33  Type
 testdata/Builtins.lc 486:32-486:33  List Type
-testdata/Builtins.lc 488:1-488:20  forall (a :: List Type) (b :: PrimitiveType) . RasterContext (HList ('Cons (Vec 4 Float) a)) b -> HList ('map Type Type Interpolated a) -> List (Primitive (HList ('Cons (Vec 4 Float) a)) b) -> List (Vector 1 (Maybe (SimpleFragment (HList a))))
+testdata/Builtins.lc 488:1-488:20  forall (a :: List Type) (b :: PrimitiveType) . RasterContext (HList ('Cons (Vec 4 Float) a)) b -> HList (map Type Type Interpolated a) -> List (Primitive (HList ('Cons (Vec 4 Float) a)) b) -> List (Vector 1 (Maybe (SimpleFragment (HList a))))
 testdata/Builtins.lc 488:32-488:38  forall a . List (List a) -> List a
 testdata/Builtins.lc 488:32-488:74  List (Vector 1 (Maybe (SimpleFragment (HList _b))))
 testdata/Builtins.lc 488:40-488:43  forall a b . (a -> b) -> List a -> List b
 testdata/Builtins.lc 488:40-488:71  List (Primitive (HList ('Cons (Vec 4 Float) _b)) _a) -> List (List (Fragment 1 (HList _b)))
 testdata/Builtins.lc 488:40-488:73  List (List (Fragment 1 (HList _b)))
-testdata/Builtins.lc 488:45-488:63  forall (a :: List Type) (b :: List Type) (c :: List Type) (d :: PrimitiveType) . ('map Type Type Interpolated a ~ b, c ~ 'Cons (Vec 4 Float) a) => HList b -> RasterContext (HList c) d -> Primitive (HList c) d -> FragmentStream 1 (HList a)
+testdata/Builtins.lc 488:45-488:63  forall (a :: List Type) (b :: List Type) (c :: List Type) (d :: PrimitiveType) . (map Type Type Interpolated a ~ b, c ~ 'Cons (Vec 4 Float) a) => HList b -> RasterContext (HList c) d -> Primitive (HList c) d -> FragmentStream 1 (HList a)
 testdata/Builtins.lc 488:45-488:66  RasterContext (HList ('Cons (Vec 4 Float) _b)) _a -> Primitive (HList ('Cons (Vec 4 Float) _b)) _a -> FragmentStream 1 (HList _b)
 testdata/Builtins.lc 488:45-488:70  Primitive (HList ('Cons (Vec 4 Float) _b)) _a -> FragmentStream 1 (HList _b)
 testdata/Builtins.lc 488:64-488:66  _i
@@ -2779,7 +2779,7 @@ 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:102-515:103  ImageKind | ImageKind -> ImageKind | Type -> ImageKind
-testdata/Builtins.lc 517:1-517:11  forall (a :: List ImageKind) (b :: Nat) (c :: List Type) . (a ~ 'map Type ImageKind FragmentOperationKind c) => HList c -> FragmentStream b (HList ('imageType' a)) -> FrameBuffer b a -> FrameBuffer b a
+testdata/Builtins.lc 517:1-517:11  forall (a :: List ImageKind) (b :: Nat) (c :: List Type) . (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
 testdata/Builtins.lc 517:39-517:45  Type
@@ -2824,18 +2824,18 @@ testdata/Builtins.lc 519:1-519:15  forall a b . a -> b -> (a, b)
 testdata/Builtins.lc 519:24-519:32  (_d, _b)
 testdata/Builtins.lc 519:25-519:28  _f
 testdata/Builtins.lc 519:30-519:31  ((_b)) | _e
-testdata/Builtins.lc 520:1-520:8  forall (a :: Nat) (b :: List Type) . FrameBuffer a ('map Type ImageKind FragmentOperationKind b) -> (HList b, List (Fragment a (HList ('imageType' ('map Type ImageKind FragmentOperationKind b))))) -> FrameBuffer a ('map Type ImageKind FragmentOperationKind b)
-testdata/Builtins.lc 520:25-520:35  forall (a :: List ImageKind) (b :: Nat) (c :: List Type) . (a ~ 'map Type ImageKind FragmentOperationKind c) => HList c -> FragmentStream b (HList ('imageType' a)) -> FrameBuffer b a -> FrameBuffer b a
-testdata/Builtins.lc 520:25-520:39  FragmentStream _b (HList ('imageType' ('map Type ImageKind FragmentOperationKind _a))) -> FrameBuffer _b ('map Type ImageKind FragmentOperationKind _a) -> FrameBuffer _b ('map Type ImageKind FragmentOperationKind _a)
-testdata/Builtins.lc 520:25-520:43  FrameBuffer _b ('map Type ImageKind FragmentOperationKind _a) -> FrameBuffer _b ('map Type ImageKind FragmentOperationKind _a)
-testdata/Builtins.lc 520:25-520:46  FrameBuffer _b ('map Type ImageKind FragmentOperationKind _a) | HList _c -> _b | _c -> HList _b -> _a
+testdata/Builtins.lc 520:1-520:8  forall (a :: Nat) (b :: List Type) . FrameBuffer a (map Type ImageKind FragmentOperationKind b) -> (HList b, List (Fragment a (HList (imageType' (map Type ImageKind FragmentOperationKind b))))) -> FrameBuffer a (map Type ImageKind FragmentOperationKind b)
+testdata/Builtins.lc 520:25-520:35  forall (a :: List ImageKind) (b :: Nat) (c :: List Type) . (a ~ map Type ImageKind FragmentOperationKind c) => HList c -> FragmentStream b (HList (imageType' a)) -> FrameBuffer b a -> FrameBuffer b a
+testdata/Builtins.lc 520:25-520:39  FragmentStream _b (HList (imageType' (map Type ImageKind FragmentOperationKind _a))) -> FrameBuffer _b (map Type ImageKind FragmentOperationKind _a) -> FrameBuffer _b (map Type ImageKind FragmentOperationKind _a)
+testdata/Builtins.lc 520:25-520:43  FrameBuffer _b (map Type ImageKind FragmentOperationKind _a) -> FrameBuffer _b (map Type ImageKind FragmentOperationKind _a)
+testdata/Builtins.lc 520:25-520:46  FrameBuffer _b (map Type ImageKind FragmentOperationKind _a) | HList _c -> _b | _c -> HList _b -> _a
 testdata/Builtins.lc 520:36-520:39  _m
 testdata/Builtins.lc 520:40-520:43  _h
 testdata/Builtins.lc 520:44-520:46  _n
 testdata/Builtins.lc 524:31-524:40  Type
 testdata/Builtins.lc 524:47-524:59  Type -> ImageKind
 testdata/Builtins.lc 524:74-524:75  ImageKind | ImageKind -> ImageKind | Nat -> ImageKind -> ImageKind | Type -> ImageKind
-testdata/Builtins.lc 530:1-530:12  forall (a :: List Type) . 'sameLayerCounts a => HList a -> FrameBuffer (ImageLC ('head Type a)) ('map Type ImageKind GetImageKind a)
+testdata/Builtins.lc 530:1-530:12  forall (a :: List Type) . 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
 testdata/Builtins.lc 530:40-530:125  Type
@@ -2859,17 +2859,17 @@ testdata/Builtins.lc 530:106-530:122  List Type -> List ImageKind
 testdata/Builtins.lc 530:106-530:124  List ImageKind
 testdata/Builtins.lc 530:110-530:122  Type -> ImageKind
 testdata/Builtins.lc 530:123-530:124  List Type
-testdata/Builtins.lc 532:1-532:11  forall (a :: List Type) . 'sameLayerCounts a => HList a -> FrameBuffer (ImageLC ('head Type a)) ('map Type ImageKind GetImageKind a)
-testdata/Builtins.lc 532:14-532:25  forall (a :: List Type) . 'sameLayerCounts a => HList a -> FrameBuffer (ImageLC ('head Type a)) ('map Type ImageKind GetImageKind a)
-testdata/Builtins.lc 534:1-534:11  forall (a :: Nat) (b :: List Type) c . HList b -> (c -> HList ('imageType' ('map Type ImageKind FragmentOperationKind b))) -> List (Vector a (Maybe (SimpleFragment c))) -> FrameBuffer a ('map Type ImageKind FragmentOperationKind b) -> FrameBuffer a ('map Type ImageKind FragmentOperationKind b)
-testdata/Builtins.lc 534:34-534:44  forall (a :: List ImageKind) (b :: Nat) (c :: List Type) . (a ~ 'map Type ImageKind FragmentOperationKind c) => HList c -> FragmentStream b (HList ('imageType' a)) -> FrameBuffer b a -> FrameBuffer b a
-testdata/Builtins.lc 534:34-534:48  FragmentStream _b (HList ('imageType' ('map Type ImageKind FragmentOperationKind _a))) -> FrameBuffer _b ('map Type ImageKind FragmentOperationKind _a) -> FrameBuffer _b ('map Type ImageKind FragmentOperationKind _a)
-testdata/Builtins.lc 534:34-534:76  FrameBuffer _c ('map Type ImageKind FragmentOperationKind _b) -> FrameBuffer _c ('map Type ImageKind FragmentOperationKind _b)
-testdata/Builtins.lc 534:34-534:79  FrameBuffer _c ('map Type ImageKind FragmentOperationKind _b)
+testdata/Builtins.lc 532:1-532:11  forall (a :: List Type) . sameLayerCounts a => HList a -> FrameBuffer (ImageLC (head Type a)) (map Type ImageKind GetImageKind a)
+testdata/Builtins.lc 532:14-532:25  forall (a :: List Type) . sameLayerCounts a => HList a -> FrameBuffer (ImageLC (head Type a)) (map Type ImageKind GetImageKind a)
+testdata/Builtins.lc 534:1-534:11  forall (a :: Nat) (b :: List Type) c . HList b -> (c -> HList (imageType' (map Type ImageKind FragmentOperationKind b))) -> List (Vector a (Maybe (SimpleFragment c))) -> FrameBuffer a (map Type ImageKind FragmentOperationKind b) -> FrameBuffer a (map Type ImageKind FragmentOperationKind b)
+testdata/Builtins.lc 534:34-534:44  forall (a :: List ImageKind) (b :: Nat) (c :: List Type) . (a ~ map Type ImageKind FragmentOperationKind c) => HList c -> FragmentStream b (HList (imageType' a)) -> FrameBuffer b a -> FrameBuffer b a
+testdata/Builtins.lc 534:34-534:48  FragmentStream _b (HList (imageType' (map Type ImageKind FragmentOperationKind _a))) -> FrameBuffer _b (map Type ImageKind FragmentOperationKind _a) -> FrameBuffer _b (map Type ImageKind FragmentOperationKind _a)
+testdata/Builtins.lc 534:34-534:76  FrameBuffer _c (map Type ImageKind FragmentOperationKind _b) -> FrameBuffer _c (map Type ImageKind FragmentOperationKind _b)
+testdata/Builtins.lc 534:34-534:79  FrameBuffer _c (map Type ImageKind FragmentOperationKind _b)
 testdata/Builtins.lc 534:45-534:48  _j
 testdata/Builtins.lc 534:50-534:62  forall a b (c :: Nat) . (a -> b) -> List (Vector c (Maybe (SimpleFragment a))) -> List (Vector c (Maybe (SimpleFragment b)))
 testdata/Builtins.lc 534:50-534:70  List (Vector _a (Maybe (SimpleFragment _c))) -> List (Vector _a (Maybe (SimpleFragment _b)))
-testdata/Builtins.lc 534:50-534:75  List (Vector _c (Maybe (SimpleFragment (HList ('imageType' ('map Type ImageKind FragmentOperationKind _b))))))
+testdata/Builtins.lc 534:50-534:75  List (Vector _c (Maybe (SimpleFragment (HList (imageType' (map Type ImageKind FragmentOperationKind _b))))))
 testdata/Builtins.lc 534:63-534:70  _k
 testdata/Builtins.lc 534:71-534:75  _g
 testdata/Builtins.lc 534:77-534:79  _e
diff --git a/testdata/Internals.out b/testdata/Internals.out
index 06c09de3..af664ddd 100644
--- a/testdata/Internals.out
+++ b/testdata/Internals.out
@@ -5,86 +5,86 @@ parens :: forall a . a -> a
 undefined :: forall a . a
 primFix :: forall a . (a -> a) -> a
 'Unit :: Type
-TT :: 'Unit
-'UnitCase :: forall (a :: 'Unit -> Type) -> a TT -> forall (b :: 'Unit) -> a b
-match'Unit :: forall (a :: Type -> Type) -> a 'Unit -> forall b -> a b -> a b
+TT :: Unit
+'UnitCase :: forall (a :: Unit -> Type) -> a 'TT -> forall (b :: Unit) -> a b
+match'Unit :: forall (a :: Type -> Type) -> a Unit -> forall b -> a b -> a b
 'String :: Type
-'StringCase :: forall (a :: 'String -> Type) (b :: 'String) -> a b
-match'String :: forall (a :: Type -> Type) -> a 'String -> forall b -> a b -> a b
-'Empty :: 'String -> Type
-'EmptyCase :: forall (a :: 'String) . forall (b :: 'Empty a -> Type) (c :: 'Empty a) -> b c
-match'Empty :: forall (a :: Type -> Type) -> (forall (b :: 'String) -> a ('Empty b)) -> forall c -> a c -> a c
+'StringCase :: forall (a :: String -> Type) (b :: String) -> a b
+match'String :: forall (a :: Type -> Type) -> a String -> forall b -> a b -> a b
+'Empty :: String -> Type
+'EmptyCase :: forall (a :: String) . forall (b :: Empty a -> Type) (c :: Empty a) -> b c
+match'Empty :: forall (a :: Type -> Type) -> (forall (b :: String) -> a (Empty b)) -> forall c -> a c -> a c
 unsafeCoerce :: forall a b . a -> b
 'EqCT :: forall a -> a -> a -> Type
 parEval :: forall a -> a -> a -> a
 'T2 :: Type -> Type -> Type
 match'Type :: forall (a :: Type -> Type) -> a Type -> forall b -> a b -> a b
 'EqCTt :: forall a . a -> a -> Type
-t2C :: 'Unit -> 'Unit -> 'Unit
+t2C :: Unit -> Unit -> Unit
 'Int :: Type
-'IntCase :: forall (a :: 'Int -> Type) (b :: 'Int) -> a b
-match'Int :: forall (a :: Type -> Type) -> a 'Int -> forall b -> a b -> a b
+'IntCase :: forall (a :: Int -> Type) (b :: Int) -> a b
+match'Int :: forall (a :: Type -> Type) -> a Int -> forall b -> a b -> a b
 'Word :: Type
-'WordCase :: forall (a :: 'Word -> Type) (b :: 'Word) -> a b
-match'Word :: forall (a :: Type -> Type) -> a 'Word -> forall b -> a b -> a b
+'WordCase :: forall (a :: Word -> Type) (b :: Word) -> a b
+match'Word :: forall (a :: Type -> Type) -> a Word -> forall b -> a b -> a b
 'Float :: Type
-'FloatCase :: forall (a :: 'Float -> Type) (b :: 'Float) -> a b
-match'Float :: forall (a :: Type -> Type) -> a 'Float -> forall b -> a b -> a b
+'FloatCase :: forall (a :: Float -> Type) (b :: Float) -> a b
+match'Float :: forall (a :: Type -> Type) -> a Float -> forall b -> a b -> a b
 'Char :: Type
-'CharCase :: forall (a :: 'Char -> Type) (b :: 'Char) -> a b
-match'Char :: forall (a :: Type -> Type) -> a 'Char -> forall b -> a b -> a b
+'CharCase :: forall (a :: Char -> Type) (b :: Char) -> a b
+match'Char :: forall (a :: Type -> Type) -> a Char -> forall b -> a b -> a b
 'Bool :: Type
-False :: 'Bool
-True :: 'Bool
-'BoolCase :: forall (a :: 'Bool -> Type) -> a False -> a True -> forall (b :: 'Bool) -> a b
-match'Bool :: forall (a :: Type -> Type) -> a 'Bool -> forall b -> a b -> a b
+False :: Bool
+True :: Bool
+'BoolCase :: forall (a :: Bool -> Type) -> a 'False -> a 'True -> forall (b :: Bool) -> a b
+match'Bool :: forall (a :: Type -> Type) -> a Bool -> forall b -> a b -> a b
 'Ordering :: Type
-LT :: 'Ordering
-EQ :: 'Ordering
-GT :: 'Ordering
-'OrderingCase :: forall (a :: 'Ordering -> Type) -> a LT -> a EQ -> a GT -> forall (b :: 'Ordering) -> a b
-match'Ordering :: forall (a :: Type -> Type) -> a 'Ordering -> forall b -> a b -> a b
+LT :: Ordering
+EQ :: Ordering
+GT :: Ordering
+'OrderingCase :: forall (a :: Ordering -> Type) -> a 'LT -> a 'EQ -> a 'GT -> forall (b :: Ordering) -> a b
+match'Ordering :: forall (a :: Type -> Type) -> a Ordering -> forall b -> a b -> a b
 'Nat :: Type
-Zero :: 'Nat
-Succ :: 'Nat -> 'Nat
-'NatCase :: forall (a :: 'Nat -> Type) -> a 0 -> (forall (b :: 'Nat) -> a (Succ b)) -> forall (c :: 'Nat) -> a c
-match'Nat :: forall (a :: Type -> Type) -> a 'Nat -> forall b -> a b -> a b
-primIntToWord :: 'Int -> 'Word
-primIntToFloat :: 'Int -> 'Float
-primIntToNat :: 'Int -> 'Nat
-primCompareInt :: 'Int -> 'Int -> 'Ordering
-primCompareWord :: 'Word -> 'Word -> 'Ordering
-primCompareFloat :: 'Float -> 'Float -> 'Ordering
-primCompareChar :: 'Char -> 'Char -> 'Ordering
-primCompareString :: 'String -> 'String -> 'Ordering
-primNegateInt :: 'Int -> 'Int
-primNegateWord :: 'Word -> 'Word
-primNegateFloat :: 'Float -> 'Float
-primAddInt :: 'Int -> 'Int -> 'Int
-primSubInt :: 'Int -> 'Int -> 'Int
-primModInt :: 'Int -> 'Int -> 'Int
-primSqrtFloat :: 'Float -> 'Float
-primRound :: 'Float -> 'Int
-primIfThenElse :: forall a . 'Bool -> a -> a -> a
-isEQ :: 'Ordering -> 'Bool
+Zero :: Nat
+Succ :: Nat -> Nat
+'NatCase :: forall (a :: Nat -> Type) -> a 0 -> (forall (b :: Nat) -> a ('Succ b)) -> forall (c :: Nat) -> a c
+match'Nat :: forall (a :: Type -> Type) -> a Nat -> forall b -> a b -> a b
+primIntToWord :: Int -> Word
+primIntToFloat :: Int -> Float
+primIntToNat :: Int -> Nat
+primCompareInt :: Int -> Int -> Ordering
+primCompareWord :: Word -> Word -> Ordering
+primCompareFloat :: Float -> Float -> Ordering
+primCompareChar :: Char -> Char -> Ordering
+primCompareString :: String -> String -> Ordering
+primNegateInt :: Int -> Int
+primNegateWord :: Word -> Word
+primNegateFloat :: Float -> Float
+primAddInt :: Int -> Int -> Int
+primSubInt :: Int -> Int -> Int
+primModInt :: Int -> Int -> Int
+primSqrtFloat :: Float -> Float
+primRound :: Float -> Int
+primIfThenElse :: forall a . Bool -> a -> a -> a
+isEQ :: Ordering -> Bool
 'Num :: Type -> Type
-fromInt :: forall a . 'Num a => 'Int -> a
-compare :: forall a . 'Num a => a -> a -> 'Ordering
-negate :: forall a . 'Num a => a -> a
+fromInt :: forall a . Num a => Int -> a
+compare :: forall a . Num a => a -> a -> Ordering
+negate :: forall a . Num a => a -> a
 'Eq :: Type -> Type
-== :: forall a . 'Eq a => a -> a -> 'Bool
+== :: forall a . Eq a => a -> a -> Bool
 'List :: Type -> Type
-Nil :: forall a . 'List a
-Cons :: forall a . a -> 'List a -> 'List a
-'ListCase :: forall a . forall (b :: 'List a -> Type) -> b Nil -> (forall (c :: a) (d :: 'List a) -> b (Cons c d)) -> forall (e :: 'List a) -> b e
-match'List :: forall (a :: Type -> Type) -> (forall b -> a ('List b)) -> forall c -> a c -> a c
-'HList :: 'List Type -> Type
+Nil :: forall a . List a
+Cons :: forall a . a -> List a -> List a
+'ListCase :: forall a . forall (b :: List a -> Type) -> b 'Nil -> (forall (c :: a) (d :: List a) -> b ('Cons c d)) -> forall (e :: List a) -> b e
+match'List :: forall (a :: Type -> Type) -> (forall b -> a (List b)) -> forall c -> a c -> a c
+'HList :: List Type -> Type
 HNil :: ()
-HCons :: forall a (b :: 'List Type) . a -> 'HList b -> 'HList (Cons a b)
-'HListCase :: forall (a :: forall (b :: 'List Type) -> 'HList b -> Type) -> a Nil () -> (forall c (d :: 'List Type) . forall (e :: c) (f :: 'HList d) -> a (Cons c d) (HCons c d e f)) -> forall (g :: 'List Type) . forall (h :: 'HList g) -> a g h
-match'HList :: forall (a :: Type -> Type) -> (forall (b :: 'List Type) -> a ('HList b)) -> forall c -> a c -> a c
+HCons :: forall a (b :: List Type) . a -> HList b -> HList ('Cons a b)
+'HListCase :: forall (a :: forall (b :: List Type) -> HList b -> Type) -> a 'Nil () -> (forall c (d :: List Type) . forall (e :: c) (f :: HList d) -> a ('Cons c d) ('HCons c d e f)) -> forall (g :: List Type) . forall (h :: HList g) -> a g h
+match'HList :: forall (a :: Type -> Type) -> (forall (b :: List Type) -> a (HList b)) -> forall c -> a c -> a c
 hlistNilCase :: forall a -> a -> () -> a
-hlistConsCase :: forall a (b :: 'List Type) . forall c -> (a -> 'HList b -> c) -> 'HList (Cons a b) -> c
+hlistConsCase :: forall a (b :: List Type) . forall c -> (a -> HList b -> c) -> HList ('Cons a b) -> c
 ------------ tooltips
 testdata/Internals.lc 6:1-6:8  forall a . a -> a
 testdata/Internals.lc 6:13-6:14  _b
diff --git a/testdata/Material.out b/testdata/Material.out
index c819ce60..28b5cfa3 100644
--- a/testdata/Material.out
+++ b/testdata/Material.out
@@ -1,161 +1,161 @@
 main is not found
 ------------ trace
-identityLight :: 'Float
+identityLight :: Float
 'Entity :: Type
-Entity :: 'Vec 4 'Float -> 'Vec 4 'Float -> 'Vec 3 'Float -> 'Vec 4 'Float -> 'Entity
-'EntityCase :: forall (a :: 'Entity -> Type) -> (forall (b :: 'Vec 4 'Float) (c :: 'Vec 4 'Float) (d :: 'Vec 3 'Float) (e :: 'Vec 4 'Float) -> a (Entity b c d e)) -> forall (f :: 'Entity) -> a f
-match'Entity :: forall (a :: Type -> Type) -> a 'Entity -> forall b -> a b -> a b
-eAmbientLight :: 'Entity -> 'VecS 'Float 4
-eDirectedLight :: 'Entity -> 'VecS 'Float 4
-eLightDir :: 'Entity -> 'VecS 'Float 3
-eShaderRGBA :: 'Entity -> 'VecS 'Float 4
+Entity :: Vec 4 Float -> Vec 4 Float -> Vec 3 Float -> Vec 4 Float -> Entity
+'EntityCase :: forall (a :: Entity -> Type) -> (forall (b :: Vec 4 Float) (c :: Vec 4 Float) (d :: Vec 3 Float) (e :: Vec 4 Float) -> a ('Entity b c d e)) -> forall (f :: Entity) -> a f
+match'Entity :: forall (a :: Type -> Type) -> a Entity -> forall b -> a b -> a b
+eAmbientLight :: Entity -> VecS Float 4
+eDirectedLight :: Entity -> VecS Float 4
+eLightDir :: Entity -> VecS Float 3
+eShaderRGBA :: Entity -> VecS Float 4
 'WaveType :: Type
-WT_Sin :: 'WaveType
-WT_Triangle :: 'WaveType
-WT_Square :: 'WaveType
-WT_Sawtooth :: 'WaveType
-WT_InverseSawtooth :: 'WaveType
-WT_Noise :: 'WaveType
-'WaveTypeCase :: forall (a :: 'WaveType -> Type) -> a WT_Sin -> a WT_Triangle -> a WT_Square -> a WT_Sawtooth -> a WT_InverseSawtooth -> a WT_Noise -> forall (b :: 'WaveType) -> a b
-match'WaveType :: forall (a :: Type -> Type) -> a 'WaveType -> forall b -> a b -> a b
+WT_Sin :: WaveType
+WT_Triangle :: WaveType
+WT_Square :: WaveType
+WT_Sawtooth :: WaveType
+WT_InverseSawtooth :: WaveType
+WT_Noise :: WaveType
+'WaveTypeCase :: forall (a :: WaveType -> Type) -> a 'WT_Sin -> a 'WT_Triangle -> a 'WT_Square -> a 'WT_Sawtooth -> a 'WT_InverseSawtooth -> a 'WT_Noise -> forall (b :: WaveType) -> a b
+match'WaveType :: forall (a :: Type -> Type) -> a WaveType -> forall b -> a b -> a b
 'Wave :: Type
-Wave :: 'WaveType -> 'Float -> 'Float -> 'Float -> 'Float -> 'Wave
-'WaveCase :: forall (a :: 'Wave -> Type) -> (forall (b :: 'WaveType) (c :: 'Float) (d :: 'Float) (e :: 'Float) (f :: 'Float) -> a (Wave b c d e f)) -> forall (g :: 'Wave) -> a g
-match'Wave :: forall (a :: Type -> Type) -> a 'Wave -> forall b -> a b -> a b
+Wave :: WaveType -> Float -> Float -> Float -> Float -> Wave
+'WaveCase :: forall (a :: Wave -> Type) -> (forall (b :: WaveType) (c :: Float) (d :: Float) (e :: Float) (f :: Float) -> a ('Wave b c d e f)) -> forall (g :: Wave) -> a g
+match'Wave :: forall (a :: Type -> Type) -> a Wave -> forall b -> a b -> a b
 'Deform :: Type
-D_AutoSprite :: 'Deform
-D_AutoSprite2 :: 'Deform
-D_Bulge :: 'Float -> 'Float -> 'Float -> 'Deform
-D_Move :: 'Vec 3 'Float -> 'Wave -> 'Deform
-D_Normal :: 'Float -> 'Float -> 'Deform
-D_ProjectionShadow :: 'Deform
-D_Text0 :: 'Deform
-D_Text1 :: 'Deform
-D_Text2 :: 'Deform
-D_Text3 :: 'Deform
-D_Text4 :: 'Deform
-D_Text5 :: 'Deform
-D_Text6 :: 'Deform
-D_Text7 :: 'Deform
-D_Wave :: 'Float -> 'Wave -> 'Deform
-'DeformCase :: forall (a :: 'Deform -> Type) -> a D_AutoSprite -> a D_AutoSprite2 -> (forall (b :: 'Float) (c :: 'Float) (d :: 'Float) -> a (D_Bulge b c d)) -> (forall (e :: 'Vec 3 'Float) (f :: 'Wave) -> a (D_Move e f)) -> (forall (g :: 'Float) (h :: 'Float) -> a (D_Normal g h)) -> a D_ProjectionShadow -> a D_Text0 -> a D_Text1 -> a D_Text2 -> a D_Text3 -> a D_Text4 -> a D_Text5 -> a D_Text6 -> a D_Text7 -> (forall (i :: 'Float) (j :: 'Wave) -> a (D_Wave i j)) -> forall (k :: 'Deform) -> a k
-match'Deform :: forall (a :: Type -> Type) -> a 'Deform -> forall b -> a b -> a b
+D_AutoSprite :: Deform
+D_AutoSprite2 :: Deform
+D_Bulge :: Float -> Float -> Float -> Deform
+D_Move :: Vec 3 Float -> Wave -> Deform
+D_Normal :: Float -> Float -> Deform
+D_ProjectionShadow :: Deform
+D_Text0 :: Deform
+D_Text1 :: Deform
+D_Text2 :: Deform
+D_Text3 :: Deform
+D_Text4 :: Deform
+D_Text5 :: Deform
+D_Text6 :: Deform
+D_Text7 :: Deform
+D_Wave :: Float -> Wave -> Deform
+'DeformCase :: forall (a :: Deform -> Type) -> a 'D_AutoSprite -> a 'D_AutoSprite2 -> (forall (b :: Float) (c :: Float) (d :: Float) -> a ('D_Bulge b c d)) -> (forall (e :: Vec 3 Float) (f :: Wave) -> a ('D_Move e f)) -> (forall (g :: Float) (h :: Float) -> a ('D_Normal g h)) -> a 'D_ProjectionShadow -> a 'D_Text0 -> a 'D_Text1 -> a 'D_Text2 -> a 'D_Text3 -> a 'D_Text4 -> a 'D_Text5 -> a 'D_Text6 -> a 'D_Text7 -> (forall (i :: Float) (j :: Wave) -> a ('D_Wave i j)) -> forall (k :: Deform) -> a k
+match'Deform :: forall (a :: Type -> Type) -> a Deform -> forall b -> a b -> a b
 'CullType :: Type
-CT_FrontSided :: 'CullType
-CT_BackSided :: 'CullType
-CT_TwoSided :: 'CullType
-'CullTypeCase :: forall (a :: 'CullType -> Type) -> a CT_FrontSided -> a CT_BackSided -> a CT_TwoSided -> forall (b :: 'CullType) -> a b
-match'CullType :: forall (a :: Type -> Type) -> a 'CullType -> forall b -> a b -> a b
+CT_FrontSided :: CullType
+CT_BackSided :: CullType
+CT_TwoSided :: CullType
+'CullTypeCase :: forall (a :: CullType -> Type) -> a 'CT_FrontSided -> a 'CT_BackSided -> a 'CT_TwoSided -> forall (b :: CullType) -> a b
+match'CullType :: forall (a :: Type -> Type) -> a CullType -> forall b -> a b -> a b
 'Blending' :: Type
-B_DstAlpha :: 'Blending'
-B_DstColor :: 'Blending'
-B_One :: 'Blending'
-B_OneMinusDstAlpha :: 'Blending'
-B_OneMinusDstColor :: 'Blending'
-B_OneMinusSrcAlpha :: 'Blending'
-B_OneMinusSrcColor :: 'Blending'
-B_SrcAlpha :: 'Blending'
-B_SrcAlphaSaturate :: 'Blending'
-B_SrcColor :: 'Blending'
-B_Zero :: 'Blending'
-'Blending'Case :: forall (a :: 'Blending' -> Type) -> a B_DstAlpha -> a B_DstColor -> a B_One -> a B_OneMinusDstAlpha -> a B_OneMinusDstColor -> a B_OneMinusSrcAlpha -> a B_OneMinusSrcColor -> a B_SrcAlpha -> a B_SrcAlphaSaturate -> a B_SrcColor -> a B_Zero -> forall (b :: 'Blending') -> a b
-match'Blending' :: forall (a :: Type -> Type) -> a 'Blending' -> forall b -> a b -> a b
+B_DstAlpha :: Blending'
+B_DstColor :: Blending'
+B_One :: Blending'
+B_OneMinusDstAlpha :: Blending'
+B_OneMinusDstColor :: Blending'
+B_OneMinusSrcAlpha :: Blending'
+B_OneMinusSrcColor :: Blending'
+B_SrcAlpha :: Blending'
+B_SrcAlphaSaturate :: Blending'
+B_SrcColor :: Blending'
+B_Zero :: Blending'
+'Blending'Case :: forall (a :: Blending' -> Type) -> a 'B_DstAlpha -> a 'B_DstColor -> a 'B_One -> a 'B_OneMinusDstAlpha -> a 'B_OneMinusDstColor -> a 'B_OneMinusSrcAlpha -> a 'B_OneMinusSrcColor -> a 'B_SrcAlpha -> a 'B_SrcAlphaSaturate -> a 'B_SrcColor -> a 'B_Zero -> forall (b :: Blending') -> a b
+match'Blending' :: forall (a :: Type -> Type) -> a Blending' -> forall b -> a b -> a b
 'RGBGen :: Type
-RGB_Wave :: 'Wave -> 'RGBGen
-RGB_Const :: 'Float -> 'Float -> 'Float -> 'RGBGen
-RGB_Identity :: 'RGBGen
-RGB_IdentityLighting :: 'RGBGen
-RGB_Entity :: 'RGBGen
-RGB_OneMinusEntity :: 'RGBGen
-RGB_ExactVertex :: 'RGBGen
-RGB_Vertex :: 'RGBGen
-RGB_LightingDiffuse :: 'RGBGen
-RGB_OneMinusVertex :: 'RGBGen
-RGB_Undefined :: 'RGBGen
-'RGBGenCase :: forall (a :: 'RGBGen -> Type) -> (forall (b :: 'Wave) -> a (RGB_Wave b)) -> (forall (c :: 'Float) (d :: 'Float) (e :: 'Float) -> a (RGB_Const c d e)) -> a RGB_Identity -> a RGB_IdentityLighting -> a RGB_Entity -> a RGB_OneMinusEntity -> a RGB_ExactVertex -> a RGB_Vertex -> a RGB_LightingDiffuse -> a RGB_OneMinusVertex -> a RGB_Undefined -> forall (f :: 'RGBGen) -> a f
-match'RGBGen :: forall (a :: Type -> Type) -> a 'RGBGen -> forall b -> a b -> a b
+RGB_Wave :: Wave -> RGBGen
+RGB_Const :: Float -> Float -> Float -> RGBGen
+RGB_Identity :: RGBGen
+RGB_IdentityLighting :: RGBGen
+RGB_Entity :: RGBGen
+RGB_OneMinusEntity :: RGBGen
+RGB_ExactVertex :: RGBGen
+RGB_Vertex :: RGBGen
+RGB_LightingDiffuse :: RGBGen
+RGB_OneMinusVertex :: RGBGen
+RGB_Undefined :: RGBGen
+'RGBGenCase :: forall (a :: RGBGen -> Type) -> (forall (b :: Wave) -> a ('RGB_Wave b)) -> (forall (c :: Float) (d :: Float) (e :: Float) -> a ('RGB_Const c d e)) -> a 'RGB_Identity -> a 'RGB_IdentityLighting -> a 'RGB_Entity -> a 'RGB_OneMinusEntity -> a 'RGB_ExactVertex -> a 'RGB_Vertex -> a 'RGB_LightingDiffuse -> a 'RGB_OneMinusVertex -> a 'RGB_Undefined -> forall (f :: RGBGen) -> a f
+match'RGBGen :: forall (a :: Type -> Type) -> a RGBGen -> forall b -> a b -> a b
 'AlphaGen :: Type
-A_Wave :: 'Wave -> 'AlphaGen
-A_Const :: 'Float -> 'AlphaGen
-A_Portal :: 'AlphaGen
-A_Identity :: 'AlphaGen
-A_Entity :: 'AlphaGen
-A_OneMinusEntity :: 'AlphaGen
-A_Vertex :: 'AlphaGen
-A_LightingSpecular :: 'AlphaGen
-A_OneMinusVertex :: 'AlphaGen
-'AlphaGenCase :: forall (a :: 'AlphaGen -> Type) -> (forall (b :: 'Wave) -> a (A_Wave b)) -> (forall (c :: 'Float) -> a (A_Const c)) -> a A_Portal -> a A_Identity -> a A_Entity -> a A_OneMinusEntity -> a A_Vertex -> a A_LightingSpecular -> a A_OneMinusVertex -> forall (d :: 'AlphaGen) -> a d
-match'AlphaGen :: forall (a :: Type -> Type) -> a 'AlphaGen -> forall b -> a b -> a b
+A_Wave :: Wave -> AlphaGen
+A_Const :: Float -> AlphaGen
+A_Portal :: AlphaGen
+A_Identity :: AlphaGen
+A_Entity :: AlphaGen
+A_OneMinusEntity :: AlphaGen
+A_Vertex :: AlphaGen
+A_LightingSpecular :: AlphaGen
+A_OneMinusVertex :: AlphaGen
+'AlphaGenCase :: forall (a :: AlphaGen -> Type) -> (forall (b :: Wave) -> a ('A_Wave b)) -> (forall (c :: Float) -> a ('A_Const c)) -> a 'A_Portal -> a 'A_Identity -> a 'A_Entity -> a 'A_OneMinusEntity -> a 'A_Vertex -> a 'A_LightingSpecular -> a 'A_OneMinusVertex -> forall (d :: AlphaGen) -> a d
+match'AlphaGen :: forall (a :: Type -> Type) -> a AlphaGen -> forall b -> a b -> a b
 'TCGen :: Type
-TG_Base :: 'TCGen
-TG_Lightmap :: 'TCGen
-TG_Environment :: 'TCGen
-TG_Vector :: 'Vec 3 'Float -> 'Vec 3 'Float -> 'TCGen
-TG_Undefined :: 'TCGen
-'TCGenCase :: forall (a :: 'TCGen -> Type) -> a TG_Base -> a TG_Lightmap -> a TG_Environment -> (forall (b :: 'Vec 3 'Float) (c :: 'Vec 3 'Float) -> a (TG_Vector b c)) -> a TG_Undefined -> forall (d :: 'TCGen) -> a d
-match'TCGen :: forall (a :: Type -> Type) -> a 'TCGen -> forall b -> a b -> a b
+TG_Base :: TCGen
+TG_Lightmap :: TCGen
+TG_Environment :: TCGen
+TG_Vector :: Vec 3 Float -> Vec 3 Float -> TCGen
+TG_Undefined :: TCGen
+'TCGenCase :: forall (a :: TCGen -> Type) -> a 'TG_Base -> a 'TG_Lightmap -> a 'TG_Environment -> (forall (b :: Vec 3 Float) (c :: Vec 3 Float) -> a ('TG_Vector b c)) -> a 'TG_Undefined -> forall (d :: TCGen) -> a d
+match'TCGen :: forall (a :: Type -> Type) -> a TCGen -> forall b -> a b -> a b
 'TCMod :: Type
-TM_EntityTranslate :: 'TCMod
-TM_Rotate :: 'Float -> 'TCMod
-TM_Scroll :: 'Float -> 'Float -> 'TCMod
-TM_Scale :: 'Float -> 'Float -> 'TCMod
-TM_Stretch :: 'Wave -> 'TCMod
-TM_Transform :: 'Float -> 'Float -> 'Float -> 'Float -> 'Float -> 'Float -> 'TCMod
-TM_Turb :: 'Float -> 'Float -> 'Float -> 'Float -> 'TCMod
-'TCModCase :: forall (a :: 'TCMod -> Type) -> a TM_EntityTranslate -> (forall (b :: 'Float) -> a (TM_Rotate b)) -> (forall (c :: 'Float) (d :: 'Float) -> a (TM_Scroll c d)) -> (forall (e :: 'Float) (f :: 'Float) -> a (TM_Scale e f)) -> (forall (g :: 'Wave) -> a (TM_Stretch g)) -> (forall (h :: 'Float) (i :: 'Float) (j :: 'Float) (k :: 'Float) (l :: 'Float) (m :: 'Float) -> a (TM_Transform h i j k l m)) -> (forall (n :: 'Float) (o :: 'Float) (p :: 'Float) (q :: 'Float) -> a (TM_Turb n o p q)) -> forall (r :: 'TCMod) -> a r
-match'TCMod :: forall (a :: Type -> Type) -> a 'TCMod -> forall b -> a b -> a b
+TM_EntityTranslate :: TCMod
+TM_Rotate :: Float -> TCMod
+TM_Scroll :: Float -> Float -> TCMod
+TM_Scale :: Float -> Float -> TCMod
+TM_Stretch :: Wave -> TCMod
+TM_Transform :: Float -> Float -> Float -> Float -> Float -> Float -> TCMod
+TM_Turb :: Float -> Float -> Float -> Float -> TCMod
+'TCModCase :: forall (a :: TCMod -> Type) -> a 'TM_EntityTranslate -> (forall (b :: Float) -> a ('TM_Rotate b)) -> (forall (c :: Float) (d :: Float) -> a ('TM_Scroll c d)) -> (forall (e :: Float) (f :: Float) -> a ('TM_Scale e f)) -> (forall (g :: Wave) -> a ('TM_Stretch g)) -> (forall (h :: Float) (i :: Float) (j :: Float) (k :: Float) (l :: Float) (m :: Float) -> a ('TM_Transform h i j k l m)) -> (forall (n :: Float) (o :: Float) (p :: Float) (q :: Float) -> a ('TM_Turb n o p q)) -> forall (r :: TCMod) -> a r
+match'TCMod :: forall (a :: Type -> Type) -> a TCMod -> forall b -> a b -> a b
 'StageTexture :: Type
-ST_Map :: 'String -> 'StageTexture
-ST_ClampMap :: 'String -> 'StageTexture
-ST_AnimMap :: 'Float -> 'List 'String -> 'StageTexture
-ST_Lightmap :: 'StageTexture
-ST_WhiteImage :: 'StageTexture
-'StageTextureCase :: forall (a :: 'StageTexture -> Type) -> (forall (b :: 'String) -> a (ST_Map b)) -> (forall (c :: 'String) -> a (ST_ClampMap c)) -> (forall (d :: 'Float) (e :: 'List 'String) -> a (ST_AnimMap d e)) -> a ST_Lightmap -> a ST_WhiteImage -> forall (f :: 'StageTexture) -> a f
-match'StageTexture :: forall (a :: Type -> Type) -> a 'StageTexture -> forall b -> a b -> a b
+ST_Map :: String -> StageTexture
+ST_ClampMap :: String -> StageTexture
+ST_AnimMap :: Float -> List String -> StageTexture
+ST_Lightmap :: StageTexture
+ST_WhiteImage :: StageTexture
+'StageTextureCase :: forall (a :: StageTexture -> Type) -> (forall (b :: String) -> a ('ST_Map b)) -> (forall (c :: String) -> a ('ST_ClampMap c)) -> (forall (d :: Float) (e :: List String) -> a ('ST_AnimMap d e)) -> a 'ST_Lightmap -> a 'ST_WhiteImage -> forall (f :: StageTexture) -> a f
+match'StageTexture :: forall (a :: Type -> Type) -> a StageTexture -> forall b -> a b -> a b
 'AlphaFunction :: Type
-A_Gt0 :: 'AlphaFunction
-A_Lt128 :: 'AlphaFunction
-A_Ge128 :: 'AlphaFunction
-'AlphaFunctionCase :: forall (a :: 'AlphaFunction -> Type) -> a A_Gt0 -> a A_Lt128 -> a A_Ge128 -> forall (b :: 'AlphaFunction) -> a b
-match'AlphaFunction :: forall (a :: Type -> Type) -> a 'AlphaFunction -> forall b -> a b -> a b
+A_Gt0 :: AlphaFunction
+A_Lt128 :: AlphaFunction
+A_Ge128 :: AlphaFunction
+'AlphaFunctionCase :: forall (a :: AlphaFunction -> Type) -> a 'A_Gt0 -> a 'A_Lt128 -> a 'A_Ge128 -> forall (b :: AlphaFunction) -> a b
+match'AlphaFunction :: forall (a :: Type -> Type) -> a AlphaFunction -> forall b -> a b -> a b
 'DepthFunction :: Type
-D_Equal :: 'DepthFunction
-D_Lequal :: 'DepthFunction
-'DepthFunctionCase :: forall (a :: 'DepthFunction -> Type) -> a D_Equal -> a D_Lequal -> forall (b :: 'DepthFunction) -> a b
-match'DepthFunction :: forall (a :: Type -> Type) -> a 'DepthFunction -> forall b -> a b -> a b
+D_Equal :: DepthFunction
+D_Lequal :: DepthFunction
+'DepthFunctionCase :: forall (a :: DepthFunction -> Type) -> a 'D_Equal -> a 'D_Lequal -> forall (b :: DepthFunction) -> a b
+match'DepthFunction :: forall (a :: Type -> Type) -> a DepthFunction -> forall b -> a b -> a b
 'StageAttrs :: Type
-StageAttrs :: 'Maybe ('Blending', 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String -> 'StageAttrs
-'StageAttrsCase :: forall (a :: 'StageAttrs -> Type) -> (forall (b :: 'Maybe ('Blending', 'Blending')) (c :: 'RGBGen) (d :: 'AlphaGen) (e :: 'TCGen) (f :: 'List 'TCMod) (g :: 'StageTexture) (h :: 'Bool) (i :: 'DepthFunction) (j :: 'Maybe 'AlphaFunction) (k :: 'Bool) (l :: 'String) -> a (StageAttrs b c d e f g h i j k l)) -> forall (m :: 'StageAttrs) -> a m
-match'StageAttrs :: forall (a :: Type -> Type) -> a 'StageAttrs -> forall b -> a b -> a b
-saBlend :: 'StageAttrs -> 'Maybe ('Blending', 'Blending')
-saRGBGen :: 'StageAttrs -> 'RGBGen
-saAlphaGen :: 'StageAttrs -> 'AlphaGen
-saTCGen :: 'StageAttrs -> 'TCGen
-saTCMod :: 'StageAttrs -> 'List 'TCMod
-saTexture :: 'StageAttrs -> 'StageTexture
-saDepthWrite :: 'StageAttrs -> 'Bool
-saDepthFunc :: 'StageAttrs -> 'DepthFunction
-saAlphaFunc :: 'StageAttrs -> 'Maybe 'AlphaFunction
-saDepthMaskExplicit :: 'StageAttrs -> 'Bool
-saTextureUniform :: 'StageAttrs -> 'String
-defaultStageAttrs :: 'StageAttrs
+StageAttrs :: Maybe (Blending', Blending') -> RGBGen -> AlphaGen -> TCGen -> List TCMod -> StageTexture -> Bool -> DepthFunction -> Maybe AlphaFunction -> Bool -> String -> StageAttrs
+'StageAttrsCase :: forall (a :: StageAttrs -> Type) -> (forall (b :: Maybe (Blending', Blending')) (c :: RGBGen) (d :: AlphaGen) (e :: TCGen) (f :: List TCMod) (g :: StageTexture) (h :: Bool) (i :: DepthFunction) (j :: Maybe AlphaFunction) (k :: Bool) (l :: String) -> a ('StageAttrs b c d e f g h i j k l)) -> forall (m :: StageAttrs) -> a m
+match'StageAttrs :: forall (a :: Type -> Type) -> a StageAttrs -> forall b -> a b -> a b
+saBlend :: StageAttrs -> Maybe (Blending', Blending')
+saRGBGen :: StageAttrs -> RGBGen
+saAlphaGen :: StageAttrs -> AlphaGen
+saTCGen :: StageAttrs -> TCGen
+saTCMod :: StageAttrs -> List TCMod
+saTexture :: StageAttrs -> StageTexture
+saDepthWrite :: StageAttrs -> Bool
+saDepthFunc :: StageAttrs -> DepthFunction
+saAlphaFunc :: StageAttrs -> Maybe AlphaFunction
+saDepthMaskExplicit :: StageAttrs -> Bool
+saTextureUniform :: StageAttrs -> String
+defaultStageAttrs :: StageAttrs
 'CommonAttrs :: Type
-CommonAttrs :: () -> () -> 'Bool -> 'Float -> 'Bool -> 'Bool -> 'CullType -> 'List 'Deform -> 'Bool -> 'Bool -> 'List 'StageAttrs -> 'Bool -> 'CommonAttrs
-'CommonAttrsCase :: forall (a :: 'CommonAttrs -> Type) -> (forall (b :: ()) (c :: ()) (d :: 'Bool) (e :: 'Float) (f :: 'Bool) (g :: 'Bool) (h :: 'CullType) (i :: 'List 'Deform) (j :: 'Bool) (k :: 'Bool) (l :: 'List 'StageAttrs) (m :: 'Bool) -> a (CommonAttrs b c d e f g h i j k l m)) -> forall (n :: 'CommonAttrs) -> a n
-match'CommonAttrs :: forall (a :: Type -> Type) -> a 'CommonAttrs -> forall b -> a b -> a b
-caSkyParms :: 'CommonAttrs -> ()
-caFogParms :: 'CommonAttrs -> ()
-caPortal :: 'CommonAttrs -> 'Bool
-caSort :: 'CommonAttrs -> 'Float
-caEntityMergable :: 'CommonAttrs -> 'Bool
-caFogOnly :: 'CommonAttrs -> 'Bool
-caCull :: 'CommonAttrs -> 'CullType
-caDeformVertexes :: 'CommonAttrs -> 'List 'Deform
-caNoMipMaps :: 'CommonAttrs -> 'Bool
-caPolygonOffset :: 'CommonAttrs -> 'Bool
-caStages :: 'CommonAttrs -> 'List 'StageAttrs
-caIsSky :: 'CommonAttrs -> 'Bool
-defaultCommonAttrs :: 'CommonAttrs
+CommonAttrs :: () -> () -> Bool -> Float -> Bool -> Bool -> CullType -> List Deform -> Bool -> Bool -> List StageAttrs -> Bool -> CommonAttrs
+'CommonAttrsCase :: forall (a :: CommonAttrs -> Type) -> (forall (b :: ()) (c :: ()) (d :: Bool) (e :: Float) (f :: Bool) (g :: Bool) (h :: CullType) (i :: List Deform) (j :: Bool) (k :: Bool) (l :: List StageAttrs) (m :: Bool) -> a ('CommonAttrs b c d e f g h i j k l m)) -> forall (n :: CommonAttrs) -> a n
+match'CommonAttrs :: forall (a :: Type -> Type) -> a CommonAttrs -> forall b -> a b -> a b
+caSkyParms :: CommonAttrs -> ()
+caFogParms :: CommonAttrs -> ()
+caPortal :: CommonAttrs -> Bool
+caSort :: CommonAttrs -> Float
+caEntityMergable :: CommonAttrs -> Bool
+caFogOnly :: CommonAttrs -> Bool
+caCull :: CommonAttrs -> CullType
+caDeformVertexes :: CommonAttrs -> List Deform
+caNoMipMaps :: CommonAttrs -> Bool
+caPolygonOffset :: CommonAttrs -> Bool
+caStages :: CommonAttrs -> List StageAttrs
+caIsSky :: CommonAttrs -> Bool
+defaultCommonAttrs :: CommonAttrs
 ------------ tooltips
 testdata/Material.lc 7:18-7:23  Type
 testdata/Material.lc 8:1-8:14  Float
diff --git a/testdata/Prelude.out b/testdata/Prelude.out
index 287c9734..dac505a0 100644
--- a/testdata/Prelude.out
+++ b/testdata/Prelude.out
@@ -1,176 +1,176 @@
 main is not found
 ------------ trace
 const :: forall a b . a -> b -> a
-otherwise :: 'Bool
+otherwise :: Bool
 & :: forall a b . a -> (a -> b) -> b
 $ :: forall a b . (a -> b) -> a -> b
 . :: forall a b c . (b -> c) -> (a -> b) -> a -> c
 uncurry :: forall a b c . (a -> c -> b) -> (a, c) -> b
 *** :: forall a b c d . (a -> c) -> (b -> d) -> (a, b) -> (c, d)
-pi :: 'Float
-zip :: forall a b . 'List a -> 'List b -> 'List (a, b)
-unzip :: forall a b . 'List (a, b) -> ('List a, 'List b)
-filter :: forall a . (a -> 'Bool) -> 'List a -> 'List a
-tail :: forall a . 'List a -> 'List a
-pairs :: forall a . 'List a -> 'List (a, a)
-foldl' :: forall a b . (a -> b -> a) -> a -> 'List b -> a
-foldr1 :: forall a . (a -> a -> a) -> 'List a -> a
-split :: forall a . 'List a -> ('List a, 'List a)
-mergeBy :: forall a . (a -> a -> 'Ordering) -> 'List a -> 'List a -> 'List a
-sortBy :: forall a . (a -> a -> 'Ordering) -> 'List a -> 'List a
-iterate :: forall a . (a -> a) -> a -> 'List a
+pi :: Float
+zip :: forall a b . List a -> List b -> List (a, b)
+unzip :: forall a b . List (a, b) -> (List a, List b)
+filter :: forall a . (a -> Bool) -> List a -> List a
+tail :: forall a . List a -> List a
+pairs :: forall a . List a -> List (a, a)
+foldl' :: forall a b . (a -> b -> a) -> a -> List b -> a
+foldr1 :: forall a . (a -> a -> a) -> List a -> a
+split :: forall a . List a -> (List a, List a)
+mergeBy :: forall a . (a -> a -> Ordering) -> List a -> List a -> List a
+sortBy :: forall a . (a -> a -> Ordering) -> List a -> List a
+iterate :: forall a . (a -> a) -> a -> List a
 fst :: forall a b . (a, b) -> a
 snd :: forall a b . (a, b) -> b
-||| :: 'Bool -> 'Bool -> 'Bool
-&&& :: 'Bool -> 'Bool -> 'Bool
+||| :: Bool -> Bool -> Bool
+&&& :: Bool -> Bool -> Bool
 'RecItem :: Type
-RecItem :: 'String -> Type -> 'RecItem
-'RecItemCase :: forall (a :: 'RecItem -> Type) -> (forall (b :: 'String) c -> a (RecItem b c)) -> forall (d :: 'RecItem) -> a d
-match'RecItem :: forall (a :: Type -> Type) -> a 'RecItem -> forall b -> a b -> a b
-recItemType :: 'RecItem -> Type
-'RecordC :: 'List 'RecItem -> Type
-RecordCons :: forall (a :: 'List 'RecItem) . 'HList (map 'RecItem Type recItemType a) -> 'RecordC a
-'RecordCCase :: forall (a :: 'List 'RecItem) . forall (b :: 'RecordC a -> Type) -> (forall (c :: 'HList (map 'RecItem Type recItemType a)) -> b (RecordCons c)) -> forall (d :: 'RecordC a) -> b d
-match'RecordC :: forall (a :: Type -> Type) -> (forall (b :: 'List 'RecItem) -> a ('RecordC b)) -> forall c -> a c -> a c
-isKeyC :: 'String -> Type -> 'List 'RecItem -> Type
-fstTup :: forall a (b :: 'List Type) . 'HList (Cons a b) -> a
-sndTup :: forall a (b :: 'List Type) . 'HList (Cons a b) -> 'HList b
-project :: forall a (b :: 'List 'RecItem) . forall (c :: 'String) -> isKeyC c a b => 'RecordC b -> a
-rgb :: 'Float -> 'Float -> 'Float -> 'VecS 'Float 4
-black :: 'VecS 'Float 4
-gray :: 'VecS 'Float 4
-silver :: 'VecS 'Float 4
-white :: 'VecS 'Float 4
-maroon :: 'VecS 'Float 4
-red :: 'VecS 'Float 4
-olive :: 'VecS 'Float 4
-yellow :: 'VecS 'Float 4
-green :: 'VecS 'Float 4
-lime :: 'VecS 'Float 4
-teal :: 'VecS 'Float 4
-aqua :: 'VecS 'Float 4
-navy :: 'VecS 'Float 4
-blue :: 'VecS 'Float 4
-purple :: 'VecS 'Float 4
-fuchsia :: 'VecS 'Float 4
-colorImage1 :: forall (a :: 'Nat) b c . ('Num b, c ~ 'VecScalar a b) => c -> 'Image 1 (Color c)
-colorImage2 :: forall (a :: 'Nat) b c . ('Num b, c ~ 'VecScalar a b) => c -> 'Image 2 (Color c)
-depthImage1 :: 'Float -> 'Image 1 Depth
-v3FToV4F :: 'Vec 3 'Float -> 'VecS 'Float 4
-radians :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-degrees :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-sin :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-cos :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-tan :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-sinh :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-cosh :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-tanh :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-asin :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-asinh :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-acos :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-acosh :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-atan :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-atanh :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-atan2 :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a -> a
-pow :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a -> a
-exp :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-log :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-exp2 :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-log2 :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-sqrt :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-inversesqrt :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-abs :: forall a b (c :: 'Nat) . ('Signed a, b ~ 'VecScalar c a) => b -> b
-sign :: forall a b (c :: 'Nat) . ('Signed a, b ~ 'VecScalar c a) => b -> b
-floor :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-trunc :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-round :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-roundEven :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-ceil :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-fract :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-mod :: forall a b (c :: 'Nat) . ('Num a, b ~ 'VecScalar c a) => b -> b -> b
-min :: forall a b (c :: 'Nat) . ('Num a, b ~ 'VecScalar c a) => b -> b -> b
-max :: forall a b (c :: 'Nat) . ('Num a, b ~ 'VecScalar c a) => b -> b -> b
-modF :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> (a, a)
-clamp :: forall a b (c :: 'Nat) . ('Num a, b ~ 'VecScalar c a) => b -> b -> b -> b
-clampS :: forall a b (c :: 'Nat) . ('Num a, b ~ 'VecScalar c a) => b -> a -> a -> b
-mix :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a -> a -> a
-mixS :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a -> 'Float -> a
-mixB :: forall a (b :: 'Nat) c . (a ~ 'VecScalar b 'Float, c ~ 'VecScalar b 'Bool) => a -> a -> c -> a
-step :: forall a (b :: 'Nat) . (a ~ 'VecS 'Float b) => a -> a -> a
-stepS :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => 'Float -> a -> a
-smoothstep :: forall a (b :: 'Nat) . (a ~ 'VecS 'Float b) => a -> a -> a -> a
-smoothstepS :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => 'Float -> 'Float -> a -> a
-isNan :: forall a (b :: 'Nat) c . (a ~ 'VecScalar b 'Float, c ~ 'VecScalar b 'Bool) => a -> c
-isInf :: forall a (b :: 'Nat) c . (a ~ 'VecScalar b 'Float, c ~ 'VecScalar b 'Bool) => a -> c
-dFdx :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-dFdy :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-fWidth :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-noise1 :: forall (a :: 'Nat) . 'VecScalar a 'Float -> 'Float
-noise2 :: forall (a :: 'Nat) . 'VecScalar a 'Float -> 'Vec 2 'Float
-noise3 :: forall (a :: 'Nat) . 'VecScalar a 'Float -> 'Vec 3 'Float
-noise4 :: forall (a :: 'Nat) . 'VecScalar a 'Float -> 'Vec 4 'Float
-length :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> 'Float
-distance :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a -> 'Float
-dot :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a -> 'Float
-cross :: forall a . (a ~ 'VecS 'Float 3) => a -> a -> a
-normalize :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a
-faceforward :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a -> a -> a
-reflect :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a -> a
-refract :: forall a (b :: 'Nat) . (a ~ 'VecScalar b 'Float) => a -> a -> a -> a
-transpose :: forall (a :: 'Nat) (b :: 'Nat) c . 'Mat a b c -> 'Mat b a c
-det :: forall (a :: 'Nat) b . 'Mat a a b -> 'Float
-inv :: forall (a :: 'Nat) b . 'Mat a a b -> 'Mat a a b
-outer :: forall (a :: 'Nat) b (c :: 'Nat) . 'Vec a b -> 'Vec c b -> 'Mat c a b
-bAnd :: forall a b (c :: 'Nat) . ('Integral a, b ~ 'VecScalar c a) => b -> b -> b
-bOr :: forall a b (c :: 'Nat) . ('Integral a, b ~ 'VecScalar c a) => b -> b -> b
-bXor :: forall a b (c :: 'Nat) . ('Integral a, b ~ 'VecScalar c a) => b -> b -> b
-bNot :: forall a b (c :: 'Nat) . ('Integral a, b ~ 'VecScalar c a) => b -> b
-bAndS :: forall a b (c :: 'Nat) . ('Integral a, b ~ 'VecScalar c a) => b -> a -> b
-bOrS :: forall a b (c :: 'Nat) . ('Integral a, b ~ 'VecScalar c a) => b -> a -> b
-bXorS :: forall a b (c :: 'Nat) . ('Integral a, b ~ 'VecScalar c a) => b -> a -> b
-shiftL :: forall a b (c :: 'Nat) d . ('Integral a, b ~ 'VecScalar c a, d ~ 'VecScalar c 'Word) => b -> d -> b
-shiftR :: forall a b (c :: 'Nat) d . ('Integral a, b ~ 'VecScalar c a, d ~ 'VecScalar c 'Word) => b -> d -> b
-shiftLS :: forall a b (c :: 'Nat) . ('Integral a, b ~ 'VecScalar c a) => b -> 'Word -> b
-shiftRS :: forall a b (c :: 'Nat) . ('Integral a, b ~ 'VecScalar c a) => b -> 'Word -> b
-floatBitsToInt :: forall (a :: 'Nat) . 'VecScalar a 'Float -> 'VecScalar a 'Int
-floatBitsToWord :: forall (a :: 'Nat) . 'VecScalar a 'Float -> 'VecScalar a 'Word
-intBitsToFloat :: forall (a :: 'Nat) . 'VecScalar a 'Int -> 'VecScalar a 'Float
-wordBitsToFloat :: forall (a :: 'Nat) . 'VecScalar a 'Word -> 'VecScalar a 'Float
-+ :: forall a . 'Num ('MatVecScalarElem a) => a -> a -> a
-- :: forall a . 'Num ('MatVecScalarElem a) => a -> a -> a
-* :: forall a . 'Num ('MatVecScalarElem a) => a -> a -> a
-/ :: forall a (b :: 'Nat) . 'Num a => 'VecScalar b a -> 'VecScalar b a -> 'VecScalar b a
-% :: forall a (b :: 'Nat) . 'Num a => 'VecScalar b a -> 'VecScalar b a -> 'VecScalar b a
-neg :: forall a . 'Signed ('MatVecScalarElem a) => a -> a
-/= :: forall a . a -> a -> 'Bool
-< :: forall (a :: 'Nat) b . 'Num b => 'VecScalar a b -> 'VecScalar a b -> 'VecScalar a 'Bool
-<= :: forall (a :: 'Nat) b . 'Num b => 'VecScalar a b -> 'VecScalar a b -> 'VecScalar a 'Bool
->= :: forall (a :: 'Nat) b . 'Num b => 'VecScalar a b -> 'VecScalar a b -> 'VecScalar a 'Bool
-> :: forall (a :: 'Nat) b . 'Num b => 'VecScalar a b -> 'VecScalar a b -> 'VecScalar a 'Bool
-&& :: 'Bool -> 'Bool -> 'Bool
-|| :: 'Bool -> 'Bool -> 'Bool
-xor :: 'Bool -> 'Bool -> 'Bool
-not :: forall (a :: 'Nat) . 'VecScalar a 'Bool -> 'VecScalar a 'Bool
-any :: forall (a :: 'Nat) . 'VecScalar a 'Bool -> 'Bool
-all :: forall (a :: 'Nat) . 'VecScalar a 'Bool -> 'Bool
-.*. :: forall (a :: 'Nat) (b :: 'Nat) c (d :: 'Nat) . 'Mat a b c -> 'Mat b d c -> 'Mat a d c
-*. :: forall (a :: 'Nat) (b :: 'Nat) c . 'Mat a b c -> 'VecS c b -> 'Vec a c
-.* :: forall (a :: 'Nat) b (c :: 'Nat) . 'VecS b a -> 'Mat a c b -> 'Vec c b
-+! :: forall a . 'Num ('MatVecScalarElem a) => a -> 'MatVecScalarElem a -> a
--! :: forall a . 'Num ('MatVecScalarElem a) => a -> 'MatVecScalarElem a -> a
-*! :: forall a . 'Num ('MatVecScalarElem a) => a -> 'MatVecScalarElem a -> a
-/! :: forall a (b :: 'Nat) . 'Num a => 'VecScalar b a -> a -> 'VecScalar b a
-%! :: forall a (b :: 'Nat) . 'Num a => 'VecScalar b a -> a -> 'VecScalar b a
-perspective :: 'Float -> 'Float -> 'Float -> 'Float -> 'Mat 4 4 'Float
-rotMatrixZ :: 'VecScalar 1 'Float -> 'Mat 4 4 'Float
-rotMatrixY :: 'VecScalar 1 'Float -> 'Mat 4 4 'Float
-rotMatrixX :: 'VecScalar 1 'Float -> 'Mat 4 4 'Float
-rotationEuler :: 'Float -> 'Float -> 'Float -> 'Mat 4 4 'Float
-translateBefore4 :: 'Vec 3 'Float -> 'Mat 4 4 'Float
-lookat :: 'Vec 3 'Float -> 'Vec 3 'Float -> 'Vec 3 'Float -> 'Mat 4 4 'Float
-scale :: 'Float -> 'VecS 'Float 4 -> 'VecS 'Float 4
-fromTo :: 'Float -> 'Float -> 'List 'Float
-!! :: forall a . 'List a -> 'Int -> a
+RecItem :: String -> Type -> RecItem
+'RecItemCase :: forall (a :: RecItem -> Type) -> (forall (b :: String) c -> a ('RecItem b c)) -> forall (d :: RecItem) -> a d
+match'RecItem :: forall (a :: Type -> Type) -> a RecItem -> forall b -> a b -> a b
+recItemType :: RecItem -> Type
+'RecordC :: List RecItem -> Type
+RecordCons :: forall (a :: List RecItem) . HList (map RecItem Type recItemType a) -> RecordC a
+'RecordCCase :: forall (a :: List RecItem) . forall (b :: RecordC a -> Type) -> (forall (c :: HList (map RecItem Type recItemType a)) -> b ('RecordCons c)) -> forall (d :: RecordC a) -> b d
+match'RecordC :: forall (a :: Type -> Type) -> (forall (b :: List RecItem) -> a (RecordC b)) -> forall c -> a c -> a c
+isKeyC :: String -> Type -> List RecItem -> Type
+fstTup :: forall a (b :: List Type) . HList ('Cons a b) -> a
+sndTup :: forall a (b :: List Type) . HList ('Cons a b) -> HList b
+project :: forall a (b :: List RecItem) . forall (c :: String) -> isKeyC c a b => RecordC b -> a
+rgb :: Float -> Float -> Float -> VecS Float 4
+black :: VecS Float 4
+gray :: VecS Float 4
+silver :: VecS Float 4
+white :: VecS Float 4
+maroon :: VecS Float 4
+red :: VecS Float 4
+olive :: VecS Float 4
+yellow :: VecS Float 4
+green :: VecS Float 4
+lime :: VecS Float 4
+teal :: VecS Float 4
+aqua :: VecS Float 4
+navy :: VecS Float 4
+blue :: VecS Float 4
+purple :: VecS Float 4
+fuchsia :: VecS Float 4
+colorImage1 :: forall (a :: Nat) b c . (Num b, c ~ VecScalar a b) => c -> Image 1 ('Color c)
+colorImage2 :: forall (a :: Nat) b c . (Num b, c ~ VecScalar a b) => c -> Image 2 ('Color c)
+depthImage1 :: Float -> Image 1 'Depth
+v3FToV4F :: Vec 3 Float -> VecS Float 4
+radians :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+degrees :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+sin :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+cos :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+tan :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+sinh :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+cosh :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+tanh :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+asin :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+asinh :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+acos :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+acosh :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+atan :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+atanh :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+atan2 :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a -> a
+pow :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a -> a
+exp :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+log :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+exp2 :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+log2 :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+sqrt :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+inversesqrt :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+abs :: forall a b (c :: Nat) . (Signed a, b ~ VecScalar c a) => b -> b
+sign :: forall a b (c :: Nat) . (Signed a, b ~ VecScalar c a) => b -> b
+floor :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+trunc :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+round :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+roundEven :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+ceil :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+fract :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+mod :: forall a b (c :: Nat) . (Num a, b ~ VecScalar c a) => b -> b -> b
+min :: forall a b (c :: Nat) . (Num a, b ~ VecScalar c a) => b -> b -> b
+max :: forall a b (c :: Nat) . (Num a, b ~ VecScalar c a) => b -> b -> b
+modF :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> (a, a)
+clamp :: forall a b (c :: Nat) . (Num a, b ~ VecScalar c a) => b -> b -> b -> b
+clampS :: forall a b (c :: Nat) . (Num a, b ~ VecScalar c a) => b -> a -> a -> b
+mix :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a -> a -> a
+mixS :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a -> Float -> a
+mixB :: forall a (b :: Nat) c . (a ~ VecScalar b Float, c ~ VecScalar b Bool) => a -> a -> c -> a
+step :: forall a (b :: Nat) . (a ~ VecS Float b) => a -> a -> a
+stepS :: forall a (b :: Nat) . (a ~ VecScalar b Float) => Float -> a -> a
+smoothstep :: forall a (b :: Nat) . (a ~ VecS Float b) => a -> a -> a -> a
+smoothstepS :: forall a (b :: Nat) . (a ~ VecScalar b Float) => Float -> Float -> a -> a
+isNan :: forall a (b :: Nat) c . (a ~ VecScalar b Float, c ~ VecScalar b Bool) => a -> c
+isInf :: forall a (b :: Nat) c . (a ~ VecScalar b Float, c ~ VecScalar b Bool) => a -> c
+dFdx :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+dFdy :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+fWidth :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+noise1 :: forall (a :: Nat) . VecScalar a Float -> Float
+noise2 :: forall (a :: Nat) . VecScalar a Float -> Vec 2 Float
+noise3 :: forall (a :: Nat) . VecScalar a Float -> Vec 3 Float
+noise4 :: forall (a :: Nat) . VecScalar a Float -> Vec 4 Float
+length :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> Float
+distance :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a -> Float
+dot :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a -> Float
+cross :: forall a . (a ~ VecS Float 3) => a -> a -> a
+normalize :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a
+faceforward :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a -> a -> a
+reflect :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a -> a
+refract :: forall a (b :: Nat) . (a ~ VecScalar b Float) => a -> a -> a -> a
+transpose :: forall (a :: Nat) (b :: Nat) c . Mat a b c -> Mat b a c
+det :: forall (a :: Nat) b . Mat a a b -> Float
+inv :: forall (a :: Nat) b . Mat a a b -> Mat a a b
+outer :: forall (a :: Nat) b (c :: Nat) . Vec a b -> Vec c b -> Mat c a b
+bAnd :: forall a b (c :: Nat) . (Integral a, b ~ VecScalar c a) => b -> b -> b
+bOr :: forall a b (c :: Nat) . (Integral a, b ~ VecScalar c a) => b -> b -> b
+bXor :: forall a b (c :: Nat) . (Integral a, b ~ VecScalar c a) => b -> b -> b
+bNot :: forall a b (c :: Nat) . (Integral a, b ~ VecScalar c a) => b -> b
+bAndS :: forall a b (c :: Nat) . (Integral a, b ~ VecScalar c a) => b -> a -> b
+bOrS :: forall a b (c :: Nat) . (Integral a, b ~ VecScalar c a) => b -> a -> b
+bXorS :: forall a b (c :: Nat) . (Integral a, b ~ VecScalar c a) => b -> a -> b
+shiftL :: forall a b (c :: Nat) d . (Integral a, b ~ VecScalar c a, d ~ VecScalar c Word) => b -> d -> b
+shiftR :: forall a b (c :: Nat) d . (Integral a, b ~ VecScalar c a, d ~ VecScalar c Word) => b -> d -> b
+shiftLS :: forall a b (c :: Nat) . (Integral a, b ~ VecScalar c a) => b -> Word -> b
+shiftRS :: forall a b (c :: Nat) . (Integral a, b ~ VecScalar c a) => b -> Word -> b
+floatBitsToInt :: forall (a :: Nat) . VecScalar a Float -> VecScalar a Int
+floatBitsToWord :: forall (a :: Nat) . VecScalar a Float -> VecScalar a Word
+intBitsToFloat :: forall (a :: Nat) . VecScalar a Int -> VecScalar a Float
+wordBitsToFloat :: forall (a :: Nat) . VecScalar a Word -> VecScalar a Float
++ :: forall a . Num (MatVecScalarElem a) => a -> a -> a
+- :: forall a . Num (MatVecScalarElem a) => a -> a -> a
+* :: forall a . Num (MatVecScalarElem a) => a -> a -> a
+/ :: forall a (b :: Nat) . Num a => VecScalar b a -> VecScalar b a -> VecScalar b a
+% :: forall a (b :: Nat) . Num a => VecScalar b a -> VecScalar b a -> VecScalar b a
+neg :: forall a . Signed (MatVecScalarElem a) => a -> a
+/= :: forall a . a -> a -> Bool
+< :: forall (a :: Nat) b . Num b => VecScalar a b -> VecScalar a b -> VecScalar a Bool
+<= :: forall (a :: Nat) b . Num b => VecScalar a b -> VecScalar a b -> VecScalar a Bool
+>= :: forall (a :: Nat) b . Num b => VecScalar a b -> VecScalar a b -> VecScalar a Bool
+> :: forall (a :: Nat) b . Num b => VecScalar a b -> VecScalar a b -> VecScalar a Bool
+&& :: Bool -> Bool -> Bool
+|| :: Bool -> Bool -> Bool
+xor :: Bool -> Bool -> Bool
+not :: forall (a :: Nat) . VecScalar a Bool -> VecScalar a Bool
+any :: forall (a :: Nat) . VecScalar a Bool -> Bool
+all :: forall (a :: Nat) . VecScalar a Bool -> Bool
+.*. :: forall (a :: Nat) (b :: Nat) c (d :: Nat) . Mat a b c -> Mat b d c -> Mat a d c
+*. :: forall (a :: Nat) (b :: Nat) c . Mat a b c -> VecS c b -> Vec a c
+.* :: forall (a :: Nat) b (c :: Nat) . VecS b a -> Mat a c b -> Vec c b
++! :: forall a . Num (MatVecScalarElem a) => a -> MatVecScalarElem a -> a
+-! :: forall a . Num (MatVecScalarElem a) => a -> MatVecScalarElem a -> a
+*! :: forall a . Num (MatVecScalarElem a) => a -> MatVecScalarElem a -> a
+/! :: forall a (b :: Nat) . Num a => VecScalar b a -> a -> VecScalar b a
+%! :: forall a (b :: Nat) . Num a => VecScalar b a -> a -> VecScalar b a
+perspective :: Float -> Float -> Float -> Float -> Mat 4 4 Float
+rotMatrixZ :: VecScalar 1 Float -> Mat 4 4 Float
+rotMatrixY :: VecScalar 1 Float -> Mat 4 4 Float
+rotMatrixX :: VecScalar 1 Float -> Mat 4 4 Float
+rotationEuler :: Float -> Float -> Float -> Mat 4 4 Float
+translateBefore4 :: Vec 3 Float -> Mat 4 4 Float
+lookat :: Vec 3 Float -> Vec 3 Float -> Vec 3 Float -> Mat 4 4 Float
+scale :: Float -> VecS Float 4 -> VecS Float 4
+fromTo :: Float -> Float -> List Float
+!! :: forall a . List a -> Int -> a
 ------------ tooltips
 testdata/Prelude.lc 16:1-16:6  forall a b . a -> b -> a
 testdata/Prelude.lc 16:13-16:14  _d
@@ -449,7 +449,7 @@ testdata/Prelude.lc 126:6-127:46  Type
 testdata/Prelude.lc 126:15-126:17  List RecItem
 testdata/Prelude.lc 126:21-126:30  Type
 testdata/Prelude.lc 126:22-126:29  Type
-testdata/Prelude.lc 127:7-127:17  RecordC _c | Type | forall (a :: List RecItem) . HList ('map RecItem Type 'recItemType a) -> RecordC a
+testdata/Prelude.lc 127:7-127:17  RecordC _c | Type | forall (a :: List RecItem) . HList (map RecItem Type recItemType a) -> RecordC a
 testdata/Prelude.lc 127:19-127:24  List Type -> Type
 testdata/Prelude.lc 127:19-127:45  Type
 testdata/Prelude.lc 127:26-127:29  forall a b . (a -> b) -> List a -> List b
@@ -490,7 +490,7 @@ testdata/Prelude.lc 133:10-133:25  (_c -> HList _b -> _a) -> HList ('Cons _c _b)
 testdata/Prelude.lc 133:10-133:37  HList ('Cons _b _a) -> HList _a
 testdata/Prelude.lc 133:27-133:36  _c -> HList _b -> _a
 testdata/Prelude.lc 133:35-133:36  HList _c -> _b | HList _d
-testdata/Prelude.lc 136:12-138:181  _a -> _a | forall a (b :: List RecItem) . forall (c :: String) -> 'isKeyC c a b => RecordC b -> a
+testdata/Prelude.lc 136:12-138:181  _a -> _a | forall a (b :: List RecItem) . forall (c :: String) -> isKeyC c a b => RecordC b -> a
 testdata/Prelude.lc 136:28-136:37  Type
 testdata/Prelude.lc 136:28-136:97  Type
 testdata/Prelude.lc 136:29-136:36  Type
@@ -509,11 +509,11 @@ testdata/Prelude.lc 136:82-136:92  Type
 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  forall a (b :: List RecItem) . forall (c :: String) -> 'isKeyC c a b => RecordC b -> a
+testdata/Prelude.lc 137:1-137:8  forall a (b :: List RecItem) . forall (c :: String) -> isKeyC c a b => RecordC b -> a
 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  'isKeyC _a _c _b => RecordC _b -> _c | HList ('map RecItem Type 'recItemType _b) -> _a | List _c -> _b | RecordC _c -> _d | String -> Type -> _a | Type -> _b | _b -> List _b -> _a | _e | _g | _j | _m | forall (a :: List RecItem) . forall (b :: String) -> 'isKeyC b _a a => RecordC a -> _a | forall (a :: String) -> 'isKeyC a _b _a => RecordC _a -> _b | forall a (b :: List RecItem) . forall (c :: String) -> 'isKeyC c a b => RecordC b -> a
+testdata/Prelude.lc 137:57-138:181  HList (map RecItem Type recItemType _b) -> _a | List _c -> _b | RecordC _c -> _d | String -> Type -> _a | Type -> _b | _b -> List _b -> _a | _e | _g | _j | _m | forall (a :: List RecItem) . forall (b :: String) -> isKeyC b _a a => RecordC a -> _a | forall (a :: String) -> isKeyC a _b _a => RecordC _a -> _b | forall a (b :: List RecItem) . forall (c :: String) -> isKeyC c a b => RecordC b -> a | isKeyC _a _c _b => RecordC _b -> _c
 testdata/Prelude.lc 137:59-137:61  forall a . Eq a => a -> a -> Bool
 testdata/Prelude.lc 137:62-137:64  String
 testdata/Prelude.lc 137:67-137:73  forall a (b :: List Type) . HList ('Cons a b) -> a
@@ -521,8 +521,8 @@ testdata/Prelude.lc 137:67-137:129  _n
 testdata/Prelude.lc 137:67-138:181  Bool -> _n
 testdata/Prelude.lc 137:75-137:87  forall a b . a -> b
 testdata/Prelude.lc 137:75-137:90  forall a . _a -> a
-testdata/Prelude.lc 137:75-137:125  _a -> HList ('Cons _q ('map RecItem Type 'recItemType _j))
-testdata/Prelude.lc 137:75-137:128  HList ('Cons _n ('map RecItem Type 'recItemType _g))
+testdata/Prelude.lc 137:75-137:125  _a -> HList ('Cons _q (map RecItem Type recItemType _j))
+testdata/Prelude.lc 137:75-137:128  HList ('Cons _n (map RecItem Type recItemType _g))
 testdata/Prelude.lc 137:93-137:98  List Type -> Type
 testdata/Prelude.lc 137:93-137:124  Type
 testdata/Prelude.lc 137:101-137:102  Type
@@ -534,18 +534,18 @@ testdata/Prelude.lc 137:105-137:120  List RecItem -> List Type
 testdata/Prelude.lc 137:105-137:123  List Type
 testdata/Prelude.lc 137:109-137:120  RecItem -> Type
 testdata/Prelude.lc 137:121-137:123  List RecItem
-testdata/Prelude.lc 137:126-137:128  HList ('map RecItem Type 'recItemType _d)
-testdata/Prelude.lc 138:57-138:64  forall a (b :: List RecItem) . forall (c :: String) -> 'isKeyC c a b => RecordC b -> a
-testdata/Prelude.lc 138:57-138:67  forall (a :: List RecItem) . forall (b :: String) -> 'isKeyC b _p a => RecordC a -> _p
-testdata/Prelude.lc 138:57-138:71  forall (a :: String) -> 'isKeyC a _o _h => RecordC _h -> _o
-testdata/Prelude.lc 138:57-138:73  'isKeyC _m _o _h => RecordC _h -> _o
+testdata/Prelude.lc 137:126-137:128  HList (map RecItem Type recItemType _d)
+testdata/Prelude.lc 138:57-138:64  forall a (b :: List RecItem) . forall (c :: String) -> isKeyC c a b => RecordC b -> a
+testdata/Prelude.lc 138:57-138:67  forall (a :: List RecItem) . forall (b :: String) -> isKeyC b _p a => RecordC a -> _p
+testdata/Prelude.lc 138:57-138:71  forall (a :: String) -> isKeyC a _o _h => RecordC _h -> _o
+testdata/Prelude.lc 138:57-138:73  isKeyC _m _o _h => RecordC _h -> _o
 testdata/Prelude.lc 138:57-138:103  RecordC _h -> _o
 testdata/Prelude.lc 138:57-138:181  _n
 testdata/Prelude.lc 138:66-138:67  Type
 testdata/Prelude.lc 138:69-138:71  List _k
 testdata/Prelude.lc 138:72-138:73  String
 testdata/Prelude.lc 138:76-138:85  forall a . a
-testdata/Prelude.lc 138:76-138:102  'isKeyC _m _o _h
+testdata/Prelude.lc 138:76-138:102  isKeyC _m _o _h
 testdata/Prelude.lc 138:88-138:94  String -> Type -> List RecItem -> Type
 testdata/Prelude.lc 138:88-138:96  Type -> List RecItem -> Type
 testdata/Prelude.lc 138:88-138:98  List RecItem -> Type
@@ -553,14 +553,14 @@ testdata/Prelude.lc 138:88-138:101  Type
 testdata/Prelude.lc 138:95-138:96  String
 testdata/Prelude.lc 138:97-138:98  Type
 testdata/Prelude.lc 138:99-138:101  List RecItem
-testdata/Prelude.lc 138:105-138:115  forall (a :: List RecItem) . HList ('map RecItem Type 'recItemType a) -> RecordC a
+testdata/Prelude.lc 138:105-138:115  forall (a :: List RecItem) . HList (map RecItem Type recItemType a) -> RecordC a
 testdata/Prelude.lc 138:105-138:180  RecordC _b
 testdata/Prelude.lc 138:117-138:123  forall a (b :: List Type) . HList ('Cons a b) -> HList b
-testdata/Prelude.lc 138:117-138:179  HList ('map RecItem Type 'recItemType _h)
+testdata/Prelude.lc 138:117-138:179  HList (map RecItem Type recItemType _h)
 testdata/Prelude.lc 138:125-138:137  forall a b . a -> b
 testdata/Prelude.lc 138:125-138:140  forall a . _a -> a
-testdata/Prelude.lc 138:125-138:175  _a -> HList ('Cons _r ('map RecItem Type 'recItemType _k))
-testdata/Prelude.lc 138:125-138:178  HList ('Cons _o ('map RecItem Type 'recItemType _h))
+testdata/Prelude.lc 138:125-138:175  _a -> HList ('Cons _r (map RecItem Type recItemType _k))
+testdata/Prelude.lc 138:125-138:178  HList ('Cons _o (map RecItem Type recItemType _h))
 testdata/Prelude.lc 138:143-138:148  List Type -> Type
 testdata/Prelude.lc 138:143-138:174  Type
 testdata/Prelude.lc 138:151-138:152  Type
@@ -572,7 +572,7 @@ testdata/Prelude.lc 138:155-138:170  List RecItem -> List Type
 testdata/Prelude.lc 138:155-138:173  List Type
 testdata/Prelude.lc 138:159-138:170  RecItem -> Type
 testdata/Prelude.lc 138:171-138:173  List RecItem
-testdata/Prelude.lc 138:176-138:178  HList ('map RecItem Type 'recItemType _e)
+testdata/Prelude.lc 138:176-138:178  HList (map RecItem Type recItemType _e)
 testdata/Prelude.lc 142:1-142:4  Float -> Float -> Float -> VecS Float 4
 testdata/Prelude.lc 142:13-142:15  forall a . a -> a -> a -> a -> VecS a 4
 testdata/Prelude.lc 142:13-142:17  _f -> _f -> _f -> VecS _f 4
diff --git a/testdata/SampleMaterial.out b/testdata/SampleMaterial.out
index 04076a28..fd598d79 100644
--- a/testdata/SampleMaterial.out
+++ b/testdata/SampleMaterial.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-sampleMaterial :: 'List ('String, 'CommonAttrs)
+sampleMaterial :: List (String, CommonAttrs)
 ------------ tooltips
 testdata/SampleMaterial.lc 3:1-3:15  List (String, CommonAttrs)
 testdata/SampleMaterial.lc 4:3-2183:4  List (String, CommonAttrs)
diff --git a/testdata/adhoc.reject.out b/testdata/adhoc.reject.out
index 6099ecf1..8e226745 100644
--- a/testdata/adhoc.reject.out
+++ b/testdata/adhoc.reject.out
@@ -4,9 +4,9 @@ x = one :: Vec 4 A
     ^^^
 ------------ trace
 'A :: Type
-A :: 'A
-'ACase :: forall (a :: 'A -> Type) -> a A -> forall (b :: 'A) -> a b
-match'A :: forall (a :: Type -> Type) -> a 'A -> forall b -> a b -> a b
+A :: A
+'ACase :: forall (a :: A -> Type) -> a 'A -> forall (b :: A) -> a b
+match'A :: forall (a :: Type -> Type) -> a A -> forall b -> a b -> a b
 !type error: no instance of 'Component on ???
 in testdata/adhoc.reject.lc:4:5:
 x = one :: Vec 4 A
diff --git a/testdata/complex.out b/testdata/complex.out
index 99b0a0fd..2a357e18 100644
--- a/testdata/complex.out
+++ b/testdata/complex.out
@@ -1,27 +1,27 @@
 main is not found
 ------------ trace
 'Repr :: Type
-Normal :: 'Repr
-Polar :: 'Repr
-'ReprCase :: forall (a :: 'Repr -> Type) -> a Normal -> a Polar -> forall (b :: 'Repr) -> a b
-match'Repr :: forall (a :: Type -> Type) -> a 'Repr -> forall b -> a b -> a b
-'Complex :: 'Repr -> Type
-Complex :: forall (a :: 'Repr) . 'Float -> 'Float -> 'Complex a
-'ComplexCase :: forall (a :: forall (b :: 'Repr) -> 'Complex b -> Type) -> (forall (c :: 'Repr) . forall (d :: 'Float) (e :: 'Float) -> a c (Complex c d e)) -> forall (f :: 'Repr) . forall (g :: 'Complex f) -> a f g
-match'Complex :: forall (a :: Type -> Type) -> (forall (b :: 'Repr) -> a ('Complex b)) -> forall c -> a c -> a c
-repr :: forall (a :: 'Repr) . 'Complex a -> 'Repr
-normal :: 'Float -> 'Float -> 'Complex Normal
-polar :: 'Float -> 'Float -> 'Complex Polar
-cabs :: forall (a :: 'Repr) . 'Complex a -> 'Float
-toPolar :: 'Complex Normal -> 'Complex Polar
-toNormal :: 'Complex Polar -> 'Complex Normal
-it_should_fail :: forall (a :: 'Repr) . 'Complex a -> 'Float
-add :: forall (a :: 'Repr) (b :: 'Repr) . 'Complex a -> 'Complex b -> 'Complex a
-mul :: forall (a :: 'Repr) (b :: 'Repr) . 'Complex a -> 'Complex b -> 'Complex a
-s :: forall (a :: 'Repr) . 'Complex a -> 'Complex a
-s4 :: forall (a :: 'Repr) . 'Complex a -> 'Complex a
-iter :: forall (a :: 'Repr) . 'Complex a -> 'Complex a
-mandel :: forall (a :: 'Repr) . 'Complex a -> 'VecScalar 1 'Bool
+Normal :: Repr
+Polar :: Repr
+'ReprCase :: forall (a :: Repr -> Type) -> a 'Normal -> a 'Polar -> forall (b :: Repr) -> a b
+match'Repr :: forall (a :: Type -> Type) -> a Repr -> forall b -> a b -> a b
+'Complex :: Repr -> Type
+Complex :: forall (a :: Repr) . Float -> Float -> Complex a
+'ComplexCase :: forall (a :: forall (b :: Repr) -> Complex b -> Type) -> (forall (c :: Repr) . forall (d :: Float) (e :: Float) -> a c ('Complex c d e)) -> forall (f :: Repr) . forall (g :: Complex f) -> a f g
+match'Complex :: forall (a :: Type -> Type) -> (forall (b :: Repr) -> a (Complex b)) -> forall c -> a c -> a c
+repr :: forall (a :: Repr) . Complex a -> Repr
+normal :: Float -> Float -> Complex 'Normal
+polar :: Float -> Float -> Complex 'Polar
+cabs :: forall (a :: Repr) . Complex a -> Float
+toPolar :: Complex 'Normal -> Complex 'Polar
+toNormal :: Complex 'Polar -> Complex 'Normal
+it_should_fail :: forall (a :: Repr) . Complex a -> Float
+add :: forall (a :: Repr) (b :: Repr) . Complex a -> Complex b -> Complex a
+mul :: forall (a :: Repr) (b :: Repr) . Complex a -> Complex b -> Complex a
+s :: forall (a :: Repr) . Complex a -> Complex a
+s4 :: forall (a :: Repr) . Complex a -> Complex a
+iter :: forall (a :: Repr) . Complex a -> Complex a
+mandel :: forall (a :: Repr) . Complex a -> VecScalar 1 Bool
 ------------ tooltips
 testdata/complex.lc 3:6-3:10  Type
 testdata/complex.lc 3:6-3:27  Type
diff --git a/testdata/data.out b/testdata/data.out
index 3a093bbe..bf9da023 100644
--- a/testdata/data.out
+++ b/testdata/data.out
@@ -1,31 +1,31 @@
 main is not found
 ------------ trace
 'Data0 :: Type
-Data0 :: 'Data0
-'Data0Case :: forall (a :: 'Data0 -> Type) -> a Data0 -> forall (b :: 'Data0) -> a b
-match'Data0 :: forall (a :: Type -> Type) -> a 'Data0 -> forall b -> a b -> a b
+Data0 :: Data0
+'Data0Case :: forall (a :: Data0 -> Type) -> a 'Data0 -> forall (b :: Data0) -> a b
+match'Data0 :: forall (a :: Type -> Type) -> a Data0 -> forall b -> a b -> a b
 'Data1 :: Type -> Type -> Type -> Type
-Data1 :: forall a b c . a -> b -> c -> 'Data1 a b c
-'Data1Case :: forall a b c . forall (d :: 'Data1 a b c -> Type) -> (forall (e :: a) (f :: b) (g :: c) -> d (Data1 e f g)) -> forall (h :: 'Data1 a b c) -> d h
-match'Data1 :: forall (a :: Type -> Type) -> (forall b c d -> a ('Data1 b c d)) -> forall e -> a e -> a e
+Data1 :: forall a b c . a -> b -> c -> Data1 a b c
+'Data1Case :: forall a b c . forall (d :: Data1 a b c -> Type) -> (forall (e :: a) (f :: b) (g :: c) -> d ('Data1 e f g)) -> forall (h :: Data1 a b c) -> d h
+match'Data1 :: forall (a :: Type -> Type) -> (forall b c d -> a (Data1 b c d)) -> forall e -> a e -> a e
 'Data2 :: Type
-Data21 :: 'Int -> 'Data2
-Data22 :: 'Int -> 'Int -> 'Data2
-Data23 :: 'Int -> 'Data2
-Data24 :: 'Data2
-'Data2Case :: forall (a :: 'Data2 -> Type) -> (forall (b :: 'Int) -> a (Data21 b)) -> (forall (c :: 'Int) (d :: 'Int) -> a (Data22 c d)) -> (forall (e :: 'Int) -> a (Data23 e)) -> a Data24 -> forall (f :: 'Data2) -> a f
-match'Data2 :: forall (a :: Type -> Type) -> a 'Data2 -> forall b -> a b -> a b
-x :: 'Data2 -> 'Int
-y :: 'Data2 -> 'Int
+Data21 :: Int -> Data2
+Data22 :: Int -> Int -> Data2
+Data23 :: Int -> Data2
+Data24 :: Data2
+'Data2Case :: forall (a :: Data2 -> Type) -> (forall (b :: Int) -> a ('Data21 b)) -> (forall (c :: Int) (d :: Int) -> a ('Data22 c d)) -> (forall (e :: Int) -> a ('Data23 e)) -> a 'Data24 -> forall (f :: Data2) -> a f
+match'Data2 :: forall (a :: Type -> Type) -> a Data2 -> forall b -> a b -> a b
+x :: Data2 -> Int
+y :: Data2 -> Int
 'Data5 :: Type -> Type -> Type -> Type
-Data51 :: forall a b c . a -> 'Data5 a b c
-Data52 :: forall a b c . a -> b -> c -> 'Data5 a b c
-Data53 :: forall a b c . 'Int -> a -> 'Float -> b -> c -> 'Data5 a b c
-'Data5Case :: forall a b c . forall (d :: 'Data5 a b c -> Type) -> (forall (e :: a) -> d (Data51 e)) -> (forall (f :: a) (g :: b) (h :: c) -> d (Data52 f g h)) -> (forall (i :: 'Int) (j :: a) (k :: 'Float) (l :: b) (m :: c) -> d (Data53 i j k l m)) -> forall (n :: 'Data5 a b c) -> d n
-match'Data5 :: forall (a :: Type -> Type) -> (forall b c d -> a ('Data5 b c d)) -> forall e -> a e -> a e
-a5 :: forall a b c . 'Data5 a b c -> a
-b5 :: forall a b c . 'Data5 a b c -> b
-c5 :: forall a b c . 'Data5 a b c -> c
+Data51 :: forall a b c . a -> Data5 a b c
+Data52 :: forall a b c . a -> b -> c -> Data5 a b c
+Data53 :: forall a b c . Int -> a -> Float -> b -> c -> Data5 a b c
+'Data5Case :: forall a b c . forall (d :: Data5 a b c -> Type) -> (forall (e :: a) -> d ('Data51 e)) -> (forall (f :: a) (g :: b) (h :: c) -> d ('Data52 f g h)) -> (forall (i :: Int) (j :: a) (k :: Float) (l :: b) (m :: c) -> d ('Data53 i j k l m)) -> forall (n :: Data5 a b c) -> d n
+match'Data5 :: forall (a :: Type -> Type) -> (forall b c d -> a (Data5 b c d)) -> forall e -> a e -> a e
+a5 :: forall a b c . Data5 a b c -> a
+b5 :: forall a b c . Data5 a b c -> b
+c5 :: forall a b c . Data5 a b c -> c
 ------------ tooltips
 testdata/data.lc 1:6-1:11  Type
 testdata/data.lc 1:6-1:19  Type
diff --git a/testdata/empty.out b/testdata/empty.out
index d7443922..a5a55263 100644
--- a/testdata/empty.out
+++ b/testdata/empty.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
 'Empty :: Type
-'EmptyCase :: forall (a :: 'Empty -> Type) (b :: 'Empty) -> a b
-match'Empty :: forall (a :: Type -> Type) -> a 'Empty -> forall b -> a b -> a b
+'EmptyCase :: forall (a :: Empty -> Type) (b :: Empty) -> a b
+match'Empty :: forall (a :: Type -> Type) -> a Empty -> forall b -> a b -> a b
 ------------ tooltips
 testdata/empty.lc 3:6-3:11  Type
diff --git a/testdata/framebuffer02.reject.out b/testdata/framebuffer02.reject.out
index f9650704..5740a835 100644
--- a/testdata/framebuffer02.reject.out
+++ b/testdata/framebuffer02.reject.out
@@ -20,8 +20,8 @@ in testdata/framebuffer02.reject.lc:2:17:
                             ,colorImage1 1.0
                             )
 ------------ tooltips
-testdata/framebuffer02.reject.lc 2:17-2:28  forall (a :: List Type) . 'sameLayerCounts a => HList a -> FrameBuffer (ImageLC ('head Type a)) ('map Type ImageKind GetImageKind a)
-testdata/framebuffer02.reject.lc 2:17-5:30  FrameBuffer 1 ('map Type ImageKind GetImageKind ('Cons (Image 1 ('Color (VecScalar 4 Float))) ('Cons (Image 2 ('Color (VecScalar 4 Float))) ('Cons (Image 1 ('Color (VecScalar 1 Float))) 'Nil))))
+testdata/framebuffer02.reject.lc 2:17-2:28  forall (a :: List Type) . sameLayerCounts a => HList a -> FrameBuffer (ImageLC (head Type a)) (map Type ImageKind GetImageKind a)
+testdata/framebuffer02.reject.lc 2:17-5:30  FrameBuffer 1 (map Type ImageKind GetImageKind ('Cons (Image 1 ('Color (VecScalar 4 Float))) ('Cons (Image 2 ('Color (VecScalar 4 Float))) ('Cons (Image 1 ('Color (VecScalar 1 Float))) 'Nil))))
 testdata/framebuffer02.reject.lc 2:29-5:30  (Image 1 ('Color (VecScalar 4 Float)), Image 2 ('Color (VecScalar 4 Float)), Image 1 ('Color (VecScalar 1 Float)))
 testdata/framebuffer02.reject.lc 2:30-2:41  forall (a :: Nat) b c . (Num b, c ~ VecScalar a b) => c -> Image 1 ('Color c)
 testdata/framebuffer02.reject.lc 2:30-2:62  Image 1 ('Color (VecScalar 4 Float))
diff --git a/testdata/id.out b/testdata/id.out
index 611e06a6..5e63f9d1 100644
--- a/testdata/id.out
+++ b/testdata/id.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-main' :: ('Float, 'Bool)
+main' :: (Float, Bool)
 ------------ tooltips
 testdata/id.lc 1:1-1:6  (Float, Bool)
 testdata/id.lc 3:19-3:20  _b
diff --git a/testdata/instantiate.out b/testdata/instantiate.out
index bfe23a03..4c233f52 100644
--- a/testdata/instantiate.out
+++ b/testdata/instantiate.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-main' :: 'VecS 'Float 2
+main' :: VecS Float 2
 ------------ tooltips
 testdata/instantiate.lc 1:1-1:6  VecS Float 2
 testdata/instantiate.lc 2:13-2:20  forall a . Num (MatVecScalarElem a) => a -> a -> a
diff --git a/testdata/language-features/adt/adt02.reject.out b/testdata/language-features/adt/adt02.reject.out
index 6be18ea8..29f62600 100644
--- a/testdata/language-features/adt/adt02.reject.out
+++ b/testdata/language-features/adt/adt02.reject.out
@@ -6,10 +6,10 @@ with
 in proj
 ------------ trace
 'Data3 :: Type
-Data3 :: 'Bool -> 'Char -> 'Bool -> 'Data3
-Data31 :: 'Int -> 'String -> 'Int -> 'Data3
-'Data3Case :: forall (a :: 'Data3 -> Type) -> (forall (b :: 'Bool) (c :: 'Char) (d :: 'Bool) -> a (Data3 b c d)) -> (forall (e :: 'Int) (f :: 'String) (g :: 'Int) -> a (Data31 e f g)) -> forall (h :: 'Data3) -> a h
-match'Data3 :: forall (a :: Type -> Type) -> a 'Data3 -> forall b -> a b -> a b
+Data3 :: Bool -> Char -> Bool -> Data3
+Data31 :: Int -> String -> Int -> Data3
+'Data3Case :: forall (a :: Data3 -> Type) -> (forall (b :: Bool) (c :: Char) (d :: Bool) -> a ('Data3 b c d)) -> (forall (e :: Int) (f :: String) (g :: Int) -> a ('Data31 e f g)) -> forall (h :: Data3) -> a h
+match'Data3 :: forall (a :: Type -> Type) -> a Data3 -> forall b -> a b -> a b
 !type error: can not unify
 'Bool
 with
diff --git a/testdata/language-features/adt/gadt01.reject.out b/testdata/language-features/adt/gadt01.reject.out
index 5d7c98fd..48732b7d 100644
--- a/testdata/language-features/adt/gadt01.reject.out
+++ b/testdata/language-features/adt/gadt01.reject.out
@@ -1,6 +1,6 @@
 illegal data definition (parameters are not uniform)
 ------------ trace
-'M3 :: Type -> 'String -> Type
+'M3 :: Type -> String -> Type
 !illegal data definition (parameters are not uniform)
 ------------ tooltips
 testdata/language-features/adt/gadt01.reject.lc 5:6-5:8  Type -> String -> Type
diff --git a/testdata/language-features/adt/gadt03.reject.out b/testdata/language-features/adt/gadt03.reject.out
index 8aad9b35..39016938 100644
--- a/testdata/language-features/adt/gadt03.reject.out
+++ b/testdata/language-features/adt/gadt03.reject.out
@@ -1,10 +1,10 @@
 illegal data definition (parameters are not uniform)
 ------------ trace
-'M2 :: Type -> 'String -> Type
-Value2 :: forall a . a -> forall (b :: 'String) . 'M2 a b
-'M2Case :: forall a . forall (b :: forall (c :: 'String) -> 'M2 a c -> Type) -> (forall (d :: a) -> forall (e :: 'String) . b e (Value2 d e)) -> forall (f :: 'String) . forall (g :: 'M2 a f) -> b f g
-match'M2 :: forall (a :: Type -> Type) -> (forall b (c :: 'String) -> a ('M2 b c)) -> forall d -> a d -> a d
-'M3 :: Type -> 'String -> Type
+'M2 :: Type -> String -> Type
+Value2 :: forall a . a -> forall (b :: String) . M2 a b
+'M2Case :: forall a . forall (b :: forall (c :: String) -> M2 a c -> Type) -> (forall (d :: a) -> forall (e :: String) . b e ('Value2 d e)) -> forall (f :: String) . forall (g :: M2 a f) -> b f g
+match'M2 :: forall (a :: Type -> Type) -> (forall b (c :: String) -> a (M2 b c)) -> forall d -> a d -> a d
+'M3 :: Type -> String -> Type
 !illegal data definition (parameters are not uniform)
 ------------ tooltips
 testdata/language-features/adt/gadt03.reject.lc 2:6-2:8  Type | Type -> String -> Type
diff --git a/testdata/language-features/adt/gadt04.reject.out b/testdata/language-features/adt/gadt04.reject.out
index 4efb2a15..70903666 100644
--- a/testdata/language-features/adt/gadt04.reject.out
+++ b/testdata/language-features/adt/gadt04.reject.out
@@ -5,12 +5,12 @@ and at testdata/language-features/adt/gadt04.reject.lc:3:3:
   Value :: a -> forall m . M a m
   ^^^^^
 ------------ trace
-'M :: Type -> 'String -> Type
-Value :: forall a . a -> forall (b :: 'String) . 'M a b
-'MCase :: forall (a :: forall b (c :: 'String) -> 'M b c -> Type) -> (forall d . forall (e :: d) -> forall (f :: 'String) . a d f (Value d e f)) -> forall g (h :: 'String) . forall (i :: 'M g h) -> a g h i
-match'M :: forall (a :: Type -> Type) -> (forall b (c :: 'String) -> a ('M b c)) -> forall d -> a d -> a d
-'M2 :: Type -> 'String -> Type
-Value :: forall a . a -> forall (b :: 'String) . 'M2 a b
+'M :: Type -> String -> Type
+Value :: forall a . a -> forall (b :: String) . M a b
+'MCase :: forall (a :: forall b (c :: String) -> M b c -> Type) -> (forall d . forall (e :: d) -> forall (f :: String) . a d f ('Value d e f)) -> forall g (h :: String) . forall (i :: M g h) -> a g h i
+match'M :: forall (a :: Type -> Type) -> (forall b (c :: String) -> a (M b c)) -> forall d -> a d -> a d
+'M2 :: Type -> String -> Type
+Value :: forall a . a -> forall (b :: String) . M2 a b
 !already defined Value at testdata/language-features/adt/gadt04.reject.lc:6:3:
   Value :: a -> forall m . M2 a m
   ^^^^^
diff --git a/testdata/language-features/basic-list/list01.out b/testdata/language-features/basic-list/list01.out
index 3f0fb720..25208099 100644
--- a/testdata/language-features/basic-list/list01.out
+++ b/testdata/language-features/basic-list/list01.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
-value1 :: forall a . 'List a
-value2 :: forall a . 'Num a => 'List a
-value3 :: 'List 'Char
+value1 :: forall a . List a
+value2 :: forall a . Num a => List a
+value3 :: List Char
 ------------ tooltips
 testdata/language-features/basic-list/list01.lc 1:1-1:7  forall a . List a
 testdata/language-features/basic-list/list01.lc 1:10-1:12  forall a . List a
diff --git a/testdata/language-features/basic-list/list02.out b/testdata/language-features/basic-list/list02.out
index ff742fb8..b95d51c9 100644
--- a/testdata/language-features/basic-list/list02.out
+++ b/testdata/language-features/basic-list/list02.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
-value1 :: forall a . 'List a
-value2 :: forall a . 'Num a => 'List a
-value3 :: 'List 'Char
+value1 :: forall a . List a
+value2 :: forall a . Num a => List a
+value3 :: List Char
 ------------ tooltips
 testdata/language-features/basic-list/list02.lc 1:1-1:7  forall a . List a
 testdata/language-features/basic-list/list02.lc 1:10-2:4  forall a . List a
diff --git a/testdata/language-features/basic-list/list08.out b/testdata/language-features/basic-list/list08.out
index 1ac19568..724faf89 100644
--- a/testdata/language-features/basic-list/list08.out
+++ b/testdata/language-features/basic-list/list08.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'List 'Float
+value :: List Float
 ------------ tooltips
 testdata/language-features/basic-list/list08.lc 1:1-1:6  List Float
 testdata/language-features/basic-list/list08.lc 1:9-1:16  List Float
diff --git a/testdata/language-features/basic-list/list09.out b/testdata/language-features/basic-list/list09.out
index 492d3138..d25415c0 100644
--- a/testdata/language-features/basic-list/list09.out
+++ b/testdata/language-features/basic-list/list09.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'List 'Float
+value :: List Float
 ------------ tooltips
 testdata/language-features/basic-list/list09.lc 1:1-1:6  List Float
 testdata/language-features/basic-list/list09.lc 1:9-1:16  List Float
diff --git a/testdata/language-features/basic-list/list11.out b/testdata/language-features/basic-list/list11.out
index cb6df6d3..b3285136 100644
--- a/testdata/language-features/basic-list/list11.out
+++ b/testdata/language-features/basic-list/list11.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: forall a . 'Num a => 'List a
+value :: forall a . Num a => List a
 ------------ tooltips
 testdata/language-features/basic-list/list11.lc 1:1-1:6  forall a . Num a => List a
 testdata/language-features/basic-list/list11.lc 1:9-1:10  _b
diff --git a/testdata/language-features/basic-list/list12.out b/testdata/language-features/basic-list/list12.out
index 44f3d7fb..59378f6a 100644
--- a/testdata/language-features/basic-list/list12.out
+++ b/testdata/language-features/basic-list/list12.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: forall a . 'Num a => 'List a
+value :: forall a . Num a => List a
 ------------ tooltips
 testdata/language-features/basic-list/list12.lc 1:1-1:6  forall a . Num a => List a
 testdata/language-features/basic-list/list12.lc 1:9-1:10  _b
diff --git a/testdata/language-features/basic-list/list13.out b/testdata/language-features/basic-list/list13.out
index 65791b40..59395fa3 100644
--- a/testdata/language-features/basic-list/list13.out
+++ b/testdata/language-features/basic-list/list13.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'List 'Char
+value :: List Char
 ------------ tooltips
 testdata/language-features/basic-list/list13.lc 1:1-1:6  List Char
 testdata/language-features/basic-list/list13.lc 1:9-1:12  Char
diff --git a/testdata/language-features/basic-list/listcomp01.out b/testdata/language-features/basic-list/listcomp01.out
index 432c6b31..2e52e998 100644
--- a/testdata/language-features/basic-list/listcomp01.out
+++ b/testdata/language-features/basic-list/listcomp01.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'List ()
+value :: List ()
 ------------ tooltips
 testdata/language-features/basic-list/listcomp01.lc 1:1-1:6  List ()
 testdata/language-features/basic-list/listcomp01.lc 1:9-1:34  List ()
diff --git a/testdata/language-features/basic-list/listcomp02.out b/testdata/language-features/basic-list/listcomp02.out
index febc25b8..3421166e 100644
--- a/testdata/language-features/basic-list/listcomp02.out
+++ b/testdata/language-features/basic-list/listcomp02.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-l :: 'List ()
-value :: 'List ()
+l :: List ()
+value :: List ()
 ------------ tooltips
 testdata/language-features/basic-list/listcomp02.lc 1:1-1:2  List ()
 testdata/language-features/basic-list/listcomp02.lc 1:5-1:18  List ()
diff --git a/testdata/language-features/basic-list/listcomp03.out b/testdata/language-features/basic-list/listcomp03.out
index 44bfd033..d8cb4fbb 100644
--- a/testdata/language-features/basic-list/listcomp03.out
+++ b/testdata/language-features/basic-list/listcomp03.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'List ()
+value :: List ()
 ------------ tooltips
 testdata/language-features/basic-list/listcomp03.lc 1:1-1:6  List ()
 testdata/language-features/basic-list/listcomp03.lc 1:9-1:41  List ()
diff --git a/testdata/language-features/basic-list/listcomp04.out b/testdata/language-features/basic-list/listcomp04.out
index d126e288..3ad41bba 100644
--- a/testdata/language-features/basic-list/listcomp04.out
+++ b/testdata/language-features/basic-list/listcomp04.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-l :: 'List ()
-value :: 'List ()
+l :: List ()
+value :: List ()
 ------------ tooltips
 testdata/language-features/basic-list/listcomp04.lc 1:1-1:2  List ()
 testdata/language-features/basic-list/listcomp04.lc 1:5-1:18  List ()
diff --git a/testdata/language-features/basic-list/listcomp05.out b/testdata/language-features/basic-list/listcomp05.out
index 54650e0b..562bf9ca 100644
--- a/testdata/language-features/basic-list/listcomp05.out
+++ b/testdata/language-features/basic-list/listcomp05.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'List ()
+value :: List ()
 ------------ tooltips
 testdata/language-features/basic-list/listcomp05.lc 1:1-1:6  List ()
 testdata/language-features/basic-list/listcomp05.lc 1:9-1:39  List ()
diff --git a/testdata/language-features/basic-list/listcomp06.out b/testdata/language-features/basic-list/listcomp06.out
index aef51c74..45071292 100644
--- a/testdata/language-features/basic-list/listcomp06.out
+++ b/testdata/language-features/basic-list/listcomp06.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-value1 :: 'List ()
-value2 :: 'List ()
+value1 :: List ()
+value2 :: List ()
 ------------ tooltips
 testdata/language-features/basic-list/listcomp06.lc 1:1-1:7  List ()
 testdata/language-features/basic-list/listcomp06.lc 1:10-1:46  List ()
diff --git a/testdata/language-features/basic-list/listcomp07.out b/testdata/language-features/basic-list/listcomp07.out
index 4b7b54ef..3fc2fb5c 100644
--- a/testdata/language-features/basic-list/listcomp07.out
+++ b/testdata/language-features/basic-list/listcomp07.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
-value1 :: 'List ()
-value2 :: 'List ()
-value3 :: 'List ()
+value1 :: List ()
+value2 :: List ()
+value3 :: List ()
 ------------ tooltips
 testdata/language-features/basic-list/listcomp07.lc 1:1-1:7  List ()
 testdata/language-features/basic-list/listcomp07.lc 1:10-6:11  List ()
diff --git a/testdata/language-features/basic-list/listcomp09.out b/testdata/language-features/basic-list/listcomp09.out
index bebcfae6..2e6ce09f 100644
--- a/testdata/language-features/basic-list/listcomp09.out
+++ b/testdata/language-features/basic-list/listcomp09.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value1 :: Type => 'List (() -> 'String)
+value1 :: Type => List (() -> String)
 ------------ tooltips
 testdata/language-features/basic-list/listcomp09.lc 1:1-1:7  Type => List (() -> String)
 testdata/language-features/basic-list/listcomp09.lc 1:10-1:36  List (() -> String)
diff --git a/testdata/language-features/basic-values/bool01.out b/testdata/language-features/basic-values/bool01.out
index a78cfe8f..3fd03cdf 100644
--- a/testdata/language-features/basic-values/bool01.out
+++ b/testdata/language-features/basic-values/bool01.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-value1 :: 'Bool
-value2 :: 'Bool
+value1 :: Bool
+value2 :: Bool
 ------------ tooltips
 testdata/language-features/basic-values/bool01.lc 1:1-1:7  Bool
 testdata/language-features/basic-values/bool01.lc 1:10-1:14  Bool
diff --git a/testdata/language-features/basic-values/case02.out b/testdata/language-features/basic-values/case02.out
index e1b5a2e5..974b56da 100644
--- a/testdata/language-features/basic-values/case02.out
+++ b/testdata/language-features/basic-values/case02.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-value1 :: forall a . ('Eq a, 'Num a) => ()
-value2 :: forall a . ('Eq a, 'Num a, 'Eq a, 'Num a) => 'String
+value1 :: forall a . (Eq a, Num a) => ()
+value2 :: forall a . (Eq a, Num a, Eq a, Num a) => String
 ------------ tooltips
 testdata/language-features/basic-values/case02.lc 1:1-1:7  forall a . (Eq a, Num a) => ()
 testdata/language-features/basic-values/case02.lc 1:10-3:10  ()
diff --git a/testdata/language-features/basic-values/case05.out b/testdata/language-features/basic-values/case05.out
index 717b0920..e77a1024 100644
--- a/testdata/language-features/basic-values/case05.out
+++ b/testdata/language-features/basic-values/case05.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: forall a . ('Eq a, 'Num a) => a -> 'Char
+value :: forall a . (Eq a, Num a) => a -> Char
 ------------ tooltips
 testdata/language-features/basic-values/case05.lc 1:1-1:6  forall a . (Eq a, Num a) => a -> Char
 testdata/language-features/basic-values/case05.lc 1:11-2:11  Char
diff --git a/testdata/language-features/basic-values/case06.out b/testdata/language-features/basic-values/case06.out
index 40e7db3b..d2524007 100644
--- a/testdata/language-features/basic-values/case06.out
+++ b/testdata/language-features/basic-values/case06.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: forall a . ('Eq a, 'Num a) => a -> 'Char
+value :: forall a . (Eq a, Num a) => a -> Char
 ------------ tooltips
 testdata/language-features/basic-values/case06.lc 1:1-1:6  forall a . (Eq a, Num a) => a -> Char
 testdata/language-features/basic-values/case06.lc 1:11-3:11  Char
diff --git a/testdata/language-features/basic-values/data01.out b/testdata/language-features/basic-values/data01.out
index b429a33b..294c3b86 100644
--- a/testdata/language-features/basic-values/data01.out
+++ b/testdata/language-features/basic-values/data01.out
@@ -1,23 +1,23 @@
 main is not found
 ------------ trace
 'A :: Type
-B :: 'A
-C :: 'A
-D :: 'A
-'ACase :: forall (a :: 'A -> Type) -> a B -> a C -> a D -> forall (b :: 'A) -> a b
-match'A :: forall (a :: Type -> Type) -> a 'A -> forall b -> a b -> a b
+B :: A
+C :: A
+D :: A
+'ACase :: forall (a :: A -> Type) -> a 'B -> a 'C -> a 'D -> forall (b :: A) -> a b
+match'A :: forall (a :: Type -> Type) -> a A -> forall b -> a b -> a b
 'E :: Type
-F :: 'E
-G :: () -> 'E
-H :: 'E
-'ECase :: forall (a :: 'E -> Type) -> a F -> (forall (b :: ()) -> a (G b)) -> a H -> forall (c :: 'E) -> a c
-match'E :: forall (a :: Type -> Type) -> a 'E -> forall b -> a b -> a b
+F :: E
+G :: () -> E
+H :: E
+'ECase :: forall (a :: E -> Type) -> a 'F -> (forall (b :: ()) -> a ('G b)) -> a 'H -> forall (c :: E) -> a c
+match'E :: forall (a :: Type -> Type) -> a E -> forall b -> a b -> a b
 'D1 :: Type
-C1 :: 'D1
-C2 :: () -> 'D1
-C3 :: 'D1
-'D1Case :: forall (a :: 'D1 -> Type) -> a C1 -> (forall (b :: ()) -> a (C2 b)) -> a C3 -> forall (c :: 'D1) -> a c
-match'D1 :: forall (a :: Type -> Type) -> a 'D1 -> forall b -> a b -> a b
+C1 :: D1
+C2 :: () -> D1
+C3 :: D1
+'D1Case :: forall (a :: D1 -> Type) -> a 'C1 -> (forall (b :: ()) -> a ('C2 b)) -> a 'C3 -> forall (c :: D1) -> a c
+match'D1 :: forall (a :: Type -> Type) -> a D1 -> forall b -> a b -> a b
 ------------ tooltips
 testdata/language-features/basic-values/data01.lc 1:6-1:7  Type
 testdata/language-features/basic-values/data01.lc 1:6-1:13  Type
diff --git a/testdata/language-features/basic-values/def01.out b/testdata/language-features/basic-values/def01.out
index 6c174057..712cd657 100644
--- a/testdata/language-features/basic-values/def01.out
+++ b/testdata/language-features/basic-values/def01.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
 unit :: ()
-fun1 :: forall a b . 'Num b => a -> b
-fun2 :: forall a b c d e . a -> b -> c -> d -> e -> 'Char
+fun1 :: forall a b . Num b => a -> b
+fun2 :: forall a b c d e . a -> b -> c -> d -> e -> Char
 ------------ tooltips
 testdata/language-features/basic-values/def01.lc 1:1-1:5  ()
 testdata/language-features/basic-values/def01.lc 1:8-1:10  ()
diff --git a/testdata/language-features/basic-values/def03.out b/testdata/language-features/basic-values/def03.out
index bd9e7133..38bae81f 100644
--- a/testdata/language-features/basic-values/def03.out
+++ b/testdata/language-features/basic-values/def03.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-fun :: forall a . ('Eq a, 'Num a, 'Eq a, 'Num a) => a -> 'Char
+fun :: forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
 ------------ tooltips
 testdata/language-features/basic-values/def03.lc 1:1-1:4  forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
 testdata/language-features/basic-values/def03.lc 1:9-1:12  Char
diff --git a/testdata/language-features/basic-values/def04.out b/testdata/language-features/basic-values/def04.out
index 1f3fbeb7..977601b2 100644
--- a/testdata/language-features/basic-values/def04.out
+++ b/testdata/language-features/basic-values/def04.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-fun :: forall a . ('Eq a, 'Num a, 'Eq a, 'Num a) => a -> 'Char
-fun2 :: forall a b . ('Eq a, 'Num a, 'Eq a, 'Num a) => a -> b -> 'Char
+fun :: forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
+fun2 :: forall a b . (Eq a, Num a, Eq a, Num a) => a -> b -> Char
 ------------ tooltips
 testdata/language-features/basic-values/def04.lc 1:1-1:4  forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
 testdata/language-features/basic-values/def04.lc 1:9-1:12  Char
diff --git a/testdata/language-features/basic-values/def07.reject.out b/testdata/language-features/basic-values/def07.reject.out
index c52ecc70..8cb5a1a4 100644
--- a/testdata/language-features/basic-values/def07.reject.out
+++ b/testdata/language-features/basic-values/def07.reject.out
@@ -5,9 +5,9 @@ and at testdata/language-features/basic-values/def07.reject.lc:1:1:
 fun 1 = '1'
 ^^^
 ------------ trace
-fun :: forall a . ('Eq a, 'Num a, 'Eq a, 'Num a) => a -> 'Char
-fun2 :: forall a b . ('Eq a, 'Num a) => a -> b -> 'Char
-fun :: forall a . a -> 'Char
+fun :: forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
+fun2 :: forall a b . (Eq a, Num a) => a -> b -> Char
+fun :: forall a . a -> Char
 !already defined fun at testdata/language-features/basic-values/def07.reject.lc:4:1:
 fun _ = '_'
 ^^^
diff --git a/testdata/language-features/basic-values/deforder01.out b/testdata/language-features/basic-values/deforder01.out
index 5dd94137..325f4361 100644
--- a/testdata/language-features/basic-values/deforder01.out
+++ b/testdata/language-features/basic-values/deforder01.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-x :: 'Char
-y :: 'Char
+x :: Char
+y :: Char
 ------------ tooltips
 testdata/language-features/basic-values/deforder01.lc 1:1-1:2  Char
 testdata/language-features/basic-values/deforder01.lc 1:5-1:8  Char
diff --git a/testdata/language-features/basic-values/deforder02.out b/testdata/language-features/basic-values/deforder02.out
index 473b93ff..9f79a9bd 100644
--- a/testdata/language-features/basic-values/deforder02.out
+++ b/testdata/language-features/basic-values/deforder02.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-x :: 'Char
-y :: 'Char
+x :: Char
+y :: Char
 ------------ tooltips
 testdata/language-features/basic-values/deforder02.lc 1:1-1:2  Char
 testdata/language-features/basic-values/deforder02.lc 1:5-1:6  Char
diff --git a/testdata/language-features/basic-values/deforder03.out b/testdata/language-features/basic-values/deforder03.out
index f7c5fa08..d98597f6 100644
--- a/testdata/language-features/basic-values/deforder03.out
+++ b/testdata/language-features/basic-values/deforder03.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'Char
+value :: Char
 ------------ tooltips
 testdata/language-features/basic-values/deforder03.lc 1:1-1:6  Char
 testdata/language-features/basic-values/deforder03.lc 1:17-1:19  ()
diff --git a/testdata/language-features/basic-values/deforder04.out b/testdata/language-features/basic-values/deforder04.out
index 430a18c3..5d6e1d80 100644
--- a/testdata/language-features/basic-values/deforder04.out
+++ b/testdata/language-features/basic-values/deforder04.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'Char
+value :: Char
 ------------ tooltips
 testdata/language-features/basic-values/deforder04.lc 1:1-1:6  Char
 testdata/language-features/basic-values/deforder04.lc 1:17-1:18  ()
diff --git a/testdata/language-features/basic-values/deforder05.out b/testdata/language-features/basic-values/deforder05.out
index 59230da2..73897e36 100644
--- a/testdata/language-features/basic-values/deforder05.out
+++ b/testdata/language-features/basic-values/deforder05.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'Char
+value :: Char
 ------------ tooltips
 testdata/language-features/basic-values/deforder05.lc 1:1-1:6  Char
 testdata/language-features/basic-values/deforder05.lc 1:9-1:12  Char
diff --git a/testdata/language-features/basic-values/deforder06.out b/testdata/language-features/basic-values/deforder06.out
index 55bffe51..794432d6 100644
--- a/testdata/language-features/basic-values/deforder06.out
+++ b/testdata/language-features/basic-values/deforder06.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'Char
+value :: Char
 ------------ tooltips
 testdata/language-features/basic-values/deforder06.lc 1:1-1:6  Char
 testdata/language-features/basic-values/deforder06.lc 1:9-1:12  Char
diff --git a/testdata/language-features/basic-values/fixity02.out b/testdata/language-features/basic-values/fixity02.out
index 2f87c92d..e16184f0 100644
--- a/testdata/language-features/basic-values/fixity02.out
+++ b/testdata/language-features/basic-values/fixity02.out
@@ -4,21 +4,21 @@ funL :: forall a b . a -> b -> a
 funR :: forall a b . a -> b -> b
 <@ :: forall a b . a -> b -> a
 @> :: forall a b . a -> b -> b
-value1 :: 'Float
-value2 :: 'Float
-value3 :: 'Float
-value4 :: 'Float
-value5 :: 'String
-value6 :: 'Char
-value7 :: 'String
+value1 :: Float
+value2 :: Float
+value3 :: Float
+value4 :: Float
+value5 :: String
+value6 :: Char
+value7 :: String
 value8 :: ()
-funValue1 :: 'Float
-funValue2 :: 'Float
-funValue3 :: 'Float
-funValue4 :: 'Float
-funValue5 :: 'String
-funValue6 :: 'Char
-funValue7 :: 'String
+funValue1 :: Float
+funValue2 :: Float
+funValue3 :: Float
+funValue4 :: Float
+funValue5 :: String
+funValue6 :: Char
+funValue7 :: String
 funValue8 :: ()
 ------------ tooltips
 testdata/language-features/basic-values/fixity02.lc 1:1-1:5  forall a b . a -> b -> a
diff --git a/testdata/language-features/basic-values/if01.out b/testdata/language-features/basic-values/if01.out
index 991efd46..b68d03e3 100644
--- a/testdata/language-features/basic-values/if01.out
+++ b/testdata/language-features/basic-values/if01.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
 value1 :: ()
-value2 :: 'Float
+value2 :: Float
 ------------ tooltips
 testdata/language-features/basic-values/if01.lc 1:1-1:7  ()
 testdata/language-features/basic-values/if01.lc 1:10-1:33  ()
diff --git a/testdata/language-features/basic-values/infix03.out b/testdata/language-features/basic-values/infix03.out
index 3420e35e..213d9e06 100644
--- a/testdata/language-features/basic-values/infix03.out
+++ b/testdata/language-features/basic-values/infix03.out
@@ -1,12 +1,12 @@
 main is not found
 ------------ trace
 'D :: Type
-D2 :: () -> () -> 'D
-D3 :: () -> () -> () -> 'D
-'DCase :: forall (a :: 'D -> Type) -> (forall (b :: ()) (c :: ()) -> a (D2 b c)) -> (forall (d :: ()) (e :: ()) (f :: ()) -> a (D3 d e f)) -> forall (g :: 'D) -> a g
-match'D :: forall (a :: Type -> Type) -> a 'D -> forall b -> a b -> a b
-d2 :: () -> () -> 'D
-d3 :: () -> () -> () -> 'D
+D2 :: () -> () -> D
+D3 :: () -> () -> () -> D
+'DCase :: forall (a :: D -> Type) -> (forall (b :: ()) (c :: ()) -> a ('D2 b c)) -> (forall (d :: ()) (e :: ()) (f :: ()) -> a ('D3 d e f)) -> forall (g :: D) -> a g
+match'D :: forall (a :: Type -> Type) -> a D -> forall b -> a b -> a b
+d2 :: () -> () -> D
+d3 :: () -> () -> () -> D
 ------------ tooltips
 testdata/language-features/basic-values/infix03.lc 1:6-1:7  Type
 testdata/language-features/basic-values/infix03.lc 1:6-1:18  Type
diff --git a/testdata/language-features/basic-values/let01.out b/testdata/language-features/basic-values/let01.out
index 8ab8c8e0..36ecf369 100644
--- a/testdata/language-features/basic-values/let01.out
+++ b/testdata/language-features/basic-values/let01.out
@@ -1,10 +1,10 @@
 main is not found
 ------------ trace
-value1 :: forall a . 'Num a => a
-value2 :: forall a . 'Num a => a
-value3 :: forall a . 'Num a => a
-value4 :: forall a . 'Num a => a
-value5 :: forall a . 'Num a => a
+value1 :: forall a . Num a => a
+value2 :: forall a . Num a => a
+value3 :: forall a . Num a => a
+value4 :: forall a . Num a => a
+value5 :: forall a . Num a => a
 ------------ tooltips
 testdata/language-features/basic-values/let01.lc 1:1-1:7  forall a . Num a => a
 testdata/language-features/basic-values/let01.lc 1:18-1:19  _b
diff --git a/testdata/language-features/basic-values/literal01.out b/testdata/language-features/basic-values/literal01.out
index 0f7b3dbf..abaca3a7 100644
--- a/testdata/language-features/basic-values/literal01.out
+++ b/testdata/language-features/basic-values/literal01.out
@@ -1,13 +1,13 @@
 main is not found
 ------------ trace
-intValue1 :: forall a . 'Num a => a
-intValue2 :: forall a . 'Num a => a
-intValue3 :: forall a . 'Num a => a
-floatValue1 :: 'Float
-floatValue2 :: 'Float
-charValue :: 'Char
-stringValue1 :: 'String
-stringValue2 :: 'String
+intValue1 :: forall a . Num a => a
+intValue2 :: forall a . Num a => a
+intValue3 :: forall a . Num a => a
+floatValue1 :: Float
+floatValue2 :: Float
+charValue :: Char
+stringValue1 :: String
+stringValue2 :: String
 ------------ tooltips
 testdata/language-features/basic-values/literal01.lc 1:1-1:10  forall a . Num a => a
 testdata/language-features/basic-values/literal01.lc 1:13-1:14  _b
diff --git a/testdata/language-features/basic-values/shadowing01.out b/testdata/language-features/basic-values/shadowing01.out
index 8956a8a3..9a8f5f22 100644
--- a/testdata/language-features/basic-values/shadowing01.out
+++ b/testdata/language-features/basic-values/shadowing01.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'Char
+value :: Char
 ------------ tooltips
 testdata/language-features/basic-values/shadowing01.lc 1:1-1:6  Char
 testdata/language-features/basic-values/shadowing01.lc 2:11-2:14  Char
diff --git a/testdata/language-features/basic-values/shadowing02.out b/testdata/language-features/basic-values/shadowing02.out
index 201f5f75..d4d4373b 100644
--- a/testdata/language-features/basic-values/shadowing02.out
+++ b/testdata/language-features/basic-values/shadowing02.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
-c :: forall a . 'Num a => a
-world :: 'String
-value2 :: 'Char
+c :: forall a . Num a => a
+world :: String
+value2 :: Char
 ------------ tooltips
 testdata/language-features/basic-values/shadowing02.lc 1:1-1:2  forall a . Num a => a
 testdata/language-features/basic-values/shadowing02.lc 1:5-1:6  _b
diff --git a/testdata/language-features/basic-values/tuple02.out b/testdata/language-features/basic-values/tuple02.out
index 649fc85f..4e15f913 100644
--- a/testdata/language-features/basic-values/tuple02.out
+++ b/testdata/language-features/basic-values/tuple02.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
-tuple1 :: forall a . 'Num a => (a, 'Float, 'Char, 'String, ())
+tuple1 :: forall a . Num a => (a, Float, Char, String, ())
 tuple2 :: ((), ())
-tuple3 :: (('String, 'Char), ())
+tuple3 :: ((String, Char), ())
 ------------ tooltips
 testdata/language-features/basic-values/tuple02.lc 1:1-1:7  forall a . Num a => (a, Float, Char, String, ())
 testdata/language-features/basic-values/tuple02.lc 1:10-1:33  (_b, Float, Char, String, ())
diff --git a/testdata/language-features/basic-values/typesig01.out b/testdata/language-features/basic-values/typesig01.out
index cd018c6f..c473b40c 100644
--- a/testdata/language-features/basic-values/typesig01.out
+++ b/testdata/language-features/basic-values/typesig01.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-value1 :: 'Char
-value2 :: 'Char
+value1 :: Char
+value2 :: Char
 ------------ tooltips
 testdata/language-features/basic-values/typesig01.lc 1:11-1:15  Type
 testdata/language-features/basic-values/typesig01.lc 2:1-2:7  Char
diff --git a/testdata/language-features/basic-values/typesig02.out b/testdata/language-features/basic-values/typesig02.out
index bbaa5075..c1e6361e 100644
--- a/testdata/language-features/basic-values/typesig02.out
+++ b/testdata/language-features/basic-values/typesig02.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-value1 :: 'Char
-value2 :: 'Char
+value1 :: Char
+value2 :: Char
 ------------ tooltips
 testdata/language-features/basic-values/typesig02.lc 1:1-1:7  Char
 testdata/language-features/basic-values/typesig02.lc 1:10-1:13  Char
diff --git a/testdata/language-features/basic-values/typesig05.out b/testdata/language-features/basic-values/typesig05.out
index 1e8fa0f6..d107f4eb 100644
--- a/testdata/language-features/basic-values/typesig05.out
+++ b/testdata/language-features/basic-values/typesig05.out
@@ -2,10 +2,10 @@ main is not found
 ------------ trace
 funL :: forall a b . a -> b -> a
 funR :: forall a b . a -> b -> b
-value1 :: 'Char
-value2 :: 'String
-value3 :: 'Char
-value4 :: 'String
+value1 :: Char
+value2 :: String
+value3 :: Char
+value4 :: String
 ------------ tooltips
 testdata/language-features/basic-values/typesig05.lc 1:1-1:5  forall a b . a -> b -> a
 testdata/language-features/basic-values/typesig05.lc 1:12-1:13  _d
diff --git a/testdata/language-features/basic-values/typesig06.out b/testdata/language-features/basic-values/typesig06.out
index a5bcd427..c249026f 100644
--- a/testdata/language-features/basic-values/typesig06.out
+++ b/testdata/language-features/basic-values/typesig06.out
@@ -2,8 +2,8 @@ main is not found
 ------------ trace
 funL :: forall a b . a -> b -> a
 <@ :: forall a b . a -> b -> a
-value1 :: 'String
-value2 :: 'String
+value1 :: String
+value2 :: String
 ------------ tooltips
 testdata/language-features/basic-values/typesig06.lc 1:1-1:5  forall a b . a -> b -> a
 testdata/language-features/basic-values/typesig06.lc 1:12-1:13  _d
diff --git a/testdata/language-features/basic-values/typesig07.out b/testdata/language-features/basic-values/typesig07.out
index d8beb681..65ce8df7 100644
--- a/testdata/language-features/basic-values/typesig07.out
+++ b/testdata/language-features/basic-values/typesig07.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
-value1 :: 'Int
-value2 :: 'Int
-value3 :: 'Int
+value1 :: Int
+value2 :: Int
+value3 :: Int
 value4 :: () -> () -> ()
 @@@ :: () -> () -> ()
 value6 :: () -> () -> ()
diff --git a/testdata/language-features/basic-values/where05.out b/testdata/language-features/basic-values/where05.out
index a0785fa9..11743f93 100644
--- a/testdata/language-features/basic-values/where05.out
+++ b/testdata/language-features/basic-values/where05.out
@@ -1,9 +1,9 @@
 main is not found
 ------------ trace
-value1 :: forall a . ('Eq a, 'Num a) => ()
-value2 :: forall a . ('Eq a, 'Num a) => ()
-value3 :: forall a . ('Eq a, 'Num a) => ()
-value4 :: forall a . ('Eq a, 'Num a) => ()
+value1 :: forall a . (Eq a, Num a) => ()
+value2 :: forall a . (Eq a, Num a) => ()
+value3 :: forall a . (Eq a, Num a) => ()
+value4 :: forall a . (Eq a, Num a) => ()
 ------------ tooltips
 testdata/language-features/basic-values/where05.lc 1:1-1:7  forall a . (Eq a, Num a) => ()
 testdata/language-features/basic-values/where05.lc 1:10-3:10  ()
diff --git a/testdata/language-features/guard/guard03.out b/testdata/language-features/guard/guard03.out
index 2af70393..7090e22b 100644
--- a/testdata/language-features/guard/guard03.out
+++ b/testdata/language-features/guard/guard03.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'String
+value :: String
 ------------ tooltips
 testdata/language-features/guard/guard03.lc 1:1-1:6  String
 testdata/language-features/guard/guard03.lc 2:5-2:9  Bool
diff --git a/testdata/language-features/guard/guard04.out b/testdata/language-features/guard/guard04.out
index bf31f3ec..3f34c61b 100644
--- a/testdata/language-features/guard/guard04.out
+++ b/testdata/language-features/guard/guard04.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'String
+value :: String
 ------------ tooltips
 testdata/language-features/guard/guard04.lc 1:1-1:6  String
 testdata/language-features/guard/guard04.lc 2:5-2:9  Bool
diff --git a/testdata/language-features/guard/guard07.out b/testdata/language-features/guard/guard07.out
index f4e69791..38e182d2 100644
--- a/testdata/language-features/guard/guard07.out
+++ b/testdata/language-features/guard/guard07.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'String
+value :: String
 ------------ tooltips
 testdata/language-features/guard/guard07.lc 1:1-1:6  String
 testdata/language-features/guard/guard07.lc 1:7-1:11  Bool
diff --git a/testdata/language-features/guard/guard08.out b/testdata/language-features/guard/guard08.out
index 5c9c1111..075a074b 100644
--- a/testdata/language-features/guard/guard08.out
+++ b/testdata/language-features/guard/guard08.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'String
+value :: String
 ------------ tooltips
 testdata/language-features/guard/guard08.lc 1:1-1:6  String
 testdata/language-features/guard/guard08.lc 1:7-1:11  Bool
diff --git a/testdata/language-features/guard/guard09.out b/testdata/language-features/guard/guard09.out
index e0b89ef8..694aaa0a 100644
--- a/testdata/language-features/guard/guard09.out
+++ b/testdata/language-features/guard/guard09.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'String
+value :: String
 ------------ tooltips
 testdata/language-features/guard/guard09.lc 1:1-1:6  String
 testdata/language-features/guard/guard09.lc 1:7-1:11  Bool
diff --git a/testdata/language-features/guard/guard11.out b/testdata/language-features/guard/guard11.out
index abf02c69..08498e54 100644
--- a/testdata/language-features/guard/guard11.out
+++ b/testdata/language-features/guard/guard11.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-fun :: 'Bool -> 'String
+fun :: Bool -> String
 ------------ tooltips
 testdata/language-features/guard/guard11.lc 1:1-1:4  Bool -> String
 testdata/language-features/guard/guard11.lc 2:5-2:6  _b
diff --git a/testdata/language-features/guard/guard13.out b/testdata/language-features/guard/guard13.out
index 06e22436..2ab6fd64 100644
--- a/testdata/language-features/guard/guard13.out
+++ b/testdata/language-features/guard/guard13.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-fun :: 'Bool -> ()
+fun :: Bool -> ()
 ------------ tooltips
 testdata/language-features/guard/guard13.lc 1:1-1:4  Bool -> ()
 testdata/language-features/guard/guard13.lc 1:7-1:8  _b
diff --git a/testdata/language-features/guard/guard16.out b/testdata/language-features/guard/guard16.out
index d2bec88d..1c3bd27d 100644
--- a/testdata/language-features/guard/guard16.out
+++ b/testdata/language-features/guard/guard16.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: forall a . ('Eq a, 'Num a) => ()
+value :: forall a . (Eq a, Num a) => ()
 ------------ tooltips
 testdata/language-features/guard/guard16.lc 1:1-1:6  forall a . (Eq a, Num a) => ()
 testdata/language-features/guard/guard16.lc 1:9-3:10  ()
diff --git a/testdata/language-features/module/Hello01.out b/testdata/language-features/module/Hello01.out
index 08a387f1..1092217c 100644
--- a/testdata/language-features/module/Hello01.out
+++ b/testdata/language-features/module/Hello01.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-hello :: 'String
-world :: 'String
+hello :: String
+world :: String
 ------------ tooltips
 testdata/language-features/module/Hello01.lc 3:1-3:6  String
 testdata/language-features/module/Hello01.lc 3:9-3:16  String
diff --git a/testdata/language-features/module/Hello02.out b/testdata/language-features/module/Hello02.out
index 17b419db..5add282c 100644
--- a/testdata/language-features/module/Hello02.out
+++ b/testdata/language-features/module/Hello02.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-hello :: 'String
-world :: 'String
+hello :: String
+world :: String
 ------------ tooltips
 testdata/language-features/module/Hello02.lc 3:1-3:6  String
 testdata/language-features/module/Hello02.lc 3:9-3:16  String
diff --git a/testdata/language-features/module/Hello03.out b/testdata/language-features/module/Hello03.out
index 4d5deb19..12f70b11 100644
--- a/testdata/language-features/module/Hello03.out
+++ b/testdata/language-features/module/Hello03.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-greeting :: 'Char
-value :: 'Float
+greeting :: Char
+value :: Float
 ------------ tooltips
 testdata/language-features/module/Hello03.lc 7:1-7:9  Char
 testdata/language-features/module/Hello03.lc 7:12-7:15  Char
diff --git a/testdata/language-features/module/ModulePackage/SubModule01.out b/testdata/language-features/module/ModulePackage/SubModule01.out
index 347da0c0..513c363e 100644
--- a/testdata/language-features/module/ModulePackage/SubModule01.out
+++ b/testdata/language-features/module/ModulePackage/SubModule01.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-hello :: 'String
+hello :: String
 ------------ tooltips
 testdata/language-features/module/ModulePackage/SubModule01.lc 3:1-3:6  String
 testdata/language-features/module/ModulePackage/SubModule01.lc 3:9-3:16  String
diff --git a/testdata/language-features/module/Moduledef06.out b/testdata/language-features/module/Moduledef06.out
index 39b689da..0d6e7543 100644
--- a/testdata/language-features/module/Moduledef06.out
+++ b/testdata/language-features/module/Moduledef06.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-hello :: 'String
+hello :: String
 ------------ tooltips
 testdata/language-features/module/Moduledef06.lc 3:1-3:6  String
 testdata/language-features/module/Moduledef06.lc 3:9-3:16  String
diff --git a/testdata/language-features/module/Moduledef07.out b/testdata/language-features/module/Moduledef07.out
index c465589a..abacda06 100644
--- a/testdata/language-features/module/Moduledef07.out
+++ b/testdata/language-features/module/Moduledef07.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-hello :: 'String
+hello :: String
 ------------ tooltips
 testdata/language-features/module/Moduledef07.lc 5:1-5:6  String
 testdata/language-features/module/Moduledef07.lc 5:9-5:16  String
diff --git a/testdata/language-features/module/Moduledef08.out b/testdata/language-features/module/Moduledef08.out
index e6100f0d..873b2467 100644
--- a/testdata/language-features/module/Moduledef08.out
+++ b/testdata/language-features/module/Moduledef08.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-hello :: 'String
+hello :: String
 ------------ tooltips
 testdata/language-features/module/Moduledef08.lc 5:1-5:6  String
 testdata/language-features/module/Moduledef08.lc 5:9-5:16  String
diff --git a/testdata/language-features/module/Moduledef09.out b/testdata/language-features/module/Moduledef09.out
index 76e2a240..f8d17e75 100644
--- a/testdata/language-features/module/Moduledef09.out
+++ b/testdata/language-features/module/Moduledef09.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-hello :: 'String
-world :: 'String
+hello :: String
+world :: String
 ------------ tooltips
 testdata/language-features/module/Moduledef09.lc 5:1-5:6  String
 testdata/language-features/module/Moduledef09.lc 5:9-5:16  String
diff --git a/testdata/language-features/module/Moduledef10.out b/testdata/language-features/module/Moduledef10.out
index 69ce937f..6064ace1 100644
--- a/testdata/language-features/module/Moduledef10.out
+++ b/testdata/language-features/module/Moduledef10.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-hello :: 'String
-world :: 'String
+hello :: String
+world :: String
 value :: ()
 ------------ tooltips
 testdata/language-features/module/Moduledef10.lc 6:1-6:6  String
diff --git a/testdata/language-features/module/Moduledef13.out b/testdata/language-features/module/Moduledef13.out
index a5f17505..01a5781b 100644
--- a/testdata/language-features/module/Moduledef13.out
+++ b/testdata/language-features/module/Moduledef13.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-hello :: 'String
+hello :: String
 ------------ tooltips
 testdata/language-features/module/Moduledef13.lc 3:1-3:6  String
 testdata/language-features/module/Moduledef13.lc 3:9-3:16  String
diff --git a/testdata/language-features/module/import01.out b/testdata/language-features/module/import01.out
index f22bf842..fbf732d3 100644
--- a/testdata/language-features/module/import01.out
+++ b/testdata/language-features/module/import01.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-x :: 'String
+x :: String
 ------------ tooltips
 testdata/language-features/module/import01.lc 3:1-3:2  String
 testdata/language-features/module/import01.lc 3:5-3:10  String
diff --git a/testdata/language-features/module/import04.reject.out b/testdata/language-features/module/import04.reject.out
index 85752b47..da33fb8b 100644
--- a/testdata/language-features/module/import04.reject.out
+++ b/testdata/language-features/module/import04.reject.out
@@ -5,7 +5,7 @@ and at testdata/language-features/module/Hello01.lc:3:1:
 hello = "hello"
 ^^^^^
 ------------ trace
-hello :: 'String
+hello :: String
 !already defined hello at testdata/language-features/module/import04.reject.lc:4:1:
 hello = "hello"
 ^^^^^
diff --git a/testdata/language-features/module/import05.out b/testdata/language-features/module/import05.out
index 2d8e2a30..3ed4aafc 100644
--- a/testdata/language-features/module/import05.out
+++ b/testdata/language-features/module/import05.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-x :: 'String
+x :: String
 ------------ tooltips
 testdata/language-features/module/import05.lc 3:6-3:12  Type
 testdata/language-features/module/import05.lc 4:1-4:2  String
diff --git a/testdata/language-features/module/import06.out b/testdata/language-features/module/import06.out
index 7a77815a..b9ec1f0f 100644
--- a/testdata/language-features/module/import06.out
+++ b/testdata/language-features/module/import06.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
 hello :: ()
-x :: 'String
+x :: String
 ------------ tooltips
 testdata/language-features/module/import06.lc 3:1-3:6  ()
 testdata/language-features/module/import06.lc 3:9-3:11  ()
diff --git a/testdata/language-features/module/import07.out b/testdata/language-features/module/import07.out
index 818bcafb..10ec3003 100644
--- a/testdata/language-features/module/import07.out
+++ b/testdata/language-features/module/import07.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
 hello :: ()
-x :: 'String
+x :: String
 ------------ tooltips
 testdata/language-features/module/import07.lc 3:1-3:6  ()
 testdata/language-features/module/import07.lc 3:9-3:11  ()
diff --git a/testdata/language-features/module/import08.out b/testdata/language-features/module/import08.out
index 6d053bdf..ea29a899 100644
--- a/testdata/language-features/module/import08.out
+++ b/testdata/language-features/module/import08.out
@@ -1,9 +1,9 @@
 main is not found
 ------------ trace
 value :: ()
-g :: 'Char
-h :: 'String
-w :: 'String
+g :: Char
+h :: String
+w :: String
 ------------ tooltips
 testdata/language-features/module/import08.lc 3:1-3:6  ()
 testdata/language-features/module/import08.lc 3:9-3:11  ()
diff --git a/testdata/language-features/module/import12.out b/testdata/language-features/module/import12.out
index 6f4ea030..fb54d02c 100644
--- a/testdata/language-features/module/import12.out
+++ b/testdata/language-features/module/import12.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-fun :: 'String
+fun :: String
 ------------ tooltips
 testdata/language-features/module/import12.lc 4:1-4:4  String
 testdata/language-features/module/import12.lc 4:7-4:12  String
diff --git a/testdata/language-features/module/import13.out b/testdata/language-features/module/import13.out
index bb815c78..9a46cd6d 100644
--- a/testdata/language-features/module/import13.out
+++ b/testdata/language-features/module/import13.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-fun :: 'String
+fun :: String
 ------------ tooltips
 testdata/language-features/module/import13.lc 4:1-4:4  String
 testdata/language-features/module/import13.lc 4:7-4:12  String
diff --git a/testdata/language-features/module/import14.out b/testdata/language-features/module/import14.out
index cdfebd2b..114303dd 100644
--- a/testdata/language-features/module/import14.out
+++ b/testdata/language-features/module/import14.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-fun :: 'String
+fun :: String
 ------------ tooltips
 testdata/language-features/module/import14.lc 4:1-4:4  String
 testdata/language-features/module/import14.lc 4:7-4:12  String
diff --git a/testdata/language-features/module/import15.out b/testdata/language-features/module/import15.out
index 5217f2c1..b4d11105 100644
--- a/testdata/language-features/module/import15.out
+++ b/testdata/language-features/module/import15.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-fun :: 'String
+fun :: String
 ------------ tooltips
 testdata/language-features/module/import15.lc 3:1-3:4  String
 testdata/language-features/module/import15.lc 3:7-3:12  String
diff --git a/testdata/language-features/pattern/pattern01.out b/testdata/language-features/pattern/pattern01.out
index 2d8ea959..8e753e7d 100644
--- a/testdata/language-features/pattern/pattern01.out
+++ b/testdata/language-features/pattern/pattern01.out
@@ -1,9 +1,9 @@
 main is not found
 ------------ trace
-fun1 :: forall a . ('Eq a, 'Num a) => a -> 'Char
-fun2 :: 'String -> 'Char
-fun3 :: 'Char -> 'Char
-fun4 :: () -> 'Char
+fun1 :: forall a . (Eq a, Num a) => a -> Char
+fun2 :: String -> Char
+fun3 :: Char -> Char
+fun4 :: () -> Char
 ------------ tooltips
 testdata/language-features/pattern/pattern01.lc 1:1-1:5  forall a . (Eq a, Num a) => a -> Char
 testdata/language-features/pattern/pattern01.lc 1:10-1:13  Char
diff --git a/testdata/language-features/pattern/uncovered.out b/testdata/language-features/pattern/uncovered.out
index f51d2e84..2ff30ef1 100644
--- a/testdata/language-features/pattern/uncovered.out
+++ b/testdata/language-features/pattern/uncovered.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-f :: forall a . 'Num a => 'Bool -> 'Bool -> 'Bool -> a
+f :: forall a . Num a => Bool -> Bool -> Bool -> a
 ------------ tooltips
 testdata/language-features/pattern/uncovered.lc 4:1-4:2  forall a . Num a => Bool -> Bool -> Bool -> a
 testdata/language-features/pattern/uncovered.lc 4:18-4:19  _b
diff --git a/testdata/language-features/pattern/unreachable.out b/testdata/language-features/pattern/unreachable.out
index 4a899374..6c6f0a82 100644
--- a/testdata/language-features/pattern/unreachable.out
+++ b/testdata/language-features/pattern/unreachable.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-f :: forall a . a -> 'String
+f :: forall a . a -> String
 ------------ tooltips
 testdata/language-features/pattern/unreachable.lc 4:1-4:2  forall a . a -> String
 testdata/language-features/pattern/unreachable.lc 4:7-4:14  String
diff --git a/testdata/language-features/recursion/simplerec01.out b/testdata/language-features/recursion/simplerec01.out
index 42a0f078..f3c0147f 100644
--- a/testdata/language-features/recursion/simplerec01.out
+++ b/testdata/language-features/recursion/simplerec01.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-fun :: forall a . ('Num a, 'Eq a, 'Num a) => a -> 'Char
+fun :: forall a . (Num a, Eq a, Num a) => a -> Char
 ------------ tooltips
 testdata/language-features/recursion/simplerec01.lc 1:1-1:4  forall a . (Num a, Eq a, Num a) => a -> Char
 testdata/language-features/recursion/simplerec01.lc 1:9-1:12  Char
diff --git a/testdata/performance/Material.out b/testdata/performance/Material.out
index 958efb6f..d31c4191 100644
--- a/testdata/performance/Material.out
+++ b/testdata/performance/Material.out
@@ -1,161 +1,161 @@
 main is not found
 ------------ trace
-identityLight :: 'Float
+identityLight :: Float
 'Entity :: Type
-Entity :: 'Vec 4 'Float -> 'Vec 4 'Float -> 'Vec 3 'Float -> 'Vec 4 'Float -> 'Entity
-'EntityCase :: forall (a :: 'Entity -> Type) -> (forall (b :: 'Vec 4 'Float) (c :: 'Vec 4 'Float) (d :: 'Vec 3 'Float) (e :: 'Vec 4 'Float) -> a (Entity b c d e)) -> forall (f :: 'Entity) -> a f
-match'Entity :: forall (a :: Type -> Type) -> a 'Entity -> forall b -> a b -> a b
-eAmbientLight :: 'Entity -> 'VecS 'Float 4
-eDirectedLight :: 'Entity -> 'VecS 'Float 4
-eLightDir :: 'Entity -> 'VecS 'Float 3
-eShaderRGBA :: 'Entity -> 'VecS 'Float 4
+Entity :: Vec 4 Float -> Vec 4 Float -> Vec 3 Float -> Vec 4 Float -> Entity
+'EntityCase :: forall (a :: Entity -> Type) -> (forall (b :: Vec 4 Float) (c :: Vec 4 Float) (d :: Vec 3 Float) (e :: Vec 4 Float) -> a ('Entity b c d e)) -> forall (f :: Entity) -> a f
+match'Entity :: forall (a :: Type -> Type) -> a Entity -> forall b -> a b -> a b
+eAmbientLight :: Entity -> VecS Float 4
+eDirectedLight :: Entity -> VecS Float 4
+eLightDir :: Entity -> VecS Float 3
+eShaderRGBA :: Entity -> VecS Float 4
 'WaveType :: Type
-WT_Sin :: 'WaveType
-WT_Triangle :: 'WaveType
-WT_Square :: 'WaveType
-WT_Sawtooth :: 'WaveType
-WT_InverseSawtooth :: 'WaveType
-WT_Noise :: 'WaveType
-'WaveTypeCase :: forall (a :: 'WaveType -> Type) -> a WT_Sin -> a WT_Triangle -> a WT_Square -> a WT_Sawtooth -> a WT_InverseSawtooth -> a WT_Noise -> forall (b :: 'WaveType) -> a b
-match'WaveType :: forall (a :: Type -> Type) -> a 'WaveType -> forall b -> a b -> a b
+WT_Sin :: WaveType
+WT_Triangle :: WaveType
+WT_Square :: WaveType
+WT_Sawtooth :: WaveType
+WT_InverseSawtooth :: WaveType
+WT_Noise :: WaveType
+'WaveTypeCase :: forall (a :: WaveType -> Type) -> a 'WT_Sin -> a 'WT_Triangle -> a 'WT_Square -> a 'WT_Sawtooth -> a 'WT_InverseSawtooth -> a 'WT_Noise -> forall (b :: WaveType) -> a b
+match'WaveType :: forall (a :: Type -> Type) -> a WaveType -> forall b -> a b -> a b
 'Wave :: Type
-Wave :: 'WaveType -> 'Float -> 'Float -> 'Float -> 'Float -> 'Wave
-'WaveCase :: forall (a :: 'Wave -> Type) -> (forall (b :: 'WaveType) (c :: 'Float) (d :: 'Float) (e :: 'Float) (f :: 'Float) -> a (Wave b c d e f)) -> forall (g :: 'Wave) -> a g
-match'Wave :: forall (a :: Type -> Type) -> a 'Wave -> forall b -> a b -> a b
+Wave :: WaveType -> Float -> Float -> Float -> Float -> Wave
+'WaveCase :: forall (a :: Wave -> Type) -> (forall (b :: WaveType) (c :: Float) (d :: Float) (e :: Float) (f :: Float) -> a ('Wave b c d e f)) -> forall (g :: Wave) -> a g
+match'Wave :: forall (a :: Type -> Type) -> a Wave -> forall b -> a b -> a b
 'Deform :: Type
-D_AutoSprite :: 'Deform
-D_AutoSprite2 :: 'Deform
-D_Bulge :: 'Float -> 'Float -> 'Float -> 'Deform
-D_Move :: 'Vec 3 'Float -> 'Wave -> 'Deform
-D_Normal :: 'Float -> 'Float -> 'Deform
-D_ProjectionShadow :: 'Deform
-D_Text0 :: 'Deform
-D_Text1 :: 'Deform
-D_Text2 :: 'Deform
-D_Text3 :: 'Deform
-D_Text4 :: 'Deform
-D_Text5 :: 'Deform
-D_Text6 :: 'Deform
-D_Text7 :: 'Deform
-D_Wave :: 'Float -> 'Wave -> 'Deform
-'DeformCase :: forall (a :: 'Deform -> Type) -> a D_AutoSprite -> a D_AutoSprite2 -> (forall (b :: 'Float) (c :: 'Float) (d :: 'Float) -> a (D_Bulge b c d)) -> (forall (e :: 'Vec 3 'Float) (f :: 'Wave) -> a (D_Move e f)) -> (forall (g :: 'Float) (h :: 'Float) -> a (D_Normal g h)) -> a D_ProjectionShadow -> a D_Text0 -> a D_Text1 -> a D_Text2 -> a D_Text3 -> a D_Text4 -> a D_Text5 -> a D_Text6 -> a D_Text7 -> (forall (i :: 'Float) (j :: 'Wave) -> a (D_Wave i j)) -> forall (k :: 'Deform) -> a k
-match'Deform :: forall (a :: Type -> Type) -> a 'Deform -> forall b -> a b -> a b
+D_AutoSprite :: Deform
+D_AutoSprite2 :: Deform
+D_Bulge :: Float -> Float -> Float -> Deform
+D_Move :: Vec 3 Float -> Wave -> Deform
+D_Normal :: Float -> Float -> Deform
+D_ProjectionShadow :: Deform
+D_Text0 :: Deform
+D_Text1 :: Deform
+D_Text2 :: Deform
+D_Text3 :: Deform
+D_Text4 :: Deform
+D_Text5 :: Deform
+D_Text6 :: Deform
+D_Text7 :: Deform
+D_Wave :: Float -> Wave -> Deform
+'DeformCase :: forall (a :: Deform -> Type) -> a 'D_AutoSprite -> a 'D_AutoSprite2 -> (forall (b :: Float) (c :: Float) (d :: Float) -> a ('D_Bulge b c d)) -> (forall (e :: Vec 3 Float) (f :: Wave) -> a ('D_Move e f)) -> (forall (g :: Float) (h :: Float) -> a ('D_Normal g h)) -> a 'D_ProjectionShadow -> a 'D_Text0 -> a 'D_Text1 -> a 'D_Text2 -> a 'D_Text3 -> a 'D_Text4 -> a 'D_Text5 -> a 'D_Text6 -> a 'D_Text7 -> (forall (i :: Float) (j :: Wave) -> a ('D_Wave i j)) -> forall (k :: Deform) -> a k
+match'Deform :: forall (a :: Type -> Type) -> a Deform -> forall b -> a b -> a b
 'CullType :: Type
-CT_FrontSided :: 'CullType
-CT_BackSided :: 'CullType
-CT_TwoSided :: 'CullType
-'CullTypeCase :: forall (a :: 'CullType -> Type) -> a CT_FrontSided -> a CT_BackSided -> a CT_TwoSided -> forall (b :: 'CullType) -> a b
-match'CullType :: forall (a :: Type -> Type) -> a 'CullType -> forall b -> a b -> a b
+CT_FrontSided :: CullType
+CT_BackSided :: CullType
+CT_TwoSided :: CullType
+'CullTypeCase :: forall (a :: CullType -> Type) -> a 'CT_FrontSided -> a 'CT_BackSided -> a 'CT_TwoSided -> forall (b :: CullType) -> a b
+match'CullType :: forall (a :: Type -> Type) -> a CullType -> forall b -> a b -> a b
 'Blending' :: Type
-B_DstAlpha :: 'Blending'
-B_DstColor :: 'Blending'
-B_One :: 'Blending'
-B_OneMinusDstAlpha :: 'Blending'
-B_OneMinusDstColor :: 'Blending'
-B_OneMinusSrcAlpha :: 'Blending'
-B_OneMinusSrcColor :: 'Blending'
-B_SrcAlpha :: 'Blending'
-B_SrcAlphaSaturate :: 'Blending'
-B_SrcColor :: 'Blending'
-B_Zero :: 'Blending'
-'Blending'Case :: forall (a :: 'Blending' -> Type) -> a B_DstAlpha -> a B_DstColor -> a B_One -> a B_OneMinusDstAlpha -> a B_OneMinusDstColor -> a B_OneMinusSrcAlpha -> a B_OneMinusSrcColor -> a B_SrcAlpha -> a B_SrcAlphaSaturate -> a B_SrcColor -> a B_Zero -> forall (b :: 'Blending') -> a b
-match'Blending' :: forall (a :: Type -> Type) -> a 'Blending' -> forall b -> a b -> a b
+B_DstAlpha :: Blending'
+B_DstColor :: Blending'
+B_One :: Blending'
+B_OneMinusDstAlpha :: Blending'
+B_OneMinusDstColor :: Blending'
+B_OneMinusSrcAlpha :: Blending'
+B_OneMinusSrcColor :: Blending'
+B_SrcAlpha :: Blending'
+B_SrcAlphaSaturate :: Blending'
+B_SrcColor :: Blending'
+B_Zero :: Blending'
+'Blending'Case :: forall (a :: Blending' -> Type) -> a 'B_DstAlpha -> a 'B_DstColor -> a 'B_One -> a 'B_OneMinusDstAlpha -> a 'B_OneMinusDstColor -> a 'B_OneMinusSrcAlpha -> a 'B_OneMinusSrcColor -> a 'B_SrcAlpha -> a 'B_SrcAlphaSaturate -> a 'B_SrcColor -> a 'B_Zero -> forall (b :: Blending') -> a b
+match'Blending' :: forall (a :: Type -> Type) -> a Blending' -> forall b -> a b -> a b
 'RGBGen :: Type
-RGB_Wave :: 'Wave -> 'RGBGen
-RGB_Const :: 'Float -> 'Float -> 'Float -> 'RGBGen
-RGB_Identity :: 'RGBGen
-RGB_IdentityLighting :: 'RGBGen
-RGB_Entity :: 'RGBGen
-RGB_OneMinusEntity :: 'RGBGen
-RGB_ExactVertex :: 'RGBGen
-RGB_Vertex :: 'RGBGen
-RGB_LightingDiffuse :: 'RGBGen
-RGB_OneMinusVertex :: 'RGBGen
-RGB_Undefined :: 'RGBGen
-'RGBGenCase :: forall (a :: 'RGBGen -> Type) -> (forall (b :: 'Wave) -> a (RGB_Wave b)) -> (forall (c :: 'Float) (d :: 'Float) (e :: 'Float) -> a (RGB_Const c d e)) -> a RGB_Identity -> a RGB_IdentityLighting -> a RGB_Entity -> a RGB_OneMinusEntity -> a RGB_ExactVertex -> a RGB_Vertex -> a RGB_LightingDiffuse -> a RGB_OneMinusVertex -> a RGB_Undefined -> forall (f :: 'RGBGen) -> a f
-match'RGBGen :: forall (a :: Type -> Type) -> a 'RGBGen -> forall b -> a b -> a b
+RGB_Wave :: Wave -> RGBGen
+RGB_Const :: Float -> Float -> Float -> RGBGen
+RGB_Identity :: RGBGen
+RGB_IdentityLighting :: RGBGen
+RGB_Entity :: RGBGen
+RGB_OneMinusEntity :: RGBGen
+RGB_ExactVertex :: RGBGen
+RGB_Vertex :: RGBGen
+RGB_LightingDiffuse :: RGBGen
+RGB_OneMinusVertex :: RGBGen
+RGB_Undefined :: RGBGen
+'RGBGenCase :: forall (a :: RGBGen -> Type) -> (forall (b :: Wave) -> a ('RGB_Wave b)) -> (forall (c :: Float) (d :: Float) (e :: Float) -> a ('RGB_Const c d e)) -> a 'RGB_Identity -> a 'RGB_IdentityLighting -> a 'RGB_Entity -> a 'RGB_OneMinusEntity -> a 'RGB_ExactVertex -> a 'RGB_Vertex -> a 'RGB_LightingDiffuse -> a 'RGB_OneMinusVertex -> a 'RGB_Undefined -> forall (f :: RGBGen) -> a f
+match'RGBGen :: forall (a :: Type -> Type) -> a RGBGen -> forall b -> a b -> a b
 'AlphaGen :: Type
-A_Wave :: 'Wave -> 'AlphaGen
-A_Const :: 'Float -> 'AlphaGen
-A_Portal :: 'AlphaGen
-A_Identity :: 'AlphaGen
-A_Entity :: 'AlphaGen
-A_OneMinusEntity :: 'AlphaGen
-A_Vertex :: 'AlphaGen
-A_LightingSpecular :: 'AlphaGen
-A_OneMinusVertex :: 'AlphaGen
-'AlphaGenCase :: forall (a :: 'AlphaGen -> Type) -> (forall (b :: 'Wave) -> a (A_Wave b)) -> (forall (c :: 'Float) -> a (A_Const c)) -> a A_Portal -> a A_Identity -> a A_Entity -> a A_OneMinusEntity -> a A_Vertex -> a A_LightingSpecular -> a A_OneMinusVertex -> forall (d :: 'AlphaGen) -> a d
-match'AlphaGen :: forall (a :: Type -> Type) -> a 'AlphaGen -> forall b -> a b -> a b
+A_Wave :: Wave -> AlphaGen
+A_Const :: Float -> AlphaGen
+A_Portal :: AlphaGen
+A_Identity :: AlphaGen
+A_Entity :: AlphaGen
+A_OneMinusEntity :: AlphaGen
+A_Vertex :: AlphaGen
+A_LightingSpecular :: AlphaGen
+A_OneMinusVertex :: AlphaGen
+'AlphaGenCase :: forall (a :: AlphaGen -> Type) -> (forall (b :: Wave) -> a ('A_Wave b)) -> (forall (c :: Float) -> a ('A_Const c)) -> a 'A_Portal -> a 'A_Identity -> a 'A_Entity -> a 'A_OneMinusEntity -> a 'A_Vertex -> a 'A_LightingSpecular -> a 'A_OneMinusVertex -> forall (d :: AlphaGen) -> a d
+match'AlphaGen :: forall (a :: Type -> Type) -> a AlphaGen -> forall b -> a b -> a b
 'TCGen :: Type
-TG_Base :: 'TCGen
-TG_Lightmap :: 'TCGen
-TG_Environment :: 'TCGen
-TG_Vector :: 'Vec 3 'Float -> 'Vec 3 'Float -> 'TCGen
-TG_Undefined :: 'TCGen
-'TCGenCase :: forall (a :: 'TCGen -> Type) -> a TG_Base -> a TG_Lightmap -> a TG_Environment -> (forall (b :: 'Vec 3 'Float) (c :: 'Vec 3 'Float) -> a (TG_Vector b c)) -> a TG_Undefined -> forall (d :: 'TCGen) -> a d
-match'TCGen :: forall (a :: Type -> Type) -> a 'TCGen -> forall b -> a b -> a b
+TG_Base :: TCGen
+TG_Lightmap :: TCGen
+TG_Environment :: TCGen
+TG_Vector :: Vec 3 Float -> Vec 3 Float -> TCGen
+TG_Undefined :: TCGen
+'TCGenCase :: forall (a :: TCGen -> Type) -> a 'TG_Base -> a 'TG_Lightmap -> a 'TG_Environment -> (forall (b :: Vec 3 Float) (c :: Vec 3 Float) -> a ('TG_Vector b c)) -> a 'TG_Undefined -> forall (d :: TCGen) -> a d
+match'TCGen :: forall (a :: Type -> Type) -> a TCGen -> forall b -> a b -> a b
 'TCMod :: Type
-TM_EntityTranslate :: 'TCMod
-TM_Rotate :: 'Float -> 'TCMod
-TM_Scroll :: 'Float -> 'Float -> 'TCMod
-TM_Scale :: 'Float -> 'Float -> 'TCMod
-TM_Stretch :: 'Wave -> 'TCMod
-TM_Transform :: 'Float -> 'Float -> 'Float -> 'Float -> 'Float -> 'Float -> 'TCMod
-TM_Turb :: 'Float -> 'Float -> 'Float -> 'Float -> 'TCMod
-'TCModCase :: forall (a :: 'TCMod -> Type) -> a TM_EntityTranslate -> (forall (b :: 'Float) -> a (TM_Rotate b)) -> (forall (c :: 'Float) (d :: 'Float) -> a (TM_Scroll c d)) -> (forall (e :: 'Float) (f :: 'Float) -> a (TM_Scale e f)) -> (forall (g :: 'Wave) -> a (TM_Stretch g)) -> (forall (h :: 'Float) (i :: 'Float) (j :: 'Float) (k :: 'Float) (l :: 'Float) (m :: 'Float) -> a (TM_Transform h i j k l m)) -> (forall (n :: 'Float) (o :: 'Float) (p :: 'Float) (q :: 'Float) -> a (TM_Turb n o p q)) -> forall (r :: 'TCMod) -> a r
-match'TCMod :: forall (a :: Type -> Type) -> a 'TCMod -> forall b -> a b -> a b
+TM_EntityTranslate :: TCMod
+TM_Rotate :: Float -> TCMod
+TM_Scroll :: Float -> Float -> TCMod
+TM_Scale :: Float -> Float -> TCMod
+TM_Stretch :: Wave -> TCMod
+TM_Transform :: Float -> Float -> Float -> Float -> Float -> Float -> TCMod
+TM_Turb :: Float -> Float -> Float -> Float -> TCMod
+'TCModCase :: forall (a :: TCMod -> Type) -> a 'TM_EntityTranslate -> (forall (b :: Float) -> a ('TM_Rotate b)) -> (forall (c :: Float) (d :: Float) -> a ('TM_Scroll c d)) -> (forall (e :: Float) (f :: Float) -> a ('TM_Scale e f)) -> (forall (g :: Wave) -> a ('TM_Stretch g)) -> (forall (h :: Float) (i :: Float) (j :: Float) (k :: Float) (l :: Float) (m :: Float) -> a ('TM_Transform h i j k l m)) -> (forall (n :: Float) (o :: Float) (p :: Float) (q :: Float) -> a ('TM_Turb n o p q)) -> forall (r :: TCMod) -> a r
+match'TCMod :: forall (a :: Type -> Type) -> a TCMod -> forall b -> a b -> a b
 'StageTexture :: Type
-ST_Map :: 'String -> 'StageTexture
-ST_ClampMap :: 'String -> 'StageTexture
-ST_AnimMap :: 'Float -> 'List 'String -> 'StageTexture
-ST_Lightmap :: 'StageTexture
-ST_WhiteImage :: 'StageTexture
-'StageTextureCase :: forall (a :: 'StageTexture -> Type) -> (forall (b :: 'String) -> a (ST_Map b)) -> (forall (c :: 'String) -> a (ST_ClampMap c)) -> (forall (d :: 'Float) (e :: 'List 'String) -> a (ST_AnimMap d e)) -> a ST_Lightmap -> a ST_WhiteImage -> forall (f :: 'StageTexture) -> a f
-match'StageTexture :: forall (a :: Type -> Type) -> a 'StageTexture -> forall b -> a b -> a b
+ST_Map :: String -> StageTexture
+ST_ClampMap :: String -> StageTexture
+ST_AnimMap :: Float -> List String -> StageTexture
+ST_Lightmap :: StageTexture
+ST_WhiteImage :: StageTexture
+'StageTextureCase :: forall (a :: StageTexture -> Type) -> (forall (b :: String) -> a ('ST_Map b)) -> (forall (c :: String) -> a ('ST_ClampMap c)) -> (forall (d :: Float) (e :: List String) -> a ('ST_AnimMap d e)) -> a 'ST_Lightmap -> a 'ST_WhiteImage -> forall (f :: StageTexture) -> a f
+match'StageTexture :: forall (a :: Type -> Type) -> a StageTexture -> forall b -> a b -> a b
 'AlphaFunction :: Type
-A_Gt0 :: 'AlphaFunction
-A_Lt128 :: 'AlphaFunction
-A_Ge128 :: 'AlphaFunction
-'AlphaFunctionCase :: forall (a :: 'AlphaFunction -> Type) -> a A_Gt0 -> a A_Lt128 -> a A_Ge128 -> forall (b :: 'AlphaFunction) -> a b
-match'AlphaFunction :: forall (a :: Type -> Type) -> a 'AlphaFunction -> forall b -> a b -> a b
+A_Gt0 :: AlphaFunction
+A_Lt128 :: AlphaFunction
+A_Ge128 :: AlphaFunction
+'AlphaFunctionCase :: forall (a :: AlphaFunction -> Type) -> a 'A_Gt0 -> a 'A_Lt128 -> a 'A_Ge128 -> forall (b :: AlphaFunction) -> a b
+match'AlphaFunction :: forall (a :: Type -> Type) -> a AlphaFunction -> forall b -> a b -> a b
 'DepthFunction :: Type
-D_Equal :: 'DepthFunction
-D_Lequal :: 'DepthFunction
-'DepthFunctionCase :: forall (a :: 'DepthFunction -> Type) -> a D_Equal -> a D_Lequal -> forall (b :: 'DepthFunction) -> a b
-match'DepthFunction :: forall (a :: Type -> Type) -> a 'DepthFunction -> forall b -> a b -> a b
+D_Equal :: DepthFunction
+D_Lequal :: DepthFunction
+'DepthFunctionCase :: forall (a :: DepthFunction -> Type) -> a 'D_Equal -> a 'D_Lequal -> forall (b :: DepthFunction) -> a b
+match'DepthFunction :: forall (a :: Type -> Type) -> a DepthFunction -> forall b -> a b -> a b
 'StageAttrs :: Type
-StageAttrs :: 'Maybe ('Blending', 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String -> 'StageAttrs
-'StageAttrsCase :: forall (a :: 'StageAttrs -> Type) -> (forall (b :: 'Maybe ('Blending', 'Blending')) (c :: 'RGBGen) (d :: 'AlphaGen) (e :: 'TCGen) (f :: 'List 'TCMod) (g :: 'StageTexture) (h :: 'Bool) (i :: 'DepthFunction) (j :: 'Maybe 'AlphaFunction) (k :: 'Bool) (l :: 'String) -> a (StageAttrs b c d e f g h i j k l)) -> forall (m :: 'StageAttrs) -> a m
-match'StageAttrs :: forall (a :: Type -> Type) -> a 'StageAttrs -> forall b -> a b -> a b
-saBlend :: 'StageAttrs -> 'Maybe ('Blending', 'Blending')
-saRGBGen :: 'StageAttrs -> 'RGBGen
-saAlphaGen :: 'StageAttrs -> 'AlphaGen
-saTCGen :: 'StageAttrs -> 'TCGen
-saTCMod :: 'StageAttrs -> 'List 'TCMod
-saTexture :: 'StageAttrs -> 'StageTexture
-saDepthWrite :: 'StageAttrs -> 'Bool
-saDepthFunc :: 'StageAttrs -> 'DepthFunction
-saAlphaFunc :: 'StageAttrs -> 'Maybe 'AlphaFunction
-saDepthMaskExplicit :: 'StageAttrs -> 'Bool
-saTextureUniform :: 'StageAttrs -> 'String
-defaultStageAttrs :: 'StageAttrs
+StageAttrs :: Maybe (Blending', Blending') -> RGBGen -> AlphaGen -> TCGen -> List TCMod -> StageTexture -> Bool -> DepthFunction -> Maybe AlphaFunction -> Bool -> String -> StageAttrs
+'StageAttrsCase :: forall (a :: StageAttrs -> Type) -> (forall (b :: Maybe (Blending', Blending')) (c :: RGBGen) (d :: AlphaGen) (e :: TCGen) (f :: List TCMod) (g :: StageTexture) (h :: Bool) (i :: DepthFunction) (j :: Maybe AlphaFunction) (k :: Bool) (l :: String) -> a ('StageAttrs b c d e f g h i j k l)) -> forall (m :: StageAttrs) -> a m
+match'StageAttrs :: forall (a :: Type -> Type) -> a StageAttrs -> forall b -> a b -> a b
+saBlend :: StageAttrs -> Maybe (Blending', Blending')
+saRGBGen :: StageAttrs -> RGBGen
+saAlphaGen :: StageAttrs -> AlphaGen
+saTCGen :: StageAttrs -> TCGen
+saTCMod :: StageAttrs -> List TCMod
+saTexture :: StageAttrs -> StageTexture
+saDepthWrite :: StageAttrs -> Bool
+saDepthFunc :: StageAttrs -> DepthFunction
+saAlphaFunc :: StageAttrs -> Maybe AlphaFunction
+saDepthMaskExplicit :: StageAttrs -> Bool
+saTextureUniform :: StageAttrs -> String
+defaultStageAttrs :: StageAttrs
 'CommonAttrs :: Type
-CommonAttrs :: () -> () -> 'Bool -> 'Float -> 'Bool -> 'Bool -> 'CullType -> 'List 'Deform -> 'Bool -> 'Bool -> 'List 'StageAttrs -> 'Bool -> 'CommonAttrs
-'CommonAttrsCase :: forall (a :: 'CommonAttrs -> Type) -> (forall (b :: ()) (c :: ()) (d :: 'Bool) (e :: 'Float) (f :: 'Bool) (g :: 'Bool) (h :: 'CullType) (i :: 'List 'Deform) (j :: 'Bool) (k :: 'Bool) (l :: 'List 'StageAttrs) (m :: 'Bool) -> a (CommonAttrs b c d e f g h i j k l m)) -> forall (n :: 'CommonAttrs) -> a n
-match'CommonAttrs :: forall (a :: Type -> Type) -> a 'CommonAttrs -> forall b -> a b -> a b
-caSkyParms :: 'CommonAttrs -> ()
-caFogParms :: 'CommonAttrs -> ()
-caPortal :: 'CommonAttrs -> 'Bool
-caSort :: 'CommonAttrs -> 'Float
-caEntityMergable :: 'CommonAttrs -> 'Bool
-caFogOnly :: 'CommonAttrs -> 'Bool
-caCull :: 'CommonAttrs -> 'CullType
-caDeformVertexes :: 'CommonAttrs -> 'List 'Deform
-caNoMipMaps :: 'CommonAttrs -> 'Bool
-caPolygonOffset :: 'CommonAttrs -> 'Bool
-caStages :: 'CommonAttrs -> 'List 'StageAttrs
-caIsSky :: 'CommonAttrs -> 'Bool
-defaultCommonAttrs :: 'CommonAttrs
+CommonAttrs :: () -> () -> Bool -> Float -> Bool -> Bool -> CullType -> List Deform -> Bool -> Bool -> List StageAttrs -> Bool -> CommonAttrs
+'CommonAttrsCase :: forall (a :: CommonAttrs -> Type) -> (forall (b :: ()) (c :: ()) (d :: Bool) (e :: Float) (f :: Bool) (g :: Bool) (h :: CullType) (i :: List Deform) (j :: Bool) (k :: Bool) (l :: List StageAttrs) (m :: Bool) -> a ('CommonAttrs b c d e f g h i j k l m)) -> forall (n :: CommonAttrs) -> a n
+match'CommonAttrs :: forall (a :: Type -> Type) -> a CommonAttrs -> forall b -> a b -> a b
+caSkyParms :: CommonAttrs -> ()
+caFogParms :: CommonAttrs -> ()
+caPortal :: CommonAttrs -> Bool
+caSort :: CommonAttrs -> Float
+caEntityMergable :: CommonAttrs -> Bool
+caFogOnly :: CommonAttrs -> Bool
+caCull :: CommonAttrs -> CullType
+caDeformVertexes :: CommonAttrs -> List Deform
+caNoMipMaps :: CommonAttrs -> Bool
+caPolygonOffset :: CommonAttrs -> Bool
+caStages :: CommonAttrs -> List StageAttrs
+caIsSky :: CommonAttrs -> Bool
+defaultCommonAttrs :: CommonAttrs
 ------------ tooltips
 testdata/performance/Material.lc 7:18-7:23  Type
 testdata/performance/Material.lc 8:1-8:14  Float
diff --git a/testdata/performance/SampleMaterial.out b/testdata/performance/SampleMaterial.out
index 7776af0c..3f722498 100644
--- a/testdata/performance/SampleMaterial.out
+++ b/testdata/performance/SampleMaterial.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-sampleMaterial :: 'List ('String, 'CommonAttrs)
+sampleMaterial :: List (String, CommonAttrs)
 ------------ tooltips
 testdata/performance/SampleMaterial.lc 3:1-3:15  List (String, CommonAttrs)
 testdata/performance/SampleMaterial.lc 4:3-2183:4  List (String, CommonAttrs)
diff --git a/testdata/record01.reject.out b/testdata/record01.reject.out
index b03f9397..ab3d7153 100644
--- a/testdata/record01.reject.out
+++ b/testdata/record01.reject.out
@@ -84,8 +84,8 @@ testdata/record01.reject.lc 7:17-7:20  Float
 testdata/record01.reject.lc 7:21-7:24  Float
 testdata/record01.reject.lc 7:25-7:28  Float
 testdata/record01.reject.lc 7:29-7:32  Float
-testdata/record01.reject.lc 8:23-8:34  forall (a :: List Type) . 'sameLayerCounts a => HList a -> FrameBuffer (ImageLC ('head Type a)) ('map Type ImageKind GetImageKind a)
-testdata/record01.reject.lc 8:23-8:75  FrameBuffer 1 ('map Type ImageKind GetImageKind ('Cons (Image 1 'Depth) ('Cons (Image 1 ('Color (VecScalar 4 Float))) 'Nil)))
+testdata/record01.reject.lc 8:23-8:34  forall (a :: List Type) . sameLayerCounts a => HList a -> FrameBuffer (ImageLC (head Type a)) (map Type ImageKind GetImageKind a)
+testdata/record01.reject.lc 8:23-8:75  FrameBuffer 1 (map Type ImageKind GetImageKind ('Cons (Image 1 'Depth) ('Cons (Image 1 ('Color (VecScalar 4 Float))) 'Nil)))
 testdata/record01.reject.lc 8:35-8:75  (Image 1 'Depth, Image 1 ('Color (VecScalar 4 Float)))
 testdata/record01.reject.lc 8:36-8:47  Float -> Image 1 'Depth
 testdata/record01.reject.lc 8:36-8:54  Image 1 'Depth
@@ -170,8 +170,8 @@ testdata/record01.reject.lc 19:23-19:49  List (Primitive ((VecS Float 4)) _a) ->
 testdata/record01.reject.lc 19:23-19:62  List (Primitive (VecS Float 4, VecS Float 4) _a)
 testdata/record01.reject.lc 19:37-19:49  ((VecS Float 4)) -> (VecS Float 4, VecS Float 4)
 testdata/record01.reject.lc 19:50-19:62  forall (a :: PrimitiveType) . PrimitiveStream a ((Vec 4 Float))
-testdata/record01.reject.lc 20:23-20:42  forall (a :: List Type) (b :: PrimitiveType) . RasterContext (HList ('Cons (Vec 4 Float) a)) b -> HList ('map Type Type Interpolated a) -> List (Primitive (HList ('Cons (Vec 4 Float) a)) b) -> List (Vector 1 (Maybe (SimpleFragment (HList a))))
-testdata/record01.reject.lc 20:23-20:52  HList ('map Type Type Interpolated _a) -> List (Primitive (HList ('Cons (Vec 4 Float) _a)) 'Triangle) -> List (Vector 1 (Maybe (SimpleFragment (HList _a))))
+testdata/record01.reject.lc 20:23-20:42  forall (a :: List Type) (b :: PrimitiveType) . RasterContext (HList ('Cons (Vec 4 Float) a)) b -> HList (map Type Type Interpolated a) -> List (Primitive (HList ('Cons (Vec 4 Float) a)) b) -> List (Vector 1 (Maybe (SimpleFragment (HList a))))
+testdata/record01.reject.lc 20:23-20:52  HList (map Type Type Interpolated _a) -> List (Primitive (HList ('Cons (Vec 4 Float) _a)) 'Triangle) -> List (Vector 1 (Maybe (SimpleFragment (HList _a))))
 testdata/record01.reject.lc 20:23-20:63  List (Primitive (HList ('Cons (Vec 4 Float) _d)) 'Triangle) -> List (Vector 1 (Maybe (SimpleFragment (HList _d))))
 testdata/record01.reject.lc 20:23-20:79  List (Vector 1 (Maybe (SimpleFragment ((VecS Float 4)))))
 testdata/record01.reject.lc 20:43-20:52  forall a . RasterContext a 'Triangle
@@ -202,30 +202,30 @@ testdata/record01.reject.lc 22:49-22:52  Float
 testdata/record01.reject.lc 22:53-22:56  Float
 testdata/record01.reject.lc 22:57-22:60  Float
 testdata/record01.reject.lc 22:61-22:64  Float
-testdata/record01.reject.lc 23:23-23:33  forall (a :: Nat) (b :: List Type) c . HList b -> (c -> HList ('imageType' ('map Type ImageKind FragmentOperationKind b))) -> List (Vector a (Maybe (SimpleFragment c))) -> FrameBuffer a ('map Type ImageKind FragmentOperationKind b) -> FrameBuffer a ('map Type ImageKind FragmentOperationKind b)
-testdata/record01.reject.lc 23:23-23:45  (_a -> (('imageType (FragmentOperationKind (FragmentOperation ('Color (VecScalar 4 Float))))))) -> List (Vector _b (Maybe (SimpleFragment _a))) -> FrameBuffer _b ('map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil))) -> FrameBuffer _b ('map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil)))
-testdata/record01.reject.lc 23:23-23:60  List (Vector _a (Maybe (SimpleFragment ((VecS Float 4))))) -> FrameBuffer _a ('map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil))) -> FrameBuffer _a ('map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil)))
-testdata/record01.reject.lc 23:23-23:75  FrameBuffer 1 ('map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil))) -> FrameBuffer 1 ('map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil)))
-testdata/record01.reject.lc 23:23-23:83  FrameBuffer 1 ('map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil)))
+testdata/record01.reject.lc 23:23-23:33  forall (a :: Nat) (b :: List Type) c . HList b -> (c -> HList (imageType' (map Type ImageKind FragmentOperationKind b))) -> List (Vector a (Maybe (SimpleFragment c))) -> FrameBuffer a (map Type ImageKind FragmentOperationKind b) -> FrameBuffer a (map Type ImageKind FragmentOperationKind b)
+testdata/record01.reject.lc 23:23-23:45  (_a -> ((imageType (FragmentOperationKind (FragmentOperation ('Color (VecScalar 4 Float))))))) -> List (Vector _b (Maybe (SimpleFragment _a))) -> FrameBuffer _b (map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil))) -> FrameBuffer _b (map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil)))
+testdata/record01.reject.lc 23:23-23:60  List (Vector _a (Maybe (SimpleFragment ((VecS Float 4))))) -> FrameBuffer _a (map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil))) -> FrameBuffer _a (map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil)))
+testdata/record01.reject.lc 23:23-23:75  FrameBuffer 1 (map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil))) -> FrameBuffer 1 (map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil)))
+testdata/record01.reject.lc 23:23-23:83  FrameBuffer 1 (map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil)))
 testdata/record01.reject.lc 23:34-23:45  (FragmentOperation 'Depth, FragmentOperation ('Color (VecScalar 4 Float)))
 testdata/record01.reject.lc 23:46-23:60  ((VecS Float 4)) -> ((VecS Float 4))
 testdata/record01.reject.lc 23:61-23:75  List (Vector 1 (Maybe (SimpleFragment ((VecS Float 4)))))
-testdata/record01.reject.lc 23:76-23:83  FrameBuffer 1 ('map Type ImageKind GetImageKind ('Cons (Image 1 'Depth) ('Cons (Image 1 ('Color (VecScalar 4 Float))) 'Nil)))
-testdata/record01.reject.lc 24:12-24:58  RecordC ('Cons ('RecItem "fieldA" Float) ('Cons ('RecItem "fieldB" (FrameBuffer 1 ('map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil))))) ('Cons ('RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float)) 'Nil)))
+testdata/record01.reject.lc 23:76-23:83  FrameBuffer 1 (map Type ImageKind GetImageKind ('Cons (Image 1 'Depth) ('Cons (Image 1 ('Color (VecScalar 4 Float))) 'Nil)))
+testdata/record01.reject.lc 24:12-24:58  RecordC ('Cons ('RecItem "fieldA" Float) ('Cons ('RecItem "fieldB" (FrameBuffer 1 (map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil))))) ('Cons ('RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float)) 'Nil)))
 testdata/record01.reject.lc 24:13-24:19  RecItem | String
 testdata/record01.reject.lc 24:13-24:47  List RecItem
 testdata/record01.reject.lc 24:21-24:24  Float
-testdata/record01.reject.lc 24:21-24:57  (Float, 'recItemType ('RecItem "fieldB" (FrameBuffer 1 ('map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil))))), 'recItemType ('RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float)))
+testdata/record01.reject.lc 24:21-24:57  (Float, recItemType ('RecItem "fieldB" (FrameBuffer 1 (map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil))))), recItemType ('RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float)))
 testdata/record01.reject.lc 24:26-24:32  RecItem | String
 testdata/record01.reject.lc 24:26-24:47  List RecItem
-testdata/record01.reject.lc 24:34-24:39  FrameBuffer 1 ('map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil)))
-testdata/record01.reject.lc 24:34-24:57  (FrameBuffer 1 ('map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil))), 'recItemType ('RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float)))
+testdata/record01.reject.lc 24:34-24:39  FrameBuffer 1 (map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil)))
+testdata/record01.reject.lc 24:34-24:57  (FrameBuffer 1 (map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil))), recItemType ('RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float)))
 testdata/record01.reject.lc 24:41-24:47  List RecItem | RecItem | String
 testdata/record01.reject.lc 24:49-24:57  (((BlendEquation, BlendEquation) -> Blending Float)) | (BlendEquation, BlendEquation) -> Blending Float
-testdata/record01.reject.lc 25:11-25:17  RecordC ('Cons ('RecItem "fieldA" Float) ('Cons ('RecItem "fieldB" (FrameBuffer 1 ('map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil))))) ('Cons ('RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float)) 'Nil)))
+testdata/record01.reject.lc 25:11-25:17  RecordC ('Cons ('RecItem "fieldA" Float) ('Cons ('RecItem "fieldB" (FrameBuffer 1 (map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil))))) ('Cons ('RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float)) 'Nil)))
 testdata/record01.reject.lc 25:11-25:24  _b
 testdata/record01.reject.lc 25:18-25:24  String
 testdata/record01.reject.lc 26:5-26:14  forall (a :: Nat) (b :: List ImageKind) . FrameBuffer a b -> Output
-testdata/record01.reject.lc 26:15-26:21  RecordC ('Cons ('RecItem "fieldA" Float) ('Cons ('RecItem "fieldB" (FrameBuffer 1 ('map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil))))) ('Cons ('RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float)) 'Nil)))
+testdata/record01.reject.lc 26:15-26:21  RecordC ('Cons ('RecItem "fieldA" Float) ('Cons ('RecItem "fieldB" (FrameBuffer 1 (map Type ImageKind FragmentOperationKind ('Cons (FragmentOperation 'Depth) ('Cons (FragmentOperation ('Color (VecScalar 4 Float))) 'Nil))))) ('Cons ('RecItem "fieldC" ((BlendEquation, BlendEquation) -> Blending Float)) 'Nil)))
 testdata/record01.reject.lc 26:15-26:28  _b
 testdata/record01.reject.lc 26:22-26:28  String
diff --git a/testdata/traceTest.out b/testdata/traceTest.out
index 6c7bea5a..ba76748f 100644
--- a/testdata/traceTest.out
+++ b/testdata/traceTest.out
@@ -2,9 +2,9 @@ main is not found
 ------------ trace
 id :: forall a . a -> a
 'X :: forall a . a -> Type
-'XCase :: forall a (b :: a) . forall (c :: 'X a b -> Type) (d :: 'X a b) -> c d
-match'X :: forall (a :: Type -> Type) -> (forall b . forall (c :: b) -> a ('X b c)) -> forall d -> a d -> a d
-x :: 'X (Type -> Type -> Type) \a b -> (a, b)
+'XCase :: forall a (b :: a) . forall (c :: X a b -> Type) (d :: X a b) -> c d
+match'X :: forall (a :: Type -> Type) -> (forall b . forall (c :: b) -> a (X b c)) -> forall d -> a d -> a d
+x :: X (Type -> Type -> Type) \(a :: Type) (b :: Type) -> (a, b)
 ------------ tooltips
 testdata/traceTest.lc 6:1-6:3  forall a . a -> a
 testdata/traceTest.lc 6:8-6:9  _b
@@ -17,5 +17,5 @@ testdata/traceTest.lc 10:17-10:24  Type
 testdata/traceTest.lc 10:19-10:20  _e
 testdata/traceTest.lc 10:19-10:23  List Type
 testdata/traceTest.lc 10:22-10:23  List Type | _c
-testdata/traceTest.lc 11:1-11:2  X (Type -> Type -> Type) \a b -> (a, b)
+testdata/traceTest.lc 11:1-11:2  X (Type -> Type -> Type) \(a :: Type) (b :: Type) -> (a, b)
 testdata/traceTest.lc 11:5-11:14  forall a . a
diff --git a/testdata/typeclass.out b/testdata/typeclass.out
index 1d5b48d0..3f5e3629 100644
--- a/testdata/typeclass.out
+++ b/testdata/typeclass.out
@@ -1,11 +1,11 @@
 main is not found
 ------------ trace
-not :: 'Bool -> 'Bool
-&& :: 'Bool -> 'Bool -> 'Bool
-|| :: 'Bool -> 'Bool -> 'Bool
+not :: Bool -> Bool
+&& :: Bool -> Bool -> Bool
+|| :: Bool -> Bool -> Bool
 'Eq :: Type -> Type
-== :: forall a . 'Eq a => a -> a -> 'Bool
-/= :: forall a . 'Eq a => a -> a -> 'Bool
+== :: forall a . Eq a => a -> a -> Bool
+/= :: forall a . Eq a => a -> a -> Bool
 ------------ tooltips
 testdata/typeclass.lc 8:1-8:4  Bool -> Bool
 testdata/typeclass.lc 8:12-8:17  Bool
diff --git a/testdata/typesig.reject.out b/testdata/typesig.reject.out
index 63d24e57..909ee06d 100644
--- a/testdata/typesig.reject.out
+++ b/testdata/typesig.reject.out
@@ -1,12 +1,12 @@
-focus checkMetas: \a -> (\b -> primFix a b) \(a := Type) -> \c -> <<HERE>>
-\(d :: Type ~ _a) (e :: _a ~ 'X) -> typeAnn _a (labend X)
+focus checkMetas: \(a :: Type) -> (\(b :: Type) -> primFix a b) \(a := Type) -> \(c :: Type) -> <<HERE>>
+\(d :: Type ~ _a) (e :: _a ~ X) -> typeAnn _a (labend X)
 ------------ trace
 'X :: Type
-X :: 'X
-'XCase :: forall (a :: 'X -> Type) -> a X -> forall (b :: 'X) -> a b
-match'X :: forall (a :: Type -> Type) -> a 'X -> forall b -> a b -> a b
-!focus checkMetas: \a -> (\b -> primFix a b) \(a := Type) -> \c -> <<HERE>>
-\(d :: Type ~ _a) (e :: _a ~ 'X) -> typeAnn _a (labend X)
+X :: X
+'XCase :: forall (a :: X -> Type) -> a 'X -> forall (b :: X) -> a b
+match'X :: forall (a :: Type -> Type) -> a X -> forall b -> a b -> a b
+!focus checkMetas: \(a :: Type) -> (\(b :: Type) -> primFix a b) \(a := Type) -> \(c :: Type) -> <<HERE>>
+\(d :: Type ~ _a) (e :: _a ~ X) -> typeAnn _a (labend X)
 ------------ tooltips
 testdata/typesig.reject.lc 4:6-4:7  Type
 testdata/typesig.reject.lc 4:6-4:11  Type
diff --git a/testdata/typesigctx.reject.out b/testdata/typesigctx.reject.out
index 53748e22..c3055e27 100644
--- a/testdata/typesigctx.reject.out
+++ b/testdata/typesigctx.reject.out
@@ -2,11 +2,11 @@ type error: no instance of 'Show' on ???
 in Wildcard2 builtin 'Type
 ------------ trace
 'X :: Type
-X :: 'X
-'XCase :: forall (a :: 'X -> Type) -> a X -> forall (b :: 'X) -> a b
-match'X :: forall (a :: Type -> Type) -> a 'X -> forall b -> a b -> a b
+X :: X
+'XCase :: forall (a :: X -> Type) -> a 'X -> forall (b :: X) -> a b
+match'X :: forall (a :: Type -> Type) -> a X -> forall b -> a b -> a b
 'Show' :: Type -> Type
-show' :: forall a . 'Show' a => a -> 'X
+show' :: forall a . Show' a => a -> X
 !type error: no instance of 'Show' on ???
 in Wildcard2 builtin 'Type
 ------------ tooltips
diff --git a/testdata/where.out b/testdata/where.out
index 2b62fedf..d106b8f0 100644
--- a/testdata/where.out
+++ b/testdata/where.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-f :: 'Float
+f :: Float
 ------------ tooltips
 testdata/where.lc 3:1-3:2  Float
 testdata/where.lc 3:5-3:6  Float
diff --git a/testdata/zip01.out b/testdata/zip01.out
index eb0911c5..cd811cda 100644
--- a/testdata/zip01.out
+++ b/testdata/zip01.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-zip2 :: forall a b . 'List a -> 'List b -> 'List (a, b)
+zip2 :: forall a b . List a -> List b -> List (a, b)
 ------------ tooltips
 testdata/zip01.lc 1:9-1:12  Type
 testdata/zip01.lc 1:9-1:30  Type