switch to ansi-wl-pprint

187 files changed, 1421 insertions, 1421 deletions

diff --git a/testdata/Builtins.out b/testdata/Builtins.out
index aefc3cae..55a1ceed 100644
--- a/testdata/Builtins.out
+++ b/testdata/Builtins.out
@@ -1,395 +1,395 @@
 main is not found
 ------------ trace
-id :: {a} -> a->a
-'VecS :: Type -> 'Nat->Type
-V2 :: {a} -> a -> a -> 'VecS a 2
-V3 :: {a} -> a -> a -> a -> 'VecS a 3
-V4 :: {a} -> a -> a -> a -> a -> 'VecS a 4
-'VecSCase :: {a} -> (b : (c:'Nat) -> 'VecS a c -> Type) -> ((d:a) -> (e:a) -> b 2 (V2 d e)) -> ((f:a) -> (g:a) -> (h:a) -> b 3 (V3 f g h)) -> ((i:a) -> (j:a) -> (k:a) -> (l:a) -> b 4 (V4 i j k l)) -> {m:'Nat} -> (n : 'VecS a m) -> b m n
-match'VecS :: (a : Type->Type) -> ((b:Type) -> (c:'Nat) -> a ('VecS b c)) -> (d:Type) -> a d -> a d
-mapVec :: {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 :: (a : (b:'Nat) -> (c:'Nat) -> (d:Type) -> 'Mat b c d -> Type) -> ((e : 'Vec 2 'Float) -> (f : 'Vec 2 'Float) -> a 2 2 'Float (M22F e f)) -> ((g : 'Vec 3 'Float) -> (h : 'Vec 3 'Float) -> a 3 2 'Float (M32F g h)) -> ((i : 'Vec 4 'Float) -> (j : 'Vec 4 'Float) -> a 4 2 'Float (M42F i j)) -> ((k : 'Vec 2 'Float) -> (l : 'Vec 2 'Float) -> (m : 'Vec 2 'Float) -> a 2 3 'Float (M23F k l m)) -> ((n : 'Vec 3 'Float) -> (o : 'Vec 3 'Float) -> (p : 'Vec 3 'Float) -> a 3 3 'Float (M33F n o p)) -> ((q : 'Vec 4 'Float) -> (r : 'Vec 4 'Float) -> (s : 'Vec 4 'Float) -> a 4 3 'Float (M43F q r s)) -> ((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)) -> ((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')) -> ((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')) -> {f':'Nat} -> {g':'Nat} -> {h'} -> (i' : 'Mat f' g' h') -> a f' g' h' i'
-match'Mat :: (a : Type->Type) -> ((b:'Nat) -> (c:'Nat) -> (d:Type) -> a ('Mat b c d)) -> (e:Type) -> a e -> a e
-'MatVecScalarElem :: Type->Type
-'Signed :: Type->Type
-'Component :: Type->Type
-zero :: {a} -> {_ : 'Component a}->a
-one :: {a} -> {_ : 'Component a}->a
-'Integral :: Type->Type
-'Floating :: Type->Type
-PrimAdd :: {a} -> {_ : 'Num ('MatVecScalarElem a)} -> a -> a->a
-PrimSub :: {a} -> {_ : 'Num ('MatVecScalarElem a)} -> a -> a->a
-PrimMul :: {a} -> {_ : 'Num ('MatVecScalarElem a)} -> a -> a->a
-PrimAddS :: {a} -> {b} -> {_ : a ~ 'MatVecScalarElem b} -> {_ : 'Num a} -> b -> a->b
-PrimSubS :: {a} -> {b} -> {_ : a ~ 'MatVecScalarElem b} -> {_ : 'Num a} -> b -> a->b
-PrimMulS :: {a} -> {b} -> {_ : a ~ 'MatVecScalarElem b} -> {_ : 'Num a} -> b -> a->b
-PrimDiv :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
-PrimMod :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
-PrimDivS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> a->b
-PrimModS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> a->b
-PrimNeg :: {a} -> {_ : 'Signed ('MatVecScalarElem a)} -> a->a
-PrimBAnd :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
-PrimBOr :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
-PrimBXor :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
-PrimBAndS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> a->b
-PrimBOrS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> a->b
-PrimBXorS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> a->b
-PrimBNot :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b->b
-PrimBShiftL :: {a} -> {b} -> {c:'Nat} -> {d} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> {_ : d ~ 'VecScalar c 'Word} -> b -> d->b
-PrimBShiftR :: {a} -> {b} -> {c:'Nat} -> {d} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> {_ : d ~ 'VecScalar c 'Word} -> b -> d->b
-PrimBShiftLS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> 'Word->b
-PrimBShiftRS :: {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 :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Bool} -> a->a
-PrimAny :: {a:'Nat} -> 'VecScalar a 'Bool -> 'Bool
-PrimAll :: {a:'Nat} -> 'VecScalar a 'Bool -> 'Bool
-PrimACos :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimACosH :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimASin :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimASinH :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimATan :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimATanH :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimCos :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimCosH :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimDegrees :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimRadians :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimSin :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimSinH :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimTan :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimTanH :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimExp :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimLog :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimExp2 :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimLog2 :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimSqrt :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimInvSqrt :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimPow :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a->a
-PrimATan2 :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a->a
-PrimFloor :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimTrunc :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimRound :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimRoundEven :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimCeil :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimFract :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimMin :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
-PrimMax :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
-PrimMinS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> a->b
-PrimMaxS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> a->b
-PrimIsNan :: {a} -> {b:'Nat} -> {c} -> {_ : a ~ 'VecScalar b 'Float} -> {_ : c ~ 'VecScalar b 'Bool} -> a->c
-PrimIsInf :: {a} -> {b:'Nat} -> {c} -> {_ : a ~ 'VecScalar b 'Float} -> {_ : c ~ 'VecScalar b 'Bool} -> a->c
-PrimAbs :: {a} -> {b} -> {c:'Nat} -> {_ : 'Signed a} -> {_ : b ~ 'VecScalar c a} -> b->b
-PrimSign :: {a} -> {b} -> {c:'Nat} -> {_ : 'Signed a} -> {_ : b ~ 'VecScalar c a} -> b->b
-PrimModF :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->(a, a)
-PrimClamp :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> b -> b->b
-PrimClampS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> a -> a->b
-PrimMix :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a -> a->a
-PrimMixS :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a -> 'Float->a
-PrimMixB :: {a} -> {b:'Nat} -> {c} -> {_ : a ~ 'VecScalar b 'Float} -> {_ : c ~ 'VecScalar b 'Bool} -> a -> a -> c->a
-PrimStep :: {a} -> {b:'Nat} -> {_ : a ~ 'VecS 'Float b} -> a -> a->a
-PrimStepS :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> 'Float -> a->a
-PrimSmoothStep :: {a} -> {b:'Nat} -> {_ : a ~ 'VecS 'Float b} -> a -> a -> a->a
-PrimSmoothStepS :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> 'Float -> 'Float -> a->a
-PrimFloatBitsToInt :: {a:'Nat} -> 'VecScalar a 'Float -> 'VecScalar a 'Int
-PrimFloatBitsToUInt :: {a:'Nat} -> 'VecScalar a 'Float -> 'VecScalar a 'Word
-PrimIntBitsToFloat :: {a:'Nat} -> 'VecScalar a 'Int -> 'VecScalar a 'Float
-PrimUIntBitsToFloat :: {a:'Nat} -> 'VecScalar a 'Word -> 'VecScalar a 'Float
-PrimLength :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->'Float
-PrimDistance :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a->'Float
-PrimDot :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a->'Float
-PrimCross :: {a} -> {_ : a ~ 'VecS 'Float 3} -> a -> a->a
-PrimNormalize :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimFaceForward :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a -> a->a
-PrimRefract :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a -> a->a
-PrimReflect :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a->a
-PrimTranspose :: {a:'Nat} -> {b:'Nat} -> {c} -> 'Mat a b c -> 'Mat b a c
-PrimDeterminant :: {a:'Nat} -> {b} -> 'Mat a a b -> 'Float
-PrimInverse :: {a:'Nat} -> {b} -> 'Mat a a b -> 'Mat a a b
-PrimOuterProduct :: {a:'Nat} -> {b} -> {c:'Nat} -> 'Vec a b -> 'Vec c b -> 'Mat c a b
-PrimMulMatVec :: {a:'Nat} -> {b:'Nat} -> {c} -> 'Mat a b c -> 'Vec b c -> 'Vec a c
-PrimMulVecMat :: {a:'Nat} -> {b} -> {c:'Nat} -> 'Vec a b -> 'Mat a c b -> 'Vec c b
-PrimMulMatMat :: {a:'Nat} -> {b:'Nat} -> {c} -> {d:'Nat} -> 'Mat a b c -> 'Mat b d c -> 'Mat a d c
-PrimLessThan :: {a} -> {b:'Nat} -> {c} -> {d} -> {_ : 'Num c} -> {_ : a ~ 'VecScalar b c} -> {_ : d ~ 'VecScalar b 'Bool} -> a -> a->d
-PrimLessThanEqual :: {a} -> {b:'Nat} -> {c} -> {d} -> {_ : 'Num c} -> {_ : a ~ 'VecScalar b c} -> {_ : d ~ 'VecScalar b 'Bool} -> a -> a->d
-PrimGreaterThan :: {a} -> {b:'Nat} -> {c} -> {d} -> {_ : 'Num c} -> {_ : a ~ 'VecScalar b c} -> {_ : d ~ 'VecScalar b 'Bool} -> a -> a->d
-PrimGreaterThanEqual :: {a} -> {b:'Nat} -> {c} -> {d} -> {_ : 'Num c} -> {_ : a ~ 'VecScalar b c} -> {_ : d ~ 'VecScalar b 'Bool} -> a -> a->d
-PrimEqualV :: {a} -> {b:'Nat} -> {c} -> {d} -> {_ : 'Num c} -> {_ : a ~ 'VecScalar b c} -> {_ : d ~ 'VecScalar b 'Bool} -> a -> a->d
-PrimNotEqualV :: {a} -> {b:'Nat} -> {c} -> {d} -> {_ : 'Num c} -> {_ : a ~ 'VecScalar b c} -> {_ : d ~ 'VecScalar b 'Bool} -> a -> a->d
-PrimEqual :: {a} -> {b} -> {_ : b ~ 'MatVecScalarElem a} -> a -> a->'Bool
-PrimNotEqual :: {a} -> {b} -> {_ : b ~ 'MatVecScalarElem a} -> a -> a->'Bool
-PrimDFdx :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimDFdy :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimFWidth :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-PrimNoise1 :: {a:'Nat} -> 'VecScalar a 'Float -> 'Float
-PrimNoise2 :: {a:'Nat} -> 'VecScalar a 'Float -> 'Vec 2 'Float
-PrimNoise3 :: {a:'Nat} -> 'VecScalar a 'Float -> 'Vec 3 'Float
-PrimNoise4 :: {a:'Nat} -> 'VecScalar a 'Float -> 'Vec 4 'Float
-head :: {a} -> 'List a -> a
-++ :: {a} -> 'List a -> 'List a -> 'List a
-foldr :: {a} -> {b} -> (b -> a->a) -> a -> 'List b -> a
-concat :: {a} -> 'List ('List a) -> 'List a
-map :: {a} -> {b} -> (a->b) -> 'List a -> 'List b
-concatMap :: {a} -> {b} -> (a -> 'List b) -> 'List a -> 'List b
-len :: {a} -> 'List a -> 'Int
-'Maybe :: Type->Type
-Nothing :: {a} -> 'Maybe a
-Just :: {a} -> a -> 'Maybe a
-'MaybeCase :: {a} -> (b : 'Maybe a -> Type) -> b Nothing -> ((c:a) -> b (Just c)) -> (d : 'Maybe a) -> b d
-match'Maybe :: (a : Type->Type) -> ((b:Type) -> a ('Maybe b)) -> (c:Type) -> a c -> a c
-'Vector :: 'Nat -> Type->Type
-'VectorCase :: {a:'Nat} -> {b} -> (c : 'Vector a b -> Type) -> (d : 'Vector a b) -> c d
-match'Vector :: (a : Type->Type) -> ((b:'Nat) -> (c:Type) -> a ('Vector b c)) -> (d:Type) -> a d -> a d
-'PrimitiveType :: Type
-Triangle :: 'PrimitiveType
-Line :: 'PrimitiveType
-Point :: 'PrimitiveType
-TriangleAdjacency :: 'PrimitiveType
-LineAdjacency :: 'PrimitiveType
-'PrimitiveTypeCase :: (a : 'PrimitiveType->Type) -> a Triangle -> a Line -> a Point -> a TriangleAdjacency -> a LineAdjacency -> (b:'PrimitiveType) -> a b
-match'PrimitiveType :: (a : Type->Type) -> a 'PrimitiveType -> (b:Type) -> a b -> a b
-'Primitive :: Type -> 'PrimitiveType->Type
-PrimPoint :: {a} -> a -> 'Primitive a Point
-PrimLine :: {a} -> a -> a -> 'Primitive a Line
-PrimTriangle :: {a} -> a -> a -> a -> 'Primitive a Triangle
-'PrimitiveCase :: {a} -> (b : (c:'PrimitiveType) -> 'Primitive a c -> Type) -> ((d:a) -> b Point (PrimPoint d)) -> ((e:a) -> (f:a) -> b Line (PrimLine e f)) -> ((g:a) -> (h:a) -> (i:a) -> b Triangle (PrimTriangle g h i)) -> {j:'PrimitiveType} -> (k : 'Primitive a j) -> b j k
-match'Primitive :: (a : Type->Type) -> ((b:Type) -> (c:'PrimitiveType) -> a ('Primitive b c)) -> (d:Type) -> a d -> a d
-mapPrimitive :: {a} -> {b} -> {c:'PrimitiveType} -> (a->b) -> 'Primitive a c -> 'Primitive b c
-'PrimitiveStream :: 'PrimitiveType -> Type->Type
-mapPrimitives :: {a} -> {b} -> {c:'PrimitiveType} -> (a->b) -> 'List ('Primitive a c) -> 'List ('Primitive b c)
-'ListElem :: Type->Type
-fetchArrays :: {a:'PrimitiveType} -> {b : 'List Type} -> {c : 'List Type} -> {_ : b ~ map Type Type 'ListElem c} -> 'HList c -> 'PrimitiveStream a ('HList b)
-fetch :: {a:'PrimitiveType} -> {b : 'List Type} -> 'String -> 'HList b -> 'PrimitiveStream a ('HList b)
-Attribute :: {a} -> 'String->a
-fetchStream :: {a:'PrimitiveType} -> {b : 'List Type} -> 'String -> (c : 'List 'String) -> {_ : len 'String c ~ len Type b} -> 'PrimitiveStream a ('HList b)
-'SimpleFragment :: Type->Type
-SimpleFragment :: {a} -> 'Vec 3 'Float -> a -> 'SimpleFragment a
-'SimpleFragmentCase :: {a} -> (b : 'SimpleFragment a -> Type) -> ((c : 'Vec 3 'Float) -> (d:a) -> b (SimpleFragment c d)) -> (e : 'SimpleFragment a) -> b e
-match'SimpleFragment :: (a : Type->Type) -> ((b:Type) -> a ('SimpleFragment b)) -> (c:Type) -> a c -> a c
-'Fragment :: 'Nat -> Type->Type
-sFragmentCoords :: {a} -> 'SimpleFragment a -> 'VecS 'Float 3
-sFragmentValue :: {a} -> 'SimpleFragment a -> a
-'FragmentStream :: 'Nat -> Type->Type
-customizeDepth :: {a} -> {b:'Nat} -> (a->'Float) -> 'Fragment b a -> 'Fragment b a
-customizeDepths :: {a} -> {b:'Nat} -> (a->'Float) -> 'List ('Vector b ('Maybe ('SimpleFragment a))) -> 'List ('Vector b ('Maybe ('SimpleFragment a)))
-filterFragment :: {a} -> {b:'Nat} -> (a->'Bool) -> 'Fragment b a -> 'Fragment b a
-filterFragments :: {a} -> {b:'Nat} -> (a->'Bool) -> 'List ('Vector b ('Maybe ('SimpleFragment a))) -> 'List ('Vector b ('Maybe ('SimpleFragment a)))
-mapFragment :: {a} -> {b} -> {c:'Nat} -> (a->b) -> 'Fragment c a -> 'Fragment c b
-mapFragments :: {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 :: (a : 'ImageKind->Type) -> ((b:Type) -> a (Color b)) -> a Depth -> a Stencil -> (c:'ImageKind) -> a c
-match'ImageKind :: (a : Type->Type) -> a 'ImageKind -> (b:Type) -> a b -> a b
-imageType :: 'ImageKind->Type
-'Image :: 'Nat -> 'ImageKind->Type
-'ImageCase :: {a:'Nat} -> {b:'ImageKind} -> (c : 'Image a b -> Type) -> (d : 'Image a b) -> c d
-match'Image :: (a : Type->Type) -> ((b:'Nat) -> (c:'ImageKind) -> a ('Image b c)) -> (d:Type) -> a d -> a d
-ColorImage :: {a:'Nat} -> {b:'Nat} -> {c} -> {d} -> {_ : 'Num c} -> {_ : d ~ 'VecScalar b c} -> d -> 'Image a (Color d)
-DepthImage :: {a:'Nat} -> 'Float -> 'Image a Depth
-StencilImage :: {a:'Nat} -> 'Int -> 'Image a Stencil
-emptyDepthImage :: 'Float -> 'Image 1 Depth
-emptyColorImage :: {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 :: (a : 'Swizz->Type) -> a Sx -> a Sy -> a Sz -> a Sw -> (b:'Swizz) -> a b
-match'Swizz :: (a : Type->Type) -> a 'Swizz -> (b:Type) -> a b -> a b
-swizzscalar :: {a} -> {b:'Nat} -> 'Vec b a -> 'Swizz->a
-definedVec :: {a} -> {b:'Nat} -> 'Vec b a -> 'Bool
-swizzvector :: {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 :: (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 -> (b:'BlendingFactor) -> a b
-match'BlendingFactor :: (a : Type->Type) -> a 'BlendingFactor -> (b:Type) -> a b -> a b
-'BlendEquation :: Type
-FuncAdd :: 'BlendEquation
-FuncSubtract :: 'BlendEquation
-FuncReverseSubtract :: 'BlendEquation
-Min :: 'BlendEquation
-Max :: 'BlendEquation
-'BlendEquationCase :: (a : 'BlendEquation->Type) -> a FuncAdd -> a FuncSubtract -> a FuncReverseSubtract -> a Min -> a Max -> (b:'BlendEquation) -> a b
-match'BlendEquation :: (a : Type->Type) -> a 'BlendEquation -> (b:Type) -> 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 :: (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 -> (b:'LogicOperation) -> a b
-match'LogicOperation :: (a : Type->Type) -> a 'LogicOperation -> (b:Type) -> a b -> a b
-'StencilOperation :: Type
-OpZero :: 'StencilOperation
-OpKeep :: 'StencilOperation
-OpReplace :: 'StencilOperation
-OpIncr :: 'StencilOperation
-OpIncrWrap :: 'StencilOperation
-OpDecr :: 'StencilOperation
-OpDecrWrap :: 'StencilOperation
-OpInvert :: 'StencilOperation
-'StencilOperationCase :: (a : 'StencilOperation->Type) -> a OpZero -> a OpKeep -> a OpReplace -> a OpIncr -> a OpIncrWrap -> a OpDecr -> a OpDecrWrap -> a OpInvert -> (b:'StencilOperation) -> a b
-match'StencilOperation :: (a : Type->Type) -> a 'StencilOperation -> (b:Type) -> a b -> a b
-'ComparisonFunction :: Type
-Never :: 'ComparisonFunction
-Less :: 'ComparisonFunction
-Equal :: 'ComparisonFunction
-Lequal :: 'ComparisonFunction
-Greater :: 'ComparisonFunction
-Notequal :: 'ComparisonFunction
-Gequal :: 'ComparisonFunction
-Always :: 'ComparisonFunction
-'ComparisonFunctionCase :: (a : 'ComparisonFunction->Type) -> a Never -> a Less -> a Equal -> a Lequal -> a Greater -> a Notequal -> a Gequal -> a Always -> (b:'ComparisonFunction) -> a b
-match'ComparisonFunction :: (a : Type->Type) -> a 'ComparisonFunction -> (b:Type) -> a b -> a b
-'ProvokingVertex :: Type
-LastVertex :: 'ProvokingVertex
-FirstVertex :: 'ProvokingVertex
-'ProvokingVertexCase :: (a : 'ProvokingVertex->Type) -> a LastVertex -> a FirstVertex -> (b:'ProvokingVertex) -> a b
-match'ProvokingVertex :: (a : Type->Type) -> a 'ProvokingVertex -> (b:Type) -> a b -> a b
-'CullMode :: Type
-CullFront :: 'CullMode
-CullBack :: 'CullMode
-CullNone :: 'CullMode
-'CullModeCase :: (a : 'CullMode->Type) -> a CullFront -> a CullBack -> a CullNone -> (b:'CullMode) -> a b
-match'CullMode :: (a : Type->Type) -> a 'CullMode -> (b:Type) -> a b -> a b
-'PointSize :: Type->Type
-PointSize :: {a} -> 'Float -> 'PointSize a
-ProgramPointSize :: {a} -> (a->'Float) -> 'PointSize a
-'PointSizeCase :: {a} -> (b : 'PointSize a -> Type) -> ((c:'Float) -> b (PointSize c)) -> ((d : a->'Float) -> b (ProgramPointSize d)) -> (e : 'PointSize a) -> b e
-match'PointSize :: (a : Type->Type) -> ((b:Type) -> a ('PointSize b)) -> (c:Type) -> a c -> a c
-'PolygonMode :: Type->Type
-PolygonFill :: {a} -> 'PolygonMode a
-PolygonPoint :: {a} -> 'PointSize a -> 'PolygonMode a
-PolygonLine :: {a} -> 'Float -> 'PolygonMode a
-'PolygonModeCase :: {a} -> (b : 'PolygonMode a -> Type) -> b PolygonFill -> ((c : 'PointSize a) -> b (PolygonPoint c)) -> ((d:'Float) -> b (PolygonLine d)) -> (e : 'PolygonMode a) -> b e
-match'PolygonMode :: (a : Type->Type) -> ((b:Type) -> a ('PolygonMode b)) -> (c:Type) -> a c -> a c
-'PolygonOffset :: Type
-NoOffset :: 'PolygonOffset
-Offset :: 'Float -> 'Float->'PolygonOffset
-'PolygonOffsetCase :: (a : 'PolygonOffset->Type) -> a NoOffset -> ((b:'Float) -> (c:'Float) -> a (Offset b c)) -> (d:'PolygonOffset) -> a d
-match'PolygonOffset :: (a : Type->Type) -> a 'PolygonOffset -> (b:Type) -> a b -> a b
-'PointSpriteCoordOrigin :: Type
-LowerLeft :: 'PointSpriteCoordOrigin
-UpperLeft :: 'PointSpriteCoordOrigin
-'PointSpriteCoordOriginCase :: (a : 'PointSpriteCoordOrigin->Type) -> a LowerLeft -> a UpperLeft -> (b:'PointSpriteCoordOrigin) -> a b
-match'PointSpriteCoordOrigin :: (a : Type->Type) -> a 'PointSpriteCoordOrigin -> (b:Type) -> a b -> a b
-primTexture :: () -> 'Vec 2 'Float -> 'Vec 4 'Float
-Uniform :: {a} -> 'String->a
-'RasterContext :: Type -> 'PrimitiveType->Type
-TriangleCtx :: {a} -> 'CullMode -> 'PolygonMode a -> 'PolygonOffset -> 'ProvokingVertex -> 'RasterContext a Triangle
-PointCtx :: {a} -> 'PointSize a -> 'Float -> 'PointSpriteCoordOrigin -> 'RasterContext a Point
-LineCtx :: {a} -> 'Float -> 'ProvokingVertex -> 'RasterContext a Line
-'RasterContextCase :: {a} -> (b : (c:'PrimitiveType) -> 'RasterContext a c -> Type) -> ((d:'CullMode) -> (e : 'PolygonMode a) -> (f:'PolygonOffset) -> (g:'ProvokingVertex) -> b Triangle (TriangleCtx d e f g)) -> ((h : 'PointSize a) -> (i:'Float) -> (j:'PointSpriteCoordOrigin) -> b Point (PointCtx h i j)) -> ((k:'Float) -> (l:'ProvokingVertex) -> b Line (LineCtx k l)) -> {m:'PrimitiveType} -> (n : 'RasterContext a m) -> b m n
-match'RasterContext :: (a : Type->Type) -> ((b:Type) -> (c:'PrimitiveType) -> a ('RasterContext b c)) -> (d:Type) -> a d -> a d
-'Blending :: Type->Type
-NoBlending :: {a} -> 'Blending a
-BlendLogicOp :: {a} -> {_ : 'Integral a} -> 'LogicOperation -> 'Blending a
-Blend :: ('BlendEquation, 'BlendEquation) -> (('BlendingFactor, 'BlendingFactor), ('BlendingFactor, 'BlendingFactor)) -> 'Vec 4 'Float -> 'Blending 'Float
-'BlendingCase :: (a : (b:Type) -> 'Blending b -> Type) -> ({c} -> a c (NoBlending c)) -> ({d} -> {e : 'Integral d} -> (f:'LogicOperation) -> a d (BlendLogicOp d e f)) -> ((g:('BlendEquation, 'BlendEquation)) -> (h:(('BlendingFactor, 'BlendingFactor), ('BlendingFactor, 'BlendingFactor))) -> (i : 'Vec 4 'Float) -> a 'Float (Blend g h i)) -> {j} -> (k : 'Blending j) -> a j k
-match'Blending :: (a : Type->Type) -> ((b:Type) -> a ('Blending b)) -> (c:Type) -> a c -> a c
-'StencilTests :: Type
-'StencilTestsCase :: (a : 'StencilTests->Type) -> (b:'StencilTests) -> a b
-match'StencilTests :: (a : Type->Type) -> a 'StencilTests -> (b:Type) -> a b -> a b
-'StencilOps :: Type
-'StencilOpsCase :: (a : 'StencilOps->Type) -> (b:'StencilOps) -> a b
-match'StencilOps :: (a : Type->Type) -> a 'StencilOps -> (b:Type) -> a b -> a b
-'FragmentOperation :: 'ImageKind->Type
-ColorOp :: {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 :: (a : (b:'ImageKind) -> 'FragmentOperation b -> Type) -> ({c} -> {d:'Nat} -> {e : 'Num c} -> (f : 'Blending c) -> (g : 'VecScalar d 'Bool) -> a (Color ('VecScalar d c)) (ColorOp c d e f g)) -> ((h:'ComparisonFunction) -> (i:'Bool) -> a Depth (DepthOp h i)) -> ((j:'StencilTests) -> (k:'StencilOps) -> (l:'StencilOps) -> a Stencil (StencilOp j k l)) -> {m:'ImageKind} -> (n : 'FragmentOperation m) -> a m n
-match'FragmentOperation :: (a : Type->Type) -> ((b:'ImageKind) -> a ('FragmentOperation b)) -> (c:Type) -> a c -> a c
-'Interpolated :: Type->Type
-Smooth :: {a} -> {_ : 'Floating a} -> 'Interpolated a
-NoPerspective :: {a} -> {_ : 'Floating a} -> 'Interpolated a
-Flat :: {a} -> 'Interpolated a
-'InterpolatedCase :: {a} -> (b : 'Interpolated a -> Type) -> ({c : 'Floating a} -> b (Smooth c)) -> ({d : 'Floating a} -> b (NoPerspective d)) -> b Flat -> (e : 'Interpolated a) -> b e
-match'Interpolated :: (a : Type->Type) -> ((b:Type) -> a ('Interpolated b)) -> (c:Type) -> a c -> a c
-rasterizePrimitive :: {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 :: {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 :: {a} -> 'List a -> Type
-sameLayerCounts :: 'List Type -> Type
-'FrameBuffer :: 'Nat -> 'List 'ImageKind -> Type
-'FrameBufferCase :: {a:'Nat} -> {b : 'List 'ImageKind} -> (c : 'FrameBuffer a b -> Type) -> (d : 'FrameBuffer a b) -> c d
-match'FrameBuffer :: (a : Type->Type) -> ((b:'Nat) -> (c : 'List 'ImageKind) -> a ('FrameBuffer b c)) -> (d:Type) -> a d -> a d
-imageType' :: 'List 'ImageKind -> 'List Type
-'FragmentOperationKind :: Type->'ImageKind
-Accumulate :: {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 :: {a} -> {b} -> a -> b->(a, b)
-overlay :: {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 :: {a : 'List Type} -> {_ : sameLayerCounts a} -> 'HList a -> 'FrameBuffer ('ImageLC (head Type a)) (map Type 'ImageKind 'GetImageKind a)
-imageFrame :: {a : 'List Type} -> {_ : sameLayerCounts a} -> 'HList a -> 'FrameBuffer ('ImageLC (head Type a)) (map Type 'ImageKind 'GetImageKind a)
-accumulate :: {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 :: {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 :: {a:'Nat} -> {b : 'List 'ImageKind} -> 'FrameBuffer a b -> 'Output
-'OutputCase :: (a : 'Output->Type) -> ({b:'Nat} -> {c : 'List 'ImageKind} -> (d : 'FrameBuffer b c) -> a (ScreenOut b c d)) -> (e:'Output) -> a e
-match'Output :: (a : Type->Type) -> a 'Output -> (b:Type) -> a b -> a b
-renderFrame :: {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 :: (a : 'Texture->Type) -> ((b:'String) -> a (Texture2DSlot b)) -> ((c : 'Vec 2 'Int) -> (d : 'Image 1 (Color ('Vec 4 'Float))) -> a (Texture2D c d)) -> (e:'Texture) -> a e
-match'Texture :: (a : Type->Type) -> a 'Texture -> (b:Type) -> a b -> a b
-'Filter :: Type
-PointFilter :: 'Filter
-LinearFilter :: 'Filter
-'FilterCase :: (a : 'Filter->Type) -> a PointFilter -> a LinearFilter -> (b:'Filter) -> a b
-match'Filter :: (a : Type->Type) -> a 'Filter -> (b:Type) -> a b -> a b
-'EdgeMode :: Type
-Repeat :: 'EdgeMode
-MirroredRepeat :: 'EdgeMode
-ClampToEdge :: 'EdgeMode
-'EdgeModeCase :: (a : 'EdgeMode->Type) -> a Repeat -> a MirroredRepeat -> a ClampToEdge -> (b:'EdgeMode) -> a b
-match'EdgeMode :: (a : Type->Type) -> a 'EdgeMode -> (b:Type) -> a b -> a b
-'Sampler :: Type
-Sampler :: 'Filter -> 'EdgeMode -> 'Texture->'Sampler
-'SamplerCase :: (a : 'Sampler->Type) -> ((b:'Filter) -> (c:'EdgeMode) -> (d:'Texture) -> a (Sampler b c d)) -> (e:'Sampler) -> a e
-match'Sampler :: (a : Type->Type) -> a 'Sampler -> (b:Type) -> a b -> a b
-texture2D :: 'Sampler -> 'Vec 2 'Float -> 'Vec 4 'Float
-accumulationContext :: {a} -> a->a
+id :: {a} -> a->a
+'VecS :: Type -> 'Nat->Type
+V2 :: {a} -> a -> a -> 'VecS a 2
+V3 :: {a} -> a -> a -> a -> 'VecS a 3
+V4 :: {a} -> a -> a -> a -> a -> 'VecS a 4
+'VecSCase :: {a} -> (b : (c:'Nat) -> 'VecS a c -> Type) -> ((d:a) -> (e:a) -> b 2 (V2 d e)) -> ((f:a) -> (g:a) -> (h:a) -> b 3 (V3 f g h)) -> ((i:a) -> (j:a) -> (k:a) -> (l:a) -> b 4 (V4 i j k l)) -> {m:'Nat} -> (n : 'VecS a m) -> b m n
+match'VecS :: (a : Type->Type) -> ((b:Type) -> (c:'Nat) -> a ('VecS b c)) -> (d:Type) -> a d -> a d
+mapVec :: {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 :: (a : (b:'Nat) -> (c:'Nat) -> (d:Type) -> 'Mat b c d -> Type) -> ((e : 'Vec 2 'Float) -> (f : 'Vec 2 'Float) -> a 2 2 'Float (M22F e f)) -> ((g : 'Vec 3 'Float) -> (h : 'Vec 3 'Float) -> a 3 2 'Float (M32F g h)) -> ((i : 'Vec 4 'Float) -> (j : 'Vec 4 'Float) -> a 4 2 'Float (M42F i j)) -> ((k : 'Vec 2 'Float) -> (l : 'Vec 2 'Float) -> (m : 'Vec 2 'Float) -> a 2 3 'Float (M23F k l m)) -> ((n : 'Vec 3 'Float) -> (o : 'Vec 3 'Float) -> (p : 'Vec 3 'Float) -> a 3 3 'Float (M33F n o p)) -> ((q : 'Vec 4 'Float) -> (r : 'Vec 4 'Float) -> (s : 'Vec 4 'Float) -> a 4 3 'Float (M43F q r s)) -> ((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)) -> ((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')) -> ((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')) -> {f':'Nat} -> {g':'Nat} -> {h'} -> (i' : 'Mat f' g' h') -> a f' g' h' i'
+match'Mat :: (a : Type->Type) -> ((b:'Nat) -> (c:'Nat) -> (d:Type) -> a ('Mat b c d)) -> (e:Type) -> a e -> a e
+'MatVecScalarElem :: Type->Type
+'Signed :: Type->Type
+'Component :: Type->Type
+zero :: {a} -> {_ : 'Component a}->a
+one :: {a} -> {_ : 'Component a}->a
+'Integral :: Type->Type
+'Floating :: Type->Type
+PrimAdd :: {a} -> {_ : 'Num ('MatVecScalarElem a)} -> a -> a->a
+PrimSub :: {a} -> {_ : 'Num ('MatVecScalarElem a)} -> a -> a->a
+PrimMul :: {a} -> {_ : 'Num ('MatVecScalarElem a)} -> a -> a->a
+PrimAddS :: {a} -> {b} -> {_ : a ~ 'MatVecScalarElem b} -> {_ : 'Num a} -> b -> a->b
+PrimSubS :: {a} -> {b} -> {_ : a ~ 'MatVecScalarElem b} -> {_ : 'Num a} -> b -> a->b
+PrimMulS :: {a} -> {b} -> {_ : a ~ 'MatVecScalarElem b} -> {_ : 'Num a} -> b -> a->b
+PrimDiv :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
+PrimMod :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
+PrimDivS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> a->b
+PrimModS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> a->b
+PrimNeg :: {a} -> {_ : 'Signed ('MatVecScalarElem a)} -> a->a
+PrimBAnd :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
+PrimBOr :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
+PrimBXor :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
+PrimBAndS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> a->b
+PrimBOrS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> a->b
+PrimBXorS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> a->b
+PrimBNot :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b->b
+PrimBShiftL :: {a} -> {b} -> {c:'Nat} -> {d} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> {_ : d ~ 'VecScalar c 'Word} -> b -> d->b
+PrimBShiftR :: {a} -> {b} -> {c:'Nat} -> {d} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> {_ : d ~ 'VecScalar c 'Word} -> b -> d->b
+PrimBShiftLS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> 'Word->b
+PrimBShiftRS :: {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 :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Bool} -> a->a
+PrimAny :: {a:'Nat} -> 'VecScalar a 'Bool -> 'Bool
+PrimAll :: {a:'Nat} -> 'VecScalar a 'Bool -> 'Bool
+PrimACos :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimACosH :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimASin :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimASinH :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimATan :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimATanH :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimCos :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimCosH :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimDegrees :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimRadians :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimSin :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimSinH :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimTan :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimTanH :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimExp :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimLog :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimExp2 :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimLog2 :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimSqrt :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimInvSqrt :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimPow :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a->a
+PrimATan2 :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a->a
+PrimFloor :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimTrunc :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimRound :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimRoundEven :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimCeil :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimFract :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimMin :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
+PrimMax :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
+PrimMinS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> a->b
+PrimMaxS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> a->b
+PrimIsNan :: {a} -> {b:'Nat} -> {c} -> {_ : a ~ 'VecScalar b 'Float} -> {_ : c ~ 'VecScalar b 'Bool} -> a->c
+PrimIsInf :: {a} -> {b:'Nat} -> {c} -> {_ : a ~ 'VecScalar b 'Float} -> {_ : c ~ 'VecScalar b 'Bool} -> a->c
+PrimAbs :: {a} -> {b} -> {c:'Nat} -> {_ : 'Signed a} -> {_ : b ~ 'VecScalar c a} -> b->b
+PrimSign :: {a} -> {b} -> {c:'Nat} -> {_ : 'Signed a} -> {_ : b ~ 'VecScalar c a} -> b->b
+PrimModF :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->(a, a)
+PrimClamp :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> b -> b->b
+PrimClampS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> a -> a->b
+PrimMix :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a -> a->a
+PrimMixS :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a -> 'Float->a
+PrimMixB :: {a} -> {b:'Nat} -> {c} -> {_ : a ~ 'VecScalar b 'Float} -> {_ : c ~ 'VecScalar b 'Bool} -> a -> a -> c->a
+PrimStep :: {a} -> {b:'Nat} -> {_ : a ~ 'VecS 'Float b} -> a -> a->a
+PrimStepS :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> 'Float -> a->a
+PrimSmoothStep :: {a} -> {b:'Nat} -> {_ : a ~ 'VecS 'Float b} -> a -> a -> a->a
+PrimSmoothStepS :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> 'Float -> 'Float -> a->a
+PrimFloatBitsToInt :: {a:'Nat} -> 'VecScalar a 'Float -> 'VecScalar a 'Int
+PrimFloatBitsToUInt :: {a:'Nat} -> 'VecScalar a 'Float -> 'VecScalar a 'Word
+PrimIntBitsToFloat :: {a:'Nat} -> 'VecScalar a 'Int -> 'VecScalar a 'Float
+PrimUIntBitsToFloat :: {a:'Nat} -> 'VecScalar a 'Word -> 'VecScalar a 'Float
+PrimLength :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->'Float
+PrimDistance :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a->'Float
+PrimDot :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a->'Float
+PrimCross :: {a} -> {_ : a ~ 'VecS 'Float 3} -> a -> a->a
+PrimNormalize :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimFaceForward :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a -> a->a
+PrimRefract :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a -> a->a
+PrimReflect :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a->a
+PrimTranspose :: {a:'Nat} -> {b:'Nat} -> {c} -> 'Mat a b c -> 'Mat b a c
+PrimDeterminant :: {a:'Nat} -> {b} -> 'Mat a a b -> 'Float
+PrimInverse :: {a:'Nat} -> {b} -> 'Mat a a b -> 'Mat a a b
+PrimOuterProduct :: {a:'Nat} -> {b} -> {c:'Nat} -> 'Vec a b -> 'Vec c b -> 'Mat c a b
+PrimMulMatVec :: {a:'Nat} -> {b:'Nat} -> {c} -> 'Mat a b c -> 'Vec b c -> 'Vec a c
+PrimMulVecMat :: {a:'Nat} -> {b} -> {c:'Nat} -> 'Vec a b -> 'Mat a c b -> 'Vec c b
+PrimMulMatMat :: {a:'Nat} -> {b:'Nat} -> {c} -> {d:'Nat} -> 'Mat a b c -> 'Mat b d c -> 'Mat a d c
+PrimLessThan :: {a} -> {b:'Nat} -> {c} -> {d} -> {_ : 'Num c} -> {_ : a ~ 'VecScalar b c} -> {_ : d ~ 'VecScalar b 'Bool} -> a -> a->d
+PrimLessThanEqual :: {a} -> {b:'Nat} -> {c} -> {d} -> {_ : 'Num c} -> {_ : a ~ 'VecScalar b c} -> {_ : d ~ 'VecScalar b 'Bool} -> a -> a->d
+PrimGreaterThan :: {a} -> {b:'Nat} -> {c} -> {d} -> {_ : 'Num c} -> {_ : a ~ 'VecScalar b c} -> {_ : d ~ 'VecScalar b 'Bool} -> a -> a->d
+PrimGreaterThanEqual :: {a} -> {b:'Nat} -> {c} -> {d} -> {_ : 'Num c} -> {_ : a ~ 'VecScalar b c} -> {_ : d ~ 'VecScalar b 'Bool} -> a -> a->d
+PrimEqualV :: {a} -> {b:'Nat} -> {c} -> {d} -> {_ : 'Num c} -> {_ : a ~ 'VecScalar b c} -> {_ : d ~ 'VecScalar b 'Bool} -> a -> a->d
+PrimNotEqualV :: {a} -> {b:'Nat} -> {c} -> {d} -> {_ : 'Num c} -> {_ : a ~ 'VecScalar b c} -> {_ : d ~ 'VecScalar b 'Bool} -> a -> a->d
+PrimEqual :: {a} -> {b} -> {_ : b ~ 'MatVecScalarElem a} -> a -> a->'Bool
+PrimNotEqual :: {a} -> {b} -> {_ : b ~ 'MatVecScalarElem a} -> a -> a->'Bool
+PrimDFdx :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimDFdy :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimFWidth :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+PrimNoise1 :: {a:'Nat} -> 'VecScalar a 'Float -> 'Float
+PrimNoise2 :: {a:'Nat} -> 'VecScalar a 'Float -> 'Vec 2 'Float
+PrimNoise3 :: {a:'Nat} -> 'VecScalar a 'Float -> 'Vec 3 'Float
+PrimNoise4 :: {a:'Nat} -> 'VecScalar a 'Float -> 'Vec 4 'Float
+head :: {a} -> 'List a -> a
+++ :: {a} -> 'List a -> 'List a -> 'List a
+foldr :: {a} -> {b} -> (b -> a->a) -> a -> 'List b -> a
+concat :: {a} -> 'List ('List a) -> 'List a
+map :: {a} -> {b} -> (a->b) -> 'List a -> 'List b
+concatMap :: {a} -> {b} -> (a -> 'List b) -> 'List a -> 'List b
+len :: {a} -> 'List a -> 'Int
+'Maybe :: Type->Type
+Nothing :: {a} -> 'Maybe a
+Just :: {a} -> a -> 'Maybe a
+'MaybeCase :: {a} -> (b : 'Maybe a -> Type) -> b Nothing -> ((c:a) -> b (Just c)) -> (d : 'Maybe a) -> b d
+match'Maybe :: (a : Type->Type) -> ((b:Type) -> a ('Maybe b)) -> (c:Type) -> a c -> a c
+'Vector :: 'Nat -> Type->Type
+'VectorCase :: {a:'Nat} -> {b} -> (c : 'Vector a b -> Type) -> (d : 'Vector a b) -> c d
+match'Vector :: (a : Type->Type) -> ((b:'Nat) -> (c:Type) -> a ('Vector b c)) -> (d:Type) -> a d -> a d
+'PrimitiveType :: Type
+Triangle :: 'PrimitiveType
+Line :: 'PrimitiveType
+Point :: 'PrimitiveType
+TriangleAdjacency :: 'PrimitiveType
+LineAdjacency :: 'PrimitiveType
+'PrimitiveTypeCase :: (a : 'PrimitiveType->Type) -> a Triangle -> a Line -> a Point -> a TriangleAdjacency -> a LineAdjacency -> (b:'PrimitiveType) -> a b
+match'PrimitiveType :: (a : Type->Type) -> a 'PrimitiveType -> (b:Type) -> a b -> a b
+'Primitive :: Type -> 'PrimitiveType->Type
+PrimPoint :: {a} -> a -> 'Primitive a Point
+PrimLine :: {a} -> a -> a -> 'Primitive a Line
+PrimTriangle :: {a} -> a -> a -> a -> 'Primitive a Triangle
+'PrimitiveCase :: {a} -> (b : (c:'PrimitiveType) -> 'Primitive a c -> Type) -> ((d:a) -> b Point (PrimPoint d)) -> ((e:a) -> (f:a) -> b Line (PrimLine e f)) -> ((g:a) -> (h:a) -> (i:a) -> b Triangle (PrimTriangle g h i)) -> {j:'PrimitiveType} -> (k : 'Primitive a j) -> b j k
+match'Primitive :: (a : Type->Type) -> ((b:Type) -> (c:'PrimitiveType) -> a ('Primitive b c)) -> (d:Type) -> a d -> a d
+mapPrimitive :: {a} -> {b} -> {c:'PrimitiveType} -> (a->b) -> 'Primitive a c -> 'Primitive b c
+'PrimitiveStream :: 'PrimitiveType -> Type->Type
+mapPrimitives :: {a} -> {b} -> {c:'PrimitiveType} -> (a->b) -> 'List ('Primitive a c) -> 'List ('Primitive b c)
+'ListElem :: Type->Type
+fetchArrays :: {a:'PrimitiveType} -> {b : 'List Type} -> {c : 'List Type} -> {_ : b ~ map Type Type 'ListElem c} -> 'HList c -> 'PrimitiveStream a ('HList b)
+fetch :: {a:'PrimitiveType} -> {b : 'List Type} -> 'String -> 'HList b -> 'PrimitiveStream a ('HList b)
+Attribute :: {a} -> 'String->a
+fetchStream :: {a:'PrimitiveType} -> {b : 'List Type} -> 'String -> (c : 'List 'String) -> {_ : len 'String c ~ len Type b} -> 'PrimitiveStream a ('HList b)
+'SimpleFragment :: Type->Type
+SimpleFragment :: {a} -> 'Vec 3 'Float -> a -> 'SimpleFragment a
+'SimpleFragmentCase :: {a} -> (b : 'SimpleFragment a -> Type) -> ((c : 'Vec 3 'Float) -> (d:a) -> b (SimpleFragment c d)) -> (e : 'SimpleFragment a) -> b e
+match'SimpleFragment :: (a : Type->Type) -> ((b:Type) -> a ('SimpleFragment b)) -> (c:Type) -> a c -> a c
+'Fragment :: 'Nat -> Type->Type
+sFragmentCoords :: {a} -> 'SimpleFragment a -> 'VecS 'Float 3
+sFragmentValue :: {a} -> 'SimpleFragment a -> a
+'FragmentStream :: 'Nat -> Type->Type
+customizeDepth :: {a} -> {b:'Nat} -> (a->'Float) -> 'Fragment b a -> 'Fragment b a
+customizeDepths :: {a} -> {b:'Nat} -> (a->'Float) -> 'List ('Vector b ('Maybe ('SimpleFragment a))) -> 'List ('Vector b ('Maybe ('SimpleFragment a)))
+filterFragment :: {a} -> {b:'Nat} -> (a->'Bool) -> 'Fragment b a -> 'Fragment b a
+filterFragments :: {a} -> {b:'Nat} -> (a->'Bool) -> 'List ('Vector b ('Maybe ('SimpleFragment a))) -> 'List ('Vector b ('Maybe ('SimpleFragment a)))
+mapFragment :: {a} -> {b} -> {c:'Nat} -> (a->b) -> 'Fragment c a -> 'Fragment c b
+mapFragments :: {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 :: (a : 'ImageKind->Type) -> ((b:Type) -> a (Color b)) -> a Depth -> a Stencil -> (c:'ImageKind) -> a c
+match'ImageKind :: (a : Type->Type) -> a 'ImageKind -> (b:Type) -> a b -> a b
+imageType :: 'ImageKind->Type
+'Image :: 'Nat -> 'ImageKind->Type
+'ImageCase :: {a:'Nat} -> {b:'ImageKind} -> (c : 'Image a b -> Type) -> (d : 'Image a b) -> c d
+match'Image :: (a : Type->Type) -> ((b:'Nat) -> (c:'ImageKind) -> a ('Image b c)) -> (d:Type) -> a d -> a d
+ColorImage :: {a:'Nat} -> {b:'Nat} -> {c} -> {d} -> {_ : 'Num c} -> {_ : d ~ 'VecScalar b c} -> d -> 'Image a (Color d)
+DepthImage :: {a:'Nat} -> 'Float -> 'Image a Depth
+StencilImage :: {a:'Nat} -> 'Int -> 'Image a Stencil
+emptyDepthImage :: 'Float -> 'Image 1 Depth
+emptyColorImage :: {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 :: (a : 'Swizz->Type) -> a Sx -> a Sy -> a Sz -> a Sw -> (b:'Swizz) -> a b
+match'Swizz :: (a : Type->Type) -> a 'Swizz -> (b:Type) -> a b -> a b
+swizzscalar :: {a} -> {b:'Nat} -> 'Vec b a -> 'Swizz->a
+definedVec :: {a} -> {b:'Nat} -> 'Vec b a -> 'Bool
+swizzvector :: {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 :: (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 -> (b:'BlendingFactor) -> a b
+match'BlendingFactor :: (a : Type->Type) -> a 'BlendingFactor -> (b:Type) -> a b -> a b
+'BlendEquation :: Type
+FuncAdd :: 'BlendEquation
+FuncSubtract :: 'BlendEquation
+FuncReverseSubtract :: 'BlendEquation
+Min :: 'BlendEquation
+Max :: 'BlendEquation
+'BlendEquationCase :: (a : 'BlendEquation->Type) -> a FuncAdd -> a FuncSubtract -> a FuncReverseSubtract -> a Min -> a Max -> (b:'BlendEquation) -> a b
+match'BlendEquation :: (a : Type->Type) -> a 'BlendEquation -> (b:Type) -> 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 :: (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 -> (b:'LogicOperation) -> a b
+match'LogicOperation :: (a : Type->Type) -> a 'LogicOperation -> (b:Type) -> a b -> a b
+'StencilOperation :: Type
+OpZero :: 'StencilOperation
+OpKeep :: 'StencilOperation
+OpReplace :: 'StencilOperation
+OpIncr :: 'StencilOperation
+OpIncrWrap :: 'StencilOperation
+OpDecr :: 'StencilOperation
+OpDecrWrap :: 'StencilOperation
+OpInvert :: 'StencilOperation
+'StencilOperationCase :: (a : 'StencilOperation->Type) -> a OpZero -> a OpKeep -> a OpReplace -> a OpIncr -> a OpIncrWrap -> a OpDecr -> a OpDecrWrap -> a OpInvert -> (b:'StencilOperation) -> a b
+match'StencilOperation :: (a : Type->Type) -> a 'StencilOperation -> (b:Type) -> a b -> a b
+'ComparisonFunction :: Type
+Never :: 'ComparisonFunction
+Less :: 'ComparisonFunction
+Equal :: 'ComparisonFunction
+Lequal :: 'ComparisonFunction
+Greater :: 'ComparisonFunction
+Notequal :: 'ComparisonFunction
+Gequal :: 'ComparisonFunction
+Always :: 'ComparisonFunction
+'ComparisonFunctionCase :: (a : 'ComparisonFunction->Type) -> a Never -> a Less -> a Equal -> a Lequal -> a Greater -> a Notequal -> a Gequal -> a Always -> (b:'ComparisonFunction) -> a b
+match'ComparisonFunction :: (a : Type->Type) -> a 'ComparisonFunction -> (b:Type) -> a b -> a b
+'ProvokingVertex :: Type
+LastVertex :: 'ProvokingVertex
+FirstVertex :: 'ProvokingVertex
+'ProvokingVertexCase :: (a : 'ProvokingVertex->Type) -> a LastVertex -> a FirstVertex -> (b:'ProvokingVertex) -> a b
+match'ProvokingVertex :: (a : Type->Type) -> a 'ProvokingVertex -> (b:Type) -> a b -> a b
+'CullMode :: Type
+CullFront :: 'CullMode
+CullBack :: 'CullMode
+CullNone :: 'CullMode
+'CullModeCase :: (a : 'CullMode->Type) -> a CullFront -> a CullBack -> a CullNone -> (b:'CullMode) -> a b
+match'CullMode :: (a : Type->Type) -> a 'CullMode -> (b:Type) -> a b -> a b
+'PointSize :: Type->Type
+PointSize :: {a} -> 'Float -> 'PointSize a
+ProgramPointSize :: {a} -> (a->'Float) -> 'PointSize a
+'PointSizeCase :: {a} -> (b : 'PointSize a -> Type) -> ((c:'Float) -> b (PointSize c)) -> ((d : a->'Float) -> b (ProgramPointSize d)) -> (e : 'PointSize a) -> b e
+match'PointSize :: (a : Type->Type) -> ((b:Type) -> a ('PointSize b)) -> (c:Type) -> a c -> a c
+'PolygonMode :: Type->Type
+PolygonFill :: {a} -> 'PolygonMode a
+PolygonPoint :: {a} -> 'PointSize a -> 'PolygonMode a
+PolygonLine :: {a} -> 'Float -> 'PolygonMode a
+'PolygonModeCase :: {a} -> (b : 'PolygonMode a -> Type) -> b PolygonFill -> ((c : 'PointSize a) -> b (PolygonPoint c)) -> ((d:'Float) -> b (PolygonLine d)) -> (e : 'PolygonMode a) -> b e
+match'PolygonMode :: (a : Type->Type) -> ((b:Type) -> a ('PolygonMode b)) -> (c:Type) -> a c -> a c
+'PolygonOffset :: Type
+NoOffset :: 'PolygonOffset
+Offset :: 'Float -> 'Float->'PolygonOffset
+'PolygonOffsetCase :: (a : 'PolygonOffset->Type) -> a NoOffset -> ((b:'Float) -> (c:'Float) -> a (Offset b c)) -> (d:'PolygonOffset) -> a d
+match'PolygonOffset :: (a : Type->Type) -> a 'PolygonOffset -> (b:Type) -> a b -> a b
+'PointSpriteCoordOrigin :: Type
+LowerLeft :: 'PointSpriteCoordOrigin
+UpperLeft :: 'PointSpriteCoordOrigin
+'PointSpriteCoordOriginCase :: (a : 'PointSpriteCoordOrigin->Type) -> a LowerLeft -> a UpperLeft -> (b:'PointSpriteCoordOrigin) -> a b
+match'PointSpriteCoordOrigin :: (a : Type->Type) -> a 'PointSpriteCoordOrigin -> (b:Type) -> a b -> a b
+primTexture :: () -> 'Vec 2 'Float -> 'Vec 4 'Float
+Uniform :: {a} -> 'String->a
+'RasterContext :: Type -> 'PrimitiveType->Type
+TriangleCtx :: {a} -> 'CullMode -> 'PolygonMode a -> 'PolygonOffset -> 'ProvokingVertex -> 'RasterContext a Triangle
+PointCtx :: {a} -> 'PointSize a -> 'Float -> 'PointSpriteCoordOrigin -> 'RasterContext a Point
+LineCtx :: {a} -> 'Float -> 'ProvokingVertex -> 'RasterContext a Line
+'RasterContextCase :: {a} -> (b : (c:'PrimitiveType) -> 'RasterContext a c -> Type) -> ((d:'CullMode) -> (e : 'PolygonMode a) -> (f:'PolygonOffset) -> (g:'ProvokingVertex) -> b Triangle (TriangleCtx d e f g)) -> ((h : 'PointSize a) -> (i:'Float) -> (j:'PointSpriteCoordOrigin) -> b Point (PointCtx h i j)) -> ((k:'Float) -> (l:'ProvokingVertex) -> b Line (LineCtx k l)) -> {m:'PrimitiveType} -> (n : 'RasterContext a m) -> b m n
+match'RasterContext :: (a : Type->Type) -> ((b:Type) -> (c:'PrimitiveType) -> a ('RasterContext b c)) -> (d:Type) -> a d -> a d
+'Blending :: Type->Type
+NoBlending :: {a} -> 'Blending a
+BlendLogicOp :: {a} -> {_ : 'Integral a} -> 'LogicOperation -> 'Blending a
+Blend :: ('BlendEquation, 'BlendEquation) -> (('BlendingFactor, 'BlendingFactor), ('BlendingFactor, 'BlendingFactor)) -> 'Vec 4 'Float -> 'Blending 'Float
+'BlendingCase :: (a : (b:Type) -> 'Blending b -> Type) -> ({c} -> a c (NoBlending c)) -> ({d} -> {e : 'Integral d} -> (f:'LogicOperation) -> a d (BlendLogicOp d e f)) -> ((g:('BlendEquation, 'BlendEquation)) -> (h:(('BlendingFactor, 'BlendingFactor), ('BlendingFactor, 'BlendingFactor))) -> (i : 'Vec 4 'Float) -> a 'Float (Blend g h i)) -> {j} -> (k : 'Blending j) -> a j k
+match'Blending :: (a : Type->Type) -> ((b:Type) -> a ('Blending b)) -> (c:Type) -> a c -> a c
+'StencilTests :: Type
+'StencilTestsCase :: (a : 'StencilTests->Type) -> (b:'StencilTests) -> a b
+match'StencilTests :: (a : Type->Type) -> a 'StencilTests -> (b:Type) -> a b -> a b
+'StencilOps :: Type
+'StencilOpsCase :: (a : 'StencilOps->Type) -> (b:'StencilOps) -> a b
+match'StencilOps :: (a : Type->Type) -> a 'StencilOps -> (b:Type) -> a b -> a b
+'FragmentOperation :: 'ImageKind->Type
+ColorOp :: {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 :: (a : (b:'ImageKind) -> 'FragmentOperation b -> Type) -> ({c} -> {d:'Nat} -> {e : 'Num c} -> (f : 'Blending c) -> (g : 'VecScalar d 'Bool) -> a (Color ('VecScalar d c)) (ColorOp c d e f g)) -> ((h:'ComparisonFunction) -> (i:'Bool) -> a Depth (DepthOp h i)) -> ((j:'StencilTests) -> (k:'StencilOps) -> (l:'StencilOps) -> a Stencil (StencilOp j k l)) -> {m:'ImageKind} -> (n : 'FragmentOperation m) -> a m n
+match'FragmentOperation :: (a : Type->Type) -> ((b:'ImageKind) -> a ('FragmentOperation b)) -> (c:Type) -> a c -> a c
+'Interpolated :: Type->Type
+Smooth :: {a} -> {_ : 'Floating a} -> 'Interpolated a
+NoPerspective :: {a} -> {_ : 'Floating a} -> 'Interpolated a
+Flat :: {a} -> 'Interpolated a
+'InterpolatedCase :: {a} -> (b : 'Interpolated a -> Type) -> ({c : 'Floating a} -> b (Smooth c)) -> ({d : 'Floating a} -> b (NoPerspective d)) -> b Flat -> (e : 'Interpolated a) -> b e
+match'Interpolated :: (a : Type->Type) -> ((b:Type) -> a ('Interpolated b)) -> (c:Type) -> a c -> a c
+rasterizePrimitive :: {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 :: {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 :: {a} -> 'List a -> Type
+sameLayerCounts :: 'List Type -> Type
+'FrameBuffer :: 'Nat -> 'List 'ImageKind -> Type
+'FrameBufferCase :: {a:'Nat} -> {b : 'List 'ImageKind} -> (c : 'FrameBuffer a b -> Type) -> (d : 'FrameBuffer a b) -> c d
+match'FrameBuffer :: (a : Type->Type) -> ((b:'Nat) -> (c : 'List 'ImageKind) -> a ('FrameBuffer b c)) -> (d:Type) -> a d -> a d
+imageType' :: 'List 'ImageKind -> 'List Type
+'FragmentOperationKind :: Type->'ImageKind
+Accumulate :: {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 :: {a} -> {b} -> a -> b->(a, b)
+overlay :: {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 :: {a : 'List Type} -> {_ : sameLayerCounts a} -> 'HList a -> 'FrameBuffer ('ImageLC (head Type a)) (map Type 'ImageKind 'GetImageKind a)
+imageFrame :: {a : 'List Type} -> {_ : sameLayerCounts a} -> 'HList a -> 'FrameBuffer ('ImageLC (head Type a)) (map Type 'ImageKind 'GetImageKind a)
+accumulate :: {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 :: {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 :: {a:'Nat} -> {b : 'List 'ImageKind} -> 'FrameBuffer a b -> 'Output
+'OutputCase :: (a : 'Output->Type) -> ({b:'Nat} -> {c : 'List 'ImageKind} -> (d : 'FrameBuffer b c) -> a (ScreenOut b c d)) -> (e:'Output) -> a e
+match'Output :: (a : Type->Type) -> a 'Output -> (b:Type) -> a b -> a b
+renderFrame :: {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 :: (a : 'Texture->Type) -> ((b:'String) -> a (Texture2DSlot b)) -> ((c : 'Vec 2 'Int) -> (d : 'Image 1 (Color ('Vec 4 'Float))) -> a (Texture2D c d)) -> (e:'Texture) -> a e
+match'Texture :: (a : Type->Type) -> a 'Texture -> (b:Type) -> a b -> a b
+'Filter :: Type
+PointFilter :: 'Filter
+LinearFilter :: 'Filter
+'FilterCase :: (a : 'Filter->Type) -> a PointFilter -> a LinearFilter -> (b:'Filter) -> a b
+match'Filter :: (a : Type->Type) -> a 'Filter -> (b:Type) -> a b -> a b
+'EdgeMode :: Type
+Repeat :: 'EdgeMode
+MirroredRepeat :: 'EdgeMode
+ClampToEdge :: 'EdgeMode
+'EdgeModeCase :: (a : 'EdgeMode->Type) -> a Repeat -> a MirroredRepeat -> a ClampToEdge -> (b:'EdgeMode) -> a b
+match'EdgeMode :: (a : Type->Type) -> a 'EdgeMode -> (b:Type) -> a b -> a b
+'Sampler :: Type
+Sampler :: 'Filter -> 'EdgeMode -> 'Texture->'Sampler
+'SamplerCase :: (a : 'Sampler->Type) -> ((b:'Filter) -> (c:'EdgeMode) -> (d:'Texture) -> a (Sampler b c d)) -> (e:'Sampler) -> a e
+match'Sampler :: (a : Type->Type) -> a 'Sampler -> (b:Type) -> a b -> a b
+texture2D :: 'Sampler -> 'Vec 2 'Float -> 'Vec 4 'Float
+accumulationContext :: {a} -> a->a
 ------------ tooltips
 testdata/Builtins.lc 10:1-10:3  {a} -> a->a
 testdata/Builtins.lc 10:8-10:9  b_
diff --git a/testdata/Internals.out b/testdata/Internals.out
index 2fd24406..8f9dc73c 100644
--- a/testdata/Internals.out
+++ b/testdata/Internals.out
@@ -1,90 +1,90 @@
 main is not found
 ------------ trace
-typeAnn :: {a} -> a->a
-parens :: {a} -> a->a
-undefined :: {a}->a
-primFix :: {a} -> (a->a)->a
-'Unit :: Type
-TT :: 'Unit
-'UnitCase :: (a : 'Unit->Type) -> a TT -> (b:'Unit) -> a b
-match'Unit :: (a : Type->Type) -> a 'Unit -> (b:Type) -> a b -> a b
-'String :: Type
-'StringCase :: (a : 'String->Type) -> (b:'String) -> a b
-match'String :: (a : Type->Type) -> a 'String -> (b:Type) -> a b -> a b
-'Empty :: 'String->Type
-'EmptyCase :: {a:'String} -> (b : 'Empty a -> Type) -> (c : 'Empty a) -> b c
-match'Empty :: (a : Type->Type) -> ((b:'String) -> a ('Empty b)) -> (c:Type) -> a c -> a c
-unsafeCoerce :: {a} -> {b} -> a->b
-'EqCT :: (a:Type) -> a -> a->Type
-parEval :: (a:Type) -> a -> a->a
-'T2 :: Type -> Type->Type
-match'Type :: (a : Type->Type) -> a Type -> (b:Type) -> a b -> a b
-'EqCTt :: {a} -> a -> a->Type
-t2C :: 'Unit -> 'Unit->'Unit
-'Int :: Type
-'IntCase :: (a : 'Int->Type) -> (b:'Int) -> a b
-match'Int :: (a : Type->Type) -> a 'Int -> (b:Type) -> a b -> a b
-'Word :: Type
-'WordCase :: (a : 'Word->Type) -> (b:'Word) -> a b
-match'Word :: (a : Type->Type) -> a 'Word -> (b:Type) -> a b -> a b
-'Float :: Type
-'FloatCase :: (a : 'Float->Type) -> (b:'Float) -> a b
-match'Float :: (a : Type->Type) -> a 'Float -> (b:Type) -> a b -> a b
-'Char :: Type
-'CharCase :: (a : 'Char->Type) -> (b:'Char) -> a b
-match'Char :: (a : Type->Type) -> a 'Char -> (b:Type) -> a b -> a b
-'Bool :: Type
-False :: 'Bool
-True :: 'Bool
-'BoolCase :: (a : 'Bool->Type) -> a False -> a True -> (b:'Bool) -> a b
-match'Bool :: (a : Type->Type) -> a 'Bool -> (b:Type) -> a b -> a b
-'Ordering :: Type
-LT :: 'Ordering
-EQ :: 'Ordering
-GT :: 'Ordering
-'OrderingCase :: (a : 'Ordering->Type) -> a LT -> a EQ -> a GT -> (b:'Ordering) -> a b
-match'Ordering :: (a : Type->Type) -> a 'Ordering -> (b:Type) -> a b -> a b
-'Nat :: Type
-Zero :: 'Nat
-Succ :: 'Nat->'Nat
-'NatCase :: (a : 'Nat->Type) -> a 0 -> ((b:'Nat) -> a (Succ b)) -> (c:'Nat) -> a c
-match'Nat :: (a : Type->Type) -> a 'Nat -> (b:Type) -> 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 :: {a} -> 'Bool -> a -> a->a
-isEQ :: 'Ordering->'Bool
-'Num :: Type->Type
-fromInt :: {a} -> {_ : 'Num a} -> 'Int->a
-compare :: {a} -> {_ : 'Num a} -> a -> a->'Ordering
-negate :: {a} -> {_ : 'Num a} -> a->a
-'Eq :: Type->Type
-== :: {a} -> {_ : 'Eq a} -> a -> a->'Bool
-'List :: Type->Type
-Nil :: {a} -> 'List a
-Cons :: {a} -> a -> 'List a -> 'List a
-'ListCase :: {a} -> (b : 'List a -> Type) -> b Nil -> ((c:a) -> (d : 'List a) -> b (Cons c d)) -> (e : 'List a) -> b e
-match'List :: (a : Type->Type) -> ((b:Type) -> a ('List b)) -> (c:Type) -> a c -> a c
-'HList :: 'List Type -> Type
-HNil :: ()
-HCons :: {a} -> {b : 'List Type} -> a -> 'HList b -> 'HList (Cons a b)
-'HListCase :: (a : (b : 'List Type) -> 'HList b -> Type) -> a Nil () -> ({c} -> {d : 'List Type} -> (e:c) -> (f : 'HList d) -> a (Cons c d) (HCons c d e f)) -> {g : 'List Type} -> (h : 'HList g) -> a g h
-match'HList :: (a : Type->Type) -> ((b : 'List Type) -> a ('HList b)) -> (c:Type) -> a c -> a c
-hlistNilCase :: (a:Type) -> a -> ()->a
-hlistConsCase :: {a} -> {b : 'List Type} -> (c:Type) -> (a -> 'HList b -> c) -> 'HList (Cons a b) -> c
+typeAnn :: {a} -> a->a
+parens :: {a} -> a->a
+undefined :: {a}->a
+primFix :: {a} -> (a->a)->a
+'Unit :: Type
+TT :: 'Unit
+'UnitCase :: (a : 'Unit->Type) -> a TT -> (b:'Unit) -> a b
+match'Unit :: (a : Type->Type) -> a 'Unit -> (b:Type) -> a b -> a b
+'String :: Type
+'StringCase :: (a : 'String->Type) -> (b:'String) -> a b
+match'String :: (a : Type->Type) -> a 'String -> (b:Type) -> a b -> a b
+'Empty :: 'String->Type
+'EmptyCase :: {a:'String} -> (b : 'Empty a -> Type) -> (c : 'Empty a) -> b c
+match'Empty :: (a : Type->Type) -> ((b:'String) -> a ('Empty b)) -> (c:Type) -> a c -> a c
+unsafeCoerce :: {a} -> {b} -> a->b
+'EqCT :: (a:Type) -> a -> a->Type
+parEval :: (a:Type) -> a -> a->a
+'T2 :: Type -> Type->Type
+match'Type :: (a : Type->Type) -> a Type -> (b:Type) -> a b -> a b
+'EqCTt :: {a} -> a -> a->Type
+t2C :: 'Unit -> 'Unit->'Unit
+'Int :: Type
+'IntCase :: (a : 'Int->Type) -> (b:'Int) -> a b
+match'Int :: (a : Type->Type) -> a 'Int -> (b:Type) -> a b -> a b
+'Word :: Type
+'WordCase :: (a : 'Word->Type) -> (b:'Word) -> a b
+match'Word :: (a : Type->Type) -> a 'Word -> (b:Type) -> a b -> a b
+'Float :: Type
+'FloatCase :: (a : 'Float->Type) -> (b:'Float) -> a b
+match'Float :: (a : Type->Type) -> a 'Float -> (b:Type) -> a b -> a b
+'Char :: Type
+'CharCase :: (a : 'Char->Type) -> (b:'Char) -> a b
+match'Char :: (a : Type->Type) -> a 'Char -> (b:Type) -> a b -> a b
+'Bool :: Type
+False :: 'Bool
+True :: 'Bool
+'BoolCase :: (a : 'Bool->Type) -> a False -> a True -> (b:'Bool) -> a b
+match'Bool :: (a : Type->Type) -> a 'Bool -> (b:Type) -> a b -> a b
+'Ordering :: Type
+LT :: 'Ordering
+EQ :: 'Ordering
+GT :: 'Ordering
+'OrderingCase :: (a : 'Ordering->Type) -> a LT -> a EQ -> a GT -> (b:'Ordering) -> a b
+match'Ordering :: (a : Type->Type) -> a 'Ordering -> (b:Type) -> a b -> a b
+'Nat :: Type
+Zero :: 'Nat
+Succ :: 'Nat->'Nat
+'NatCase :: (a : 'Nat->Type) -> a 0 -> ((b:'Nat) -> a (Succ b)) -> (c:'Nat) -> a c
+match'Nat :: (a : Type->Type) -> a 'Nat -> (b:Type) -> 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 :: {a} -> 'Bool -> a -> a->a
+isEQ :: 'Ordering->'Bool
+'Num :: Type->Type
+fromInt :: {a} -> {_ : 'Num a} -> 'Int->a
+compare :: {a} -> {_ : 'Num a} -> a -> a->'Ordering
+negate :: {a} -> {_ : 'Num a} -> a->a
+'Eq :: Type->Type
+== :: {a} -> {_ : 'Eq a} -> a -> a->'Bool
+'List :: Type->Type
+Nil :: {a} -> 'List a
+Cons :: {a} -> a -> 'List a -> 'List a
+'ListCase :: {a} -> (b : 'List a -> Type) -> b Nil -> ((c:a) -> (d : 'List a) -> b (Cons c d)) -> (e : 'List a) -> b e
+match'List :: (a : Type->Type) -> ((b:Type) -> a ('List b)) -> (c:Type) -> a c -> a c
+'HList :: 'List Type -> Type
+HNil :: ()
+HCons :: {a} -> {b : 'List Type} -> a -> 'HList b -> 'HList (Cons a b)
+'HListCase :: (a : (b : 'List Type) -> 'HList b -> Type) -> a Nil () -> ({c} -> {d : 'List Type} -> (e:c) -> (f : 'HList d) -> a (Cons c d) (HCons c d e f)) -> {g : 'List Type} -> (h : 'HList g) -> a g h
+match'HList :: (a : Type->Type) -> ((b : 'List Type) -> a ('HList b)) -> (c:Type) -> a c -> a c
+hlistNilCase :: (a:Type) -> a -> ()->a
+hlistConsCase :: {a} -> {b : 'List Type} -> (c:Type) -> (a -> 'HList b -> c) -> 'HList (Cons a b) -> c
 ------------ tooltips
 testdata/Internals.lc 6:1-6:8  {a} -> a->a
 testdata/Internals.lc 6:13-6:14  b_
diff --git a/testdata/Material.out b/testdata/Material.out
index 874319e4..0e4834d2 100644
--- a/testdata/Material.out
+++ b/testdata/Material.out
@@ -1,161 +1,161 @@
 main is not found
 ------------ trace
-identityLight :: 'Float
-'Entity :: Type
-Entity :: 'Vec 4 'Float -> 'Vec 4 'Float -> 'Vec 3 'Float -> 'Vec 4 'Float -> 'Entity
-'EntityCase :: (a : 'Entity->Type) -> ((b : 'Vec 4 'Float) -> (c : 'Vec 4 'Float) -> (d : 'Vec 3 'Float) -> (e : 'Vec 4 'Float) -> a (Entity b c d e)) -> (f:'Entity) -> a f
-match'Entity :: (a : Type->Type) -> a 'Entity -> (b:Type) -> 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 :: (a : 'WaveType->Type) -> a WT_Sin -> a WT_Triangle -> a WT_Square -> a WT_Sawtooth -> a WT_InverseSawtooth -> a WT_Noise -> (b:'WaveType) -> a b
-match'WaveType :: (a : Type->Type) -> a 'WaveType -> (b:Type) -> a b -> a b
-'Wave :: Type
-Wave :: 'WaveType -> 'Float -> 'Float -> 'Float -> 'Float->'Wave
-'WaveCase :: (a : 'Wave->Type) -> ((b:'WaveType) -> (c:'Float) -> (d:'Float) -> (e:'Float) -> (f:'Float) -> a (Wave b c d e f)) -> (g:'Wave) -> a g
-match'Wave :: (a : Type->Type) -> a 'Wave -> (b:Type) -> 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 :: (a : 'Deform->Type) -> a D_AutoSprite -> a D_AutoSprite2 -> ((b:'Float) -> (c:'Float) -> (d:'Float) -> a (D_Bulge b c d)) -> ((e : 'Vec 3 'Float) -> (f:'Wave) -> a (D_Move e f)) -> ((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 -> ((i:'Float) -> (j:'Wave) -> a (D_Wave i j)) -> (k:'Deform) -> a k
-match'Deform :: (a : Type->Type) -> a 'Deform -> (b:Type) -> a b -> a b
-'CullType :: Type
-CT_FrontSided :: 'CullType
-CT_BackSided :: 'CullType
-CT_TwoSided :: 'CullType
-'CullTypeCase :: (a : 'CullType->Type) -> a CT_FrontSided -> a CT_BackSided -> a CT_TwoSided -> (b:'CullType) -> a b
-match'CullType :: (a : Type->Type) -> a 'CullType -> (b:Type) -> 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 :: (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 -> (b:'Blending') -> a b
-match'Blending' :: (a : Type->Type) -> a 'Blending' -> (b:Type) -> 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 :: (a : 'RGBGen->Type) -> ((b:'Wave) -> a (RGB_Wave b)) -> ((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 -> (f:'RGBGen) -> a f
-match'RGBGen :: (a : Type->Type) -> a 'RGBGen -> (b:Type) -> 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 :: (a : 'AlphaGen->Type) -> ((b:'Wave) -> a (A_Wave b)) -> ((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 -> (d:'AlphaGen) -> a d
-match'AlphaGen :: (a : Type->Type) -> a 'AlphaGen -> (b:Type) -> 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 :: (a : 'TCGen->Type) -> a TG_Base -> a TG_Lightmap -> a TG_Environment -> ((b : 'Vec 3 'Float) -> (c : 'Vec 3 'Float) -> a (TG_Vector b c)) -> a TG_Undefined -> (d:'TCGen) -> a d
-match'TCGen :: (a : Type->Type) -> a 'TCGen -> (b:Type) -> 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 :: (a : 'TCMod->Type) -> a TM_EntityTranslate -> ((b:'Float) -> a (TM_Rotate b)) -> ((c:'Float) -> (d:'Float) -> a (TM_Scroll c d)) -> ((e:'Float) -> (f:'Float) -> a (TM_Scale e f)) -> ((g:'Wave) -> a (TM_Stretch g)) -> ((h:'Float) -> (i:'Float) -> (j:'Float) -> (k:'Float) -> (l:'Float) -> (m:'Float) -> a (TM_Transform h i j k l m)) -> ((n:'Float) -> (o:'Float) -> (p:'Float) -> (q:'Float) -> a (TM_Turb n o p q)) -> (r:'TCMod) -> a r
-match'TCMod :: (a : Type->Type) -> a 'TCMod -> (b:Type) -> 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 :: (a : 'StageTexture->Type) -> ((b:'String) -> a (ST_Map b)) -> ((c:'String) -> a (ST_ClampMap c)) -> ((d:'Float) -> (e : 'List 'String) -> a (ST_AnimMap d e)) -> a ST_Lightmap -> a ST_WhiteImage -> (f:'StageTexture) -> a f
-match'StageTexture :: (a : Type->Type) -> a 'StageTexture -> (b:Type) -> a b -> a b
-'AlphaFunction :: Type
-A_Gt0 :: 'AlphaFunction
-A_Lt128 :: 'AlphaFunction
-A_Ge128 :: 'AlphaFunction
-'AlphaFunctionCase :: (a : 'AlphaFunction->Type) -> a A_Gt0 -> a A_Lt128 -> a A_Ge128 -> (b:'AlphaFunction) -> a b
-match'AlphaFunction :: (a : Type->Type) -> a 'AlphaFunction -> (b:Type) -> a b -> a b
-'DepthFunction :: Type
-D_Equal :: 'DepthFunction
-D_Lequal :: 'DepthFunction
-'DepthFunctionCase :: (a : 'DepthFunction->Type) -> a D_Equal -> a D_Lequal -> (b:'DepthFunction) -> a b
-match'DepthFunction :: (a : Type->Type) -> a 'DepthFunction -> (b:Type) -> a b -> a b
-'StageAttrs :: Type
-StageAttrs :: 'Maybe ('Blending', 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
-'StageAttrsCase :: (a : 'StageAttrs->Type) -> ((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)) -> (m:'StageAttrs) -> a m
-match'StageAttrs :: (a : Type->Type) -> a 'StageAttrs -> (b:Type) -> 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 :: (a : 'CommonAttrs->Type) -> ((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)) -> (n:'CommonAttrs) -> a n
-match'CommonAttrs :: (a : Type->Type) -> a 'CommonAttrs -> (b:Type) -> 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
+identityLight :: 'Float
+'Entity :: Type
+Entity :: 'Vec 4 'Float -> 'Vec 4 'Float -> 'Vec 3 'Float -> 'Vec 4 'Float -> 'Entity
+'EntityCase :: (a : 'Entity->Type) -> ((b : 'Vec 4 'Float) -> (c : 'Vec 4 'Float) -> (d : 'Vec 3 'Float) -> (e : 'Vec 4 'Float) -> a (Entity b c d e)) -> (f:'Entity) -> a f
+match'Entity :: (a : Type->Type) -> a 'Entity -> (b:Type) -> 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 :: (a : 'WaveType->Type) -> a WT_Sin -> a WT_Triangle -> a WT_Square -> a WT_Sawtooth -> a WT_InverseSawtooth -> a WT_Noise -> (b:'WaveType) -> a b
+match'WaveType :: (a : Type->Type) -> a 'WaveType -> (b:Type) -> a b -> a b
+'Wave :: Type
+Wave :: 'WaveType -> 'Float -> 'Float -> 'Float -> 'Float->'Wave
+'WaveCase :: (a : 'Wave->Type) -> ((b:'WaveType) -> (c:'Float) -> (d:'Float) -> (e:'Float) -> (f:'Float) -> a (Wave b c d e f)) -> (g:'Wave) -> a g
+match'Wave :: (a : Type->Type) -> a 'Wave -> (b:Type) -> 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 :: (a : 'Deform->Type) -> a D_AutoSprite -> a D_AutoSprite2 -> ((b:'Float) -> (c:'Float) -> (d:'Float) -> a (D_Bulge b c d)) -> ((e : 'Vec 3 'Float) -> (f:'Wave) -> a (D_Move e f)) -> ((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 -> ((i:'Float) -> (j:'Wave) -> a (D_Wave i j)) -> (k:'Deform) -> a k
+match'Deform :: (a : Type->Type) -> a 'Deform -> (b:Type) -> a b -> a b
+'CullType :: Type
+CT_FrontSided :: 'CullType
+CT_BackSided :: 'CullType
+CT_TwoSided :: 'CullType
+'CullTypeCase :: (a : 'CullType->Type) -> a CT_FrontSided -> a CT_BackSided -> a CT_TwoSided -> (b:'CullType) -> a b
+match'CullType :: (a : Type->Type) -> a 'CullType -> (b:Type) -> 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 :: (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 -> (b:'Blending') -> a b
+match'Blending' :: (a : Type->Type) -> a 'Blending' -> (b:Type) -> 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 :: (a : 'RGBGen->Type) -> ((b:'Wave) -> a (RGB_Wave b)) -> ((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 -> (f:'RGBGen) -> a f
+match'RGBGen :: (a : Type->Type) -> a 'RGBGen -> (b:Type) -> 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 :: (a : 'AlphaGen->Type) -> ((b:'Wave) -> a (A_Wave b)) -> ((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 -> (d:'AlphaGen) -> a d
+match'AlphaGen :: (a : Type->Type) -> a 'AlphaGen -> (b:Type) -> 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 :: (a : 'TCGen->Type) -> a TG_Base -> a TG_Lightmap -> a TG_Environment -> ((b : 'Vec 3 'Float) -> (c : 'Vec 3 'Float) -> a (TG_Vector b c)) -> a TG_Undefined -> (d:'TCGen) -> a d
+match'TCGen :: (a : Type->Type) -> a 'TCGen -> (b:Type) -> 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 :: (a : 'TCMod->Type) -> a TM_EntityTranslate -> ((b:'Float) -> a (TM_Rotate b)) -> ((c:'Float) -> (d:'Float) -> a (TM_Scroll c d)) -> ((e:'Float) -> (f:'Float) -> a (TM_Scale e f)) -> ((g:'Wave) -> a (TM_Stretch g)) -> ((h:'Float) -> (i:'Float) -> (j:'Float) -> (k:'Float) -> (l:'Float) -> (m:'Float) -> a (TM_Transform h i j k l m)) -> ((n:'Float) -> (o:'Float) -> (p:'Float) -> (q:'Float) -> a (TM_Turb n o p q)) -> (r:'TCMod) -> a r
+match'TCMod :: (a : Type->Type) -> a 'TCMod -> (b:Type) -> 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 :: (a : 'StageTexture->Type) -> ((b:'String) -> a (ST_Map b)) -> ((c:'String) -> a (ST_ClampMap c)) -> ((d:'Float) -> (e : 'List 'String) -> a (ST_AnimMap d e)) -> a ST_Lightmap -> a ST_WhiteImage -> (f:'StageTexture) -> a f
+match'StageTexture :: (a : Type->Type) -> a 'StageTexture -> (b:Type) -> a b -> a b
+'AlphaFunction :: Type
+A_Gt0 :: 'AlphaFunction
+A_Lt128 :: 'AlphaFunction
+A_Ge128 :: 'AlphaFunction
+'AlphaFunctionCase :: (a : 'AlphaFunction->Type) -> a A_Gt0 -> a A_Lt128 -> a A_Ge128 -> (b:'AlphaFunction) -> a b
+match'AlphaFunction :: (a : Type->Type) -> a 'AlphaFunction -> (b:Type) -> a b -> a b
+'DepthFunction :: Type
+D_Equal :: 'DepthFunction
+D_Lequal :: 'DepthFunction
+'DepthFunctionCase :: (a : 'DepthFunction->Type) -> a D_Equal -> a D_Lequal -> (b:'DepthFunction) -> a b
+match'DepthFunction :: (a : Type->Type) -> a 'DepthFunction -> (b:Type) -> a b -> a b
+'StageAttrs :: Type
+StageAttrs :: 'Maybe ('Blending', 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
+'StageAttrsCase :: (a : 'StageAttrs->Type) -> ((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)) -> (m:'StageAttrs) -> a m
+match'StageAttrs :: (a : Type->Type) -> a 'StageAttrs -> (b:Type) -> 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 :: (a : 'CommonAttrs->Type) -> ((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)) -> (n:'CommonAttrs) -> a n
+match'CommonAttrs :: (a : Type->Type) -> a 'CommonAttrs -> (b:Type) -> 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 631f7aea..99401d65 100644
--- a/testdata/Prelude.out
+++ b/testdata/Prelude.out
@@ -1,176 +1,176 @@
 main is not found
 ------------ trace
-const :: {a} -> {b} -> a -> b->a
-otherwise :: 'Bool
-& :: {a} -> {b} -> a -> (a->b)->b
-$ :: {a} -> {b} -> (a->b) -> a->b
-. :: {a} -> {b} -> {c} -> (b->c) -> (a->b) -> a->c
-uncurry :: {a} -> {b} -> {c} -> (a -> c->b) -> (a, c)->b
-*** :: {a} -> {b} -> {c} -> {d} -> (a->c) -> (b->d) -> (a, b)->(c, d)
-pi :: 'Float
-zip :: {a} -> {b} -> 'List a -> 'List b -> 'List (a, b)
-unzip :: {a} -> {b} -> 'List (a, b) -> ('List a, 'List b)
-filter :: {a} -> (a->'Bool) -> 'List a -> 'List a
-tail :: {a} -> 'List a -> 'List a
-pairs :: {a} -> 'List a -> 'List (a, a)
-foldl' :: {a} -> {b} -> (a -> b->a) -> a -> 'List b -> a
-foldr1 :: {a} -> (a -> a->a) -> 'List a -> a
-split :: {a} -> 'List a -> ('List a, 'List a)
-mergeBy :: {a} -> (a -> a->'Ordering) -> 'List a -> 'List a -> 'List a
-sortBy :: {a} -> (a -> a->'Ordering) -> 'List a -> 'List a
-iterate :: {a} -> (a->a) -> a -> 'List a
-fst :: {a} -> {b} -> (a, b)->a
-snd :: {a} -> {b} -> (a, b)->b
-||| :: 'Bool -> 'Bool->'Bool
-&&& :: 'Bool -> 'Bool->'Bool
-'RecItem :: Type
-RecItem :: 'String -> Type->'RecItem
-'RecItemCase :: (a : 'RecItem->Type) -> ((b:'String) -> (c:Type) -> a (RecItem b c)) -> (d:'RecItem) -> a d
-match'RecItem :: (a : Type->Type) -> a 'RecItem -> (b:Type) -> a b -> a b
-recItemType :: 'RecItem->Type
-'RecordC :: 'List 'RecItem -> Type
-RecordCons :: {a : 'List 'RecItem} -> 'HList (map 'RecItem Type recItemType a) -> 'RecordC a
-'RecordCCase :: {a : 'List 'RecItem} -> (b : 'RecordC a -> Type) -> ((c : 'HList (map 'RecItem Type recItemType a)) -> b (RecordCons c)) -> (d : 'RecordC a) -> b d
-match'RecordC :: (a : Type->Type) -> ((b : 'List 'RecItem) -> a ('RecordC b)) -> (c:Type) -> a c -> a c
-isKeyC :: 'String -> Type -> 'List 'RecItem -> Type
-fstTup :: {a} -> {b : 'List Type} -> 'HList (Cons a b) -> a
-sndTup :: {a} -> {b : 'List Type} -> 'HList (Cons a b) -> 'HList b
-project :: {a} -> {b : 'List 'RecItem} -> (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 :: {a:'Nat} -> {b} -> {c} -> {_ : 'Num b} -> {_ : c ~ 'VecScalar a b} -> c -> 'Image 1 (Color c)
-colorImage2 :: {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 :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-degrees :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-sin :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-cos :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-tan :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-sinh :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-cosh :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-tanh :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-asin :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-asinh :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-acos :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-acosh :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-atan :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-atanh :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-atan2 :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a->a
-pow :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a->a
-exp :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-log :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-exp2 :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-log2 :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-sqrt :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-inversesqrt :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-abs :: {a} -> {b} -> {c:'Nat} -> {_ : 'Signed a} -> {_ : b ~ 'VecScalar c a} -> b->b
-sign :: {a} -> {b} -> {c:'Nat} -> {_ : 'Signed a} -> {_ : b ~ 'VecScalar c a} -> b->b
-floor :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-trunc :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-round :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-roundEven :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-ceil :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-fract :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-mod :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
-min :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
-max :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
-modF :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->(a, a)
-clamp :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> b -> b->b
-clampS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> a -> a->b
-mix :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a -> a->a
-mixS :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a -> 'Float->a
-mixB :: {a} -> {b:'Nat} -> {c} -> {_ : a ~ 'VecScalar b 'Float} -> {_ : c ~ 'VecScalar b 'Bool} -> a -> a -> c->a
-step :: {a} -> {b:'Nat} -> {_ : a ~ 'VecS 'Float b} -> a -> a->a
-stepS :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> 'Float -> a->a
-smoothstep :: {a} -> {b:'Nat} -> {_ : a ~ 'VecS 'Float b} -> a -> a -> a->a
-smoothstepS :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> 'Float -> 'Float -> a->a
-isNan :: {a} -> {b:'Nat} -> {c} -> {_ : a ~ 'VecScalar b 'Float} -> {_ : c ~ 'VecScalar b 'Bool} -> a->c
-isInf :: {a} -> {b:'Nat} -> {c} -> {_ : a ~ 'VecScalar b 'Float} -> {_ : c ~ 'VecScalar b 'Bool} -> a->c
-dFdx :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-dFdy :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-fWidth :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-noise1 :: {a:'Nat} -> 'VecScalar a 'Float -> 'Float
-noise2 :: {a:'Nat} -> 'VecScalar a 'Float -> 'Vec 2 'Float
-noise3 :: {a:'Nat} -> 'VecScalar a 'Float -> 'Vec 3 'Float
-noise4 :: {a:'Nat} -> 'VecScalar a 'Float -> 'Vec 4 'Float
-length :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->'Float
-distance :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a->'Float
-dot :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a->'Float
-cross :: {a} -> {_ : a ~ 'VecS 'Float 3} -> a -> a->a
-normalize :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
-faceforward :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a -> a->a
-reflect :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a->a
-refract :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a -> a->a
-transpose :: {a:'Nat} -> {b:'Nat} -> {c} -> 'Mat a b c -> 'Mat b a c
-det :: {a:'Nat} -> {b} -> 'Mat a a b -> 'Float
-inv :: {a:'Nat} -> {b} -> 'Mat a a b -> 'Mat a a b
-outer :: {a:'Nat} -> {b} -> {c:'Nat} -> 'Vec a b -> 'Vec c b -> 'Mat c a b
-bAnd :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
-bOr :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
-bXor :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
-bNot :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b->b
-bAndS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> a->b
-bOrS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> a->b
-bXorS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> a->b
-shiftL :: {a} -> {b} -> {c:'Nat} -> {d} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> {_ : d ~ 'VecScalar c 'Word} -> b -> d->b
-shiftR :: {a} -> {b} -> {c:'Nat} -> {d} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> {_ : d ~ 'VecScalar c 'Word} -> b -> d->b
-shiftLS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> 'Word->b
-shiftRS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> 'Word->b
-floatBitsToInt :: {a:'Nat} -> 'VecScalar a 'Float -> 'VecScalar a 'Int
-floatBitsToWord :: {a:'Nat} -> 'VecScalar a 'Float -> 'VecScalar a 'Word
-intBitsToFloat :: {a:'Nat} -> 'VecScalar a 'Int -> 'VecScalar a 'Float
-wordBitsToFloat :: {a:'Nat} -> 'VecScalar a 'Word -> 'VecScalar a 'Float
-+ :: {a} -> {_ : 'Num ('MatVecScalarElem a)} -> a -> a->a
-- :: {a} -> {_ : 'Num ('MatVecScalarElem a)} -> a -> a->a
-* :: {a} -> {_ : 'Num ('MatVecScalarElem a)} -> a -> a->a
-/ :: {a} -> {b:'Nat} -> {_ : 'Num a} -> 'VecScalar b a -> 'VecScalar b a -> 'VecScalar b a
-% :: {a} -> {b:'Nat} -> {_ : 'Num a} -> 'VecScalar b a -> 'VecScalar b a -> 'VecScalar b a
-neg :: {a} -> {_ : 'Signed ('MatVecScalarElem a)} -> a->a
-/= :: {a} -> a -> a->'Bool
-< :: {a:'Nat} -> {b} -> {_ : 'Num b} -> 'VecScalar a b -> 'VecScalar a b -> 'VecScalar a 'Bool
-<= :: {a:'Nat} -> {b} -> {_ : 'Num b} -> 'VecScalar a b -> 'VecScalar a b -> 'VecScalar a 'Bool
->= :: {a:'Nat} -> {b} -> {_ : 'Num b} -> 'VecScalar a b -> 'VecScalar a b -> 'VecScalar a 'Bool
-> :: {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 :: {a:'Nat} -> 'VecScalar a 'Bool -> 'VecScalar a 'Bool
-any :: {a:'Nat} -> 'VecScalar a 'Bool -> 'Bool
-all :: {a:'Nat} -> 'VecScalar a 'Bool -> 'Bool
-.*. :: {a:'Nat} -> {b:'Nat} -> {c} -> {d:'Nat} -> 'Mat a b c -> 'Mat b d c -> 'Mat a d c
-*. :: {a:'Nat} -> {b:'Nat} -> {c} -> 'Mat a b c -> 'VecS c b -> 'Vec a c
-.* :: {a:'Nat} -> {b} -> {c:'Nat} -> 'VecS b a -> 'Mat a c b -> 'Vec c b
-+! :: {a} -> {_ : 'Num ('MatVecScalarElem a)} -> a -> 'MatVecScalarElem a -> a
--! :: {a} -> {_ : 'Num ('MatVecScalarElem a)} -> a -> 'MatVecScalarElem a -> a
-*! :: {a} -> {_ : 'Num ('MatVecScalarElem a)} -> a -> 'MatVecScalarElem a -> a
-/! :: {a} -> {b:'Nat} -> {_ : 'Num a} -> 'VecScalar b a -> a -> 'VecScalar b a
-%! :: {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
-!! :: {a} -> 'List a -> 'Int->a
+const :: {a} -> {b} -> a -> b->a
+otherwise :: 'Bool
+& :: {a} -> {b} -> a -> (a->b)->b
+$ :: {a} -> {b} -> (a->b) -> a->b
+. :: {a} -> {b} -> {c} -> (b->c) -> (a->b) -> a->c
+uncurry :: {a} -> {b} -> {c} -> (a -> c->b) -> (a, c)->b
+*** :: {a} -> {b} -> {c} -> {d} -> (a->c) -> (b->d) -> (a, b)->(c, d)
+pi :: 'Float
+zip :: {a} -> {b} -> 'List a -> 'List b -> 'List (a, b)
+unzip :: {a} -> {b} -> 'List (a, b) -> ('List a, 'List b)
+filter :: {a} -> (a->'Bool) -> 'List a -> 'List a
+tail :: {a} -> 'List a -> 'List a
+pairs :: {a} -> 'List a -> 'List (a, a)
+foldl' :: {a} -> {b} -> (a -> b->a) -> a -> 'List b -> a
+foldr1 :: {a} -> (a -> a->a) -> 'List a -> a
+split :: {a} -> 'List a -> ('List a, 'List a)
+mergeBy :: {a} -> (a -> a->'Ordering) -> 'List a -> 'List a -> 'List a
+sortBy :: {a} -> (a -> a->'Ordering) -> 'List a -> 'List a
+iterate :: {a} -> (a->a) -> a -> 'List a
+fst :: {a} -> {b} -> (a, b)->a
+snd :: {a} -> {b} -> (a, b)->b
+||| :: 'Bool -> 'Bool->'Bool
+&&& :: 'Bool -> 'Bool->'Bool
+'RecItem :: Type
+RecItem :: 'String -> Type->'RecItem
+'RecItemCase :: (a : 'RecItem->Type) -> ((b:'String) -> (c:Type) -> a (RecItem b c)) -> (d:'RecItem) -> a d
+match'RecItem :: (a : Type->Type) -> a 'RecItem -> (b:Type) -> a b -> a b
+recItemType :: 'RecItem->Type
+'RecordC :: 'List 'RecItem -> Type
+RecordCons :: {a : 'List 'RecItem} -> 'HList (map 'RecItem Type recItemType a) -> 'RecordC a
+'RecordCCase :: {a : 'List 'RecItem} -> (b : 'RecordC a -> Type) -> ((c : 'HList (map 'RecItem Type recItemType a)) -> b (RecordCons c)) -> (d : 'RecordC a) -> b d
+match'RecordC :: (a : Type->Type) -> ((b : 'List 'RecItem) -> a ('RecordC b)) -> (c:Type) -> a c -> a c
+isKeyC :: 'String -> Type -> 'List 'RecItem -> Type
+fstTup :: {a} -> {b : 'List Type} -> 'HList (Cons a b) -> a
+sndTup :: {a} -> {b : 'List Type} -> 'HList (Cons a b) -> 'HList b
+project :: {a} -> {b : 'List 'RecItem} -> (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 :: {a:'Nat} -> {b} -> {c} -> {_ : 'Num b} -> {_ : c ~ 'VecScalar a b} -> c -> 'Image 1 (Color c)
+colorImage2 :: {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 :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+degrees :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+sin :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+cos :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+tan :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+sinh :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+cosh :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+tanh :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+asin :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+asinh :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+acos :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+acosh :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+atan :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+atanh :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+atan2 :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a->a
+pow :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a->a
+exp :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+log :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+exp2 :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+log2 :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+sqrt :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+inversesqrt :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+abs :: {a} -> {b} -> {c:'Nat} -> {_ : 'Signed a} -> {_ : b ~ 'VecScalar c a} -> b->b
+sign :: {a} -> {b} -> {c:'Nat} -> {_ : 'Signed a} -> {_ : b ~ 'VecScalar c a} -> b->b
+floor :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+trunc :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+round :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+roundEven :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+ceil :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+fract :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+mod :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
+min :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
+max :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
+modF :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->(a, a)
+clamp :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> b -> b->b
+clampS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Num a} -> {_ : b ~ 'VecScalar c a} -> b -> a -> a->b
+mix :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a -> a->a
+mixS :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a -> 'Float->a
+mixB :: {a} -> {b:'Nat} -> {c} -> {_ : a ~ 'VecScalar b 'Float} -> {_ : c ~ 'VecScalar b 'Bool} -> a -> a -> c->a
+step :: {a} -> {b:'Nat} -> {_ : a ~ 'VecS 'Float b} -> a -> a->a
+stepS :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> 'Float -> a->a
+smoothstep :: {a} -> {b:'Nat} -> {_ : a ~ 'VecS 'Float b} -> a -> a -> a->a
+smoothstepS :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> 'Float -> 'Float -> a->a
+isNan :: {a} -> {b:'Nat} -> {c} -> {_ : a ~ 'VecScalar b 'Float} -> {_ : c ~ 'VecScalar b 'Bool} -> a->c
+isInf :: {a} -> {b:'Nat} -> {c} -> {_ : a ~ 'VecScalar b 'Float} -> {_ : c ~ 'VecScalar b 'Bool} -> a->c
+dFdx :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+dFdy :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+fWidth :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+noise1 :: {a:'Nat} -> 'VecScalar a 'Float -> 'Float
+noise2 :: {a:'Nat} -> 'VecScalar a 'Float -> 'Vec 2 'Float
+noise3 :: {a:'Nat} -> 'VecScalar a 'Float -> 'Vec 3 'Float
+noise4 :: {a:'Nat} -> 'VecScalar a 'Float -> 'Vec 4 'Float
+length :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->'Float
+distance :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a->'Float
+dot :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a->'Float
+cross :: {a} -> {_ : a ~ 'VecS 'Float 3} -> a -> a->a
+normalize :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a->a
+faceforward :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a -> a->a
+reflect :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a->a
+refract :: {a} -> {b:'Nat} -> {_ : a ~ 'VecScalar b 'Float} -> a -> a -> a->a
+transpose :: {a:'Nat} -> {b:'Nat} -> {c} -> 'Mat a b c -> 'Mat b a c
+det :: {a:'Nat} -> {b} -> 'Mat a a b -> 'Float
+inv :: {a:'Nat} -> {b} -> 'Mat a a b -> 'Mat a a b
+outer :: {a:'Nat} -> {b} -> {c:'Nat} -> 'Vec a b -> 'Vec c b -> 'Mat c a b
+bAnd :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
+bOr :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
+bXor :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> b->b
+bNot :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b->b
+bAndS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> a->b
+bOrS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> a->b
+bXorS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> a->b
+shiftL :: {a} -> {b} -> {c:'Nat} -> {d} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> {_ : d ~ 'VecScalar c 'Word} -> b -> d->b
+shiftR :: {a} -> {b} -> {c:'Nat} -> {d} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> {_ : d ~ 'VecScalar c 'Word} -> b -> d->b
+shiftLS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> 'Word->b
+shiftRS :: {a} -> {b} -> {c:'Nat} -> {_ : 'Integral a} -> {_ : b ~ 'VecScalar c a} -> b -> 'Word->b
+floatBitsToInt :: {a:'Nat} -> 'VecScalar a 'Float -> 'VecScalar a 'Int
+floatBitsToWord :: {a:'Nat} -> 'VecScalar a 'Float -> 'VecScalar a 'Word
+intBitsToFloat :: {a:'Nat} -> 'VecScalar a 'Int -> 'VecScalar a 'Float
+wordBitsToFloat :: {a:'Nat} -> 'VecScalar a 'Word -> 'VecScalar a 'Float
++ :: {a} -> {_ : 'Num ('MatVecScalarElem a)} -> a -> a->a
+- :: {a} -> {_ : 'Num ('MatVecScalarElem a)} -> a -> a->a
+* :: {a} -> {_ : 'Num ('MatVecScalarElem a)} -> a -> a->a
+/ :: {a} -> {b:'Nat} -> {_ : 'Num a} -> 'VecScalar b a -> 'VecScalar b a -> 'VecScalar b a
+% :: {a} -> {b:'Nat} -> {_ : 'Num a} -> 'VecScalar b a -> 'VecScalar b a -> 'VecScalar b a
+neg :: {a} -> {_ : 'Signed ('MatVecScalarElem a)} -> a->a
+/= :: {a} -> a -> a->'Bool
+< :: {a:'Nat} -> {b} -> {_ : 'Num b} -> 'VecScalar a b -> 'VecScalar a b -> 'VecScalar a 'Bool
+<= :: {a:'Nat} -> {b} -> {_ : 'Num b} -> 'VecScalar a b -> 'VecScalar a b -> 'VecScalar a 'Bool
+>= :: {a:'Nat} -> {b} -> {_ : 'Num b} -> 'VecScalar a b -> 'VecScalar a b -> 'VecScalar a 'Bool
+> :: {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 :: {a:'Nat} -> 'VecScalar a 'Bool -> 'VecScalar a 'Bool
+any :: {a:'Nat} -> 'VecScalar a 'Bool -> 'Bool
+all :: {a:'Nat} -> 'VecScalar a 'Bool -> 'Bool
+.*. :: {a:'Nat} -> {b:'Nat} -> {c} -> {d:'Nat} -> 'Mat a b c -> 'Mat b d c -> 'Mat a d c
+*. :: {a:'Nat} -> {b:'Nat} -> {c} -> 'Mat a b c -> 'VecS c b -> 'Vec a c
+.* :: {a:'Nat} -> {b} -> {c:'Nat} -> 'VecS b a -> 'Mat a c b -> 'Vec c b
++! :: {a} -> {_ : 'Num ('MatVecScalarElem a)} -> a -> 'MatVecScalarElem a -> a
+-! :: {a} -> {_ : 'Num ('MatVecScalarElem a)} -> a -> 'MatVecScalarElem a -> a
+*! :: {a} -> {_ : 'Num ('MatVecScalarElem a)} -> a -> 'MatVecScalarElem a -> a
+/! :: {a} -> {b:'Nat} -> {_ : 'Num a} -> 'VecScalar b a -> a -> 'VecScalar b a
+%! :: {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
+!! :: {a} -> 'List a -> 'Int->a
 ------------ tooltips
 testdata/Prelude.lc 16:1-16:6  {a} -> {b} -> a -> b->a
 testdata/Prelude.lc 16:13-16:14  d_
diff --git a/testdata/SampleMaterial.out b/testdata/SampleMaterial.out
index 53ea5d71..878fd833 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 730a6f84..7322b12d 100644
--- a/testdata/adhoc.reject.out
+++ b/testdata/adhoc.reject.out
@@ -4,10 +4,10 @@ x = one :: Vec 4 A
     ^^^
 
 ------------ trace
-'A :: Type
-A :: 'A
-'ACase :: (a : 'A->Type) -> a A -> (b:'A) -> a b
-match'A :: (a : Type->Type) -> a 'A -> (b:Type) -> a b -> a b
+'A :: Type
+A :: 'A
+'ACase :: (a : 'A->Type) -> a A -> (b:'A) -> a b
+match'A :: (a : Type->Type) -> a 'A -> (b:Type) -> 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/ambig.out b/testdata/ambig.out
index bf421b4d..04e30108 100644
--- a/testdata/ambig.out
+++ b/testdata/ambig.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-h :: {a} -> {b} -> {c} -> {d} -> (b -> d->c) -> (b, d) -> a->c
+h :: {a} -> {b} -> {c} -> {d} -> (b -> d->c) -> (b, d) -> a->c
 ------------ tooltips
 testdata/ambig.lc 4:1-4:2  {a} -> {b} -> {c} -> {d} -> (b -> d->c) -> (b, d) -> a->c
 testdata/ambig.lc 4:11-4:12  c_
diff --git a/testdata/complex.out b/testdata/complex.out
index 7c33a18a..59a9beaa 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 :: (a : 'Repr->Type) -> a Normal -> a Polar -> (b:'Repr) -> a b
-match'Repr :: (a : Type->Type) -> a 'Repr -> (b:Type) -> a b -> a b
-'Complex :: 'Repr->Type
-Complex :: {a:'Repr} -> 'Float -> 'Float -> 'Complex a
-'ComplexCase :: (a : (b:'Repr) -> 'Complex b -> Type) -> ({c:'Repr} -> (d:'Float) -> (e:'Float) -> a c (Complex c d e)) -> {f:'Repr} -> (g : 'Complex f) -> a f g
-match'Complex :: (a : Type->Type) -> ((b:'Repr) -> a ('Complex b)) -> (c:Type) -> a c -> a c
-repr :: {a:'Repr} -> 'Complex a -> 'Repr
-normal :: 'Float -> 'Float -> 'Complex Normal
-polar :: 'Float -> 'Float -> 'Complex Polar
-cabs :: {a:'Repr} -> 'Complex a -> 'Float
-toPolar :: 'Complex Normal -> 'Complex Polar
-toNormal :: 'Complex Polar -> 'Complex Normal
-it_should_fail :: {a:'Repr} -> 'Complex a -> 'Float
-add :: {a:'Repr} -> {b:'Repr} -> 'Complex a -> 'Complex b -> 'Complex a
-mul :: {a:'Repr} -> {b:'Repr} -> 'Complex a -> 'Complex b -> 'Complex a
-s :: {a:'Repr} -> 'Complex a -> 'Complex a
-s4 :: {a:'Repr} -> 'Complex a -> 'Complex a
-iter :: {a:'Repr} -> 'Complex a -> 'Complex a
-mandel :: {a:'Repr} -> 'Complex a -> 'VecScalar 1 'Bool
+'Repr :: Type
+Normal :: 'Repr
+Polar :: 'Repr
+'ReprCase :: (a : 'Repr->Type) -> a Normal -> a Polar -> (b:'Repr) -> a b
+match'Repr :: (a : Type->Type) -> a 'Repr -> (b:Type) -> a b -> a b
+'Complex :: 'Repr->Type
+Complex :: {a:'Repr} -> 'Float -> 'Float -> 'Complex a
+'ComplexCase :: (a : (b:'Repr) -> 'Complex b -> Type) -> ({c:'Repr} -> (d:'Float) -> (e:'Float) -> a c (Complex c d e)) -> {f:'Repr} -> (g : 'Complex f) -> a f g
+match'Complex :: (a : Type->Type) -> ((b:'Repr) -> a ('Complex b)) -> (c:Type) -> a c -> a c
+repr :: {a:'Repr} -> 'Complex a -> 'Repr
+normal :: 'Float -> 'Float -> 'Complex Normal
+polar :: 'Float -> 'Float -> 'Complex Polar
+cabs :: {a:'Repr} -> 'Complex a -> 'Float
+toPolar :: 'Complex Normal -> 'Complex Polar
+toNormal :: 'Complex Polar -> 'Complex Normal
+it_should_fail :: {a:'Repr} -> 'Complex a -> 'Float
+add :: {a:'Repr} -> {b:'Repr} -> 'Complex a -> 'Complex b -> 'Complex a
+mul :: {a:'Repr} -> {b:'Repr} -> 'Complex a -> 'Complex b -> 'Complex a
+s :: {a:'Repr} -> 'Complex a -> 'Complex a
+s4 :: {a:'Repr} -> 'Complex a -> 'Complex a
+iter :: {a:'Repr} -> 'Complex a -> 'Complex a
+mandel :: {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/concatmap01.out b/testdata/concatmap01.out
index 65af037c..f832724c 100644
--- a/testdata/concatmap01.out
+++ b/testdata/concatmap01.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/data.out b/testdata/data.out
index 1dddf3f4..1581a0c0 100644
--- a/testdata/data.out
+++ b/testdata/data.out
@@ -1,31 +1,31 @@
 main is not found
 ------------ trace
-'Data0 :: Type
-Data0 :: 'Data0
-'Data0Case :: (a : 'Data0->Type) -> a Data0 -> (b:'Data0) -> a b
-match'Data0 :: (a : Type->Type) -> a 'Data0 -> (b:Type) -> a b -> a b
-'Data1 :: Type -> Type -> Type->Type
-Data1 :: {a} -> {b} -> {c} -> a -> b -> c -> 'Data1 a b c
-'Data1Case :: {a} -> {b} -> {c} -> (d : 'Data1 a b c -> Type) -> ((e:a) -> (f:b) -> (g:c) -> d (Data1 e f g)) -> (h : 'Data1 a b c) -> d h
-match'Data1 :: (a : Type->Type) -> ((b:Type) -> (c:Type) -> (d:Type) -> a ('Data1 b c d)) -> (e:Type) -> a e -> a e
-'Data2 :: Type
-Data21 :: 'Int->'Data2
-Data22 :: 'Int -> 'Int->'Data2
-Data23 :: 'Int->'Data2
-Data24 :: 'Data2
-'Data2Case :: (a : 'Data2->Type) -> ((b:'Int) -> a (Data21 b)) -> ((c:'Int) -> (d:'Int) -> a (Data22 c d)) -> ((e:'Int) -> a (Data23 e)) -> a Data24 -> (f:'Data2) -> a f
-match'Data2 :: (a : Type->Type) -> a 'Data2 -> (b:Type) -> a b -> a b
-x :: 'Data2->'Int
-y :: 'Data2->'Int
-'Data5 :: Type -> Type -> Type->Type
-Data51 :: {a} -> {b} -> {c} -> a -> 'Data5 a b c
-Data52 :: {a} -> {b} -> {c} -> a -> b -> c -> 'Data5 a b c
-Data53 :: {a} -> {b} -> {c} -> 'Int -> a -> 'Float -> b -> c -> 'Data5 a b c
-'Data5Case :: {a} -> {b} -> {c} -> (d : 'Data5 a b c -> Type) -> ((e:a) -> d (Data51 e)) -> ((f:a) -> (g:b) -> (h:c) -> d (Data52 f g h)) -> ((i:'Int) -> (j:a) -> (k:'Float) -> (l:b) -> (m:c) -> d (Data53 i j k l m)) -> (n : 'Data5 a b c) -> d n
-match'Data5 :: (a : Type->Type) -> ((b:Type) -> (c:Type) -> (d:Type) -> a ('Data5 b c d)) -> (e:Type) -> a e -> a e
-a5 :: {a} -> {b} -> {c} -> 'Data5 a b c -> a
-b5 :: {a} -> {b} -> {c} -> 'Data5 a b c -> b
-c5 :: {a} -> {b} -> {c} -> 'Data5 a b c -> c
+'Data0 :: Type
+Data0 :: 'Data0
+'Data0Case :: (a : 'Data0->Type) -> a Data0 -> (b:'Data0) -> a b
+match'Data0 :: (a : Type->Type) -> a 'Data0 -> (b:Type) -> a b -> a b
+'Data1 :: Type -> Type -> Type->Type
+Data1 :: {a} -> {b} -> {c} -> a -> b -> c -> 'Data1 a b c
+'Data1Case :: {a} -> {b} -> {c} -> (d : 'Data1 a b c -> Type) -> ((e:a) -> (f:b) -> (g:c) -> d (Data1 e f g)) -> (h : 'Data1 a b c) -> d h
+match'Data1 :: (a : Type->Type) -> ((b:Type) -> (c:Type) -> (d:Type) -> a ('Data1 b c d)) -> (e:Type) -> a e -> a e
+'Data2 :: Type
+Data21 :: 'Int->'Data2
+Data22 :: 'Int -> 'Int->'Data2
+Data23 :: 'Int->'Data2
+Data24 :: 'Data2
+'Data2Case :: (a : 'Data2->Type) -> ((b:'Int) -> a (Data21 b)) -> ((c:'Int) -> (d:'Int) -> a (Data22 c d)) -> ((e:'Int) -> a (Data23 e)) -> a Data24 -> (f:'Data2) -> a f
+match'Data2 :: (a : Type->Type) -> a 'Data2 -> (b:Type) -> a b -> a b
+x :: 'Data2->'Int
+y :: 'Data2->'Int
+'Data5 :: Type -> Type -> Type->Type
+Data51 :: {a} -> {b} -> {c} -> a -> 'Data5 a b c
+Data52 :: {a} -> {b} -> {c} -> a -> b -> c -> 'Data5 a b c
+Data53 :: {a} -> {b} -> {c} -> 'Int -> a -> 'Float -> b -> c -> 'Data5 a b c
+'Data5Case :: {a} -> {b} -> {c} -> (d : 'Data5 a b c -> Type) -> ((e:a) -> d (Data51 e)) -> ((f:a) -> (g:b) -> (h:c) -> d (Data52 f g h)) -> ((i:'Int) -> (j:a) -> (k:'Float) -> (l:b) -> (m:c) -> d (Data53 i j k l m)) -> (n : 'Data5 a b c) -> d n
+match'Data5 :: (a : Type->Type) -> ((b:Type) -> (c:Type) -> (d:Type) -> a ('Data5 b c d)) -> (e:Type) -> a e -> a e
+a5 :: {a} -> {b} -> {c} -> 'Data5 a b c -> a
+b5 :: {a} -> {b} -> {c} -> 'Data5 a b c -> b
+c5 :: {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/data.reject.out b/testdata/data.reject.out
index 50aeb5df..81b44641 100644
--- a/testdata/data.reject.out
+++ b/testdata/data.reject.out
@@ -2,7 +2,7 @@ can't find: a in testdata/data.reject.lc:1:20:
 data Data1 = Data1 a b c
                    ^
 ------------ trace
-'Data1 :: Type
+'Data1 :: Type
 !can't find: a in testdata/data.reject.lc:1:20:
 data Data1 = Data1 a b c
                    ^
diff --git a/testdata/dotdot01.out b/testdata/dotdot01.out
index 65af037c..f832724c 100644
--- a/testdata/dotdot01.out
+++ b/testdata/dotdot01.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/dotdot02.out b/testdata/dotdot02.out
index 65af037c..f832724c 100644
--- a/testdata/dotdot02.out
+++ b/testdata/dotdot02.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/empty.out b/testdata/empty.out
index bcb2f224..6714e719 100644
--- a/testdata/empty.out
+++ b/testdata/empty.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-'Empty :: Type
-'EmptyCase :: (a : 'Empty->Type) -> (b:'Empty) -> a b
-match'Empty :: (a : Type->Type) -> a 'Empty -> (b:Type) -> a b -> a b
+'Empty :: Type
+'EmptyCase :: (a : 'Empty->Type) -> (b:'Empty) -> a b
+match'Empty :: (a : Type->Type) -> a 'Empty -> (b:Type) -> 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 e5a4ab73..2c4e68d1 100644
--- a/testdata/framebuffer02.reject.out
+++ b/testdata/framebuffer02.reject.out
@@ -1,7 +1,7 @@
 type error: can not unify
-0
+0
 with
-1
+1
 
 in testdata/framebuffer02.reject.lc:2:17:
     let frame = FrameBuffer (colorImage1 (V4 0.0 0.0 0.4 1.0)
@@ -11,9 +11,9 @@ in testdata/framebuffer02.reject.lc:2:17:
 
 ------------ trace
 !type error: can not unify
-0
+0
 with
-1
+1
 
 in testdata/framebuffer02.reject.lc:2:17:
     let frame = FrameBuffer (colorImage1 (V4 0.0 0.0 0.4 1.0)
diff --git a/testdata/fromto.out b/testdata/fromto.out
index 65af037c..f832724c 100644
--- a/testdata/fromto.out
+++ b/testdata/fromto.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/id.out b/testdata/id.out
index 046d96cd..08cb1501 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/ifThenElse01.out b/testdata/ifThenElse01.out
index 65af037c..f832724c 100644
--- a/testdata/ifThenElse01.out
+++ b/testdata/ifThenElse01.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/instantiate.out b/testdata/instantiate.out
index ac92ae29..b1df8984 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  {a} -> {_ : Num (MatVecScalarElem a)} -> a -> a->a
diff --git a/testdata/instantiate2.out b/testdata/instantiate2.out
index 1a2a8631..b4932da4 100644
--- a/testdata/instantiate2.out
+++ b/testdata/instantiate2.out
@@ -1 +1 @@
-(+ ('VecS 'Float 2) TT (V2 1.0 2.0) (V2 2.3 3.4), 3.0)
\ No newline at end of file
+(+ ('VecS 'Float 2) TT (V2 1.0 2.0) (V2 2.3 3.4), 3.0)
\ No newline at end of file
diff --git a/testdata/it.out b/testdata/it.out
index 65af037c..f832724c 100644
--- a/testdata/it.out
+++ b/testdata/it.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/language-features/adt/adt01.out b/testdata/language-features/adt/adt01.out
index 65af037c..f832724c 100644
--- a/testdata/language-features/adt/adt01.out
+++ b/testdata/language-features/adt/adt01.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/language-features/adt/adt02.out b/testdata/language-features/adt/adt02.out
index 65af037c..f832724c 100644
--- a/testdata/language-features/adt/adt02.out
+++ b/testdata/language-features/adt/adt02.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/language-features/adt/adt02.reject.out b/testdata/language-features/adt/adt02.reject.out
index 48ca3cb9..ab363b68 100644
--- a/testdata/language-features/adt/adt02.reject.out
+++ b/testdata/language-features/adt/adt02.reject.out
@@ -1,20 +1,20 @@
 type error: can not unify
-'Bool
+'Bool
 with
-'Int
+'Int
 
 in proj
 
 ------------ trace
-'Data3 :: Type
-Data3 :: 'Bool -> 'Char -> 'Bool->'Data3
-Data31 :: 'Int -> 'String -> 'Int->'Data3
-'Data3Case :: (a : 'Data3->Type) -> ((b:'Bool) -> (c:'Char) -> (d:'Bool) -> a (Data3 b c d)) -> ((e:'Int) -> (f:'String) -> (g:'Int) -> a (Data31 e f g)) -> (h:'Data3) -> a h
-match'Data3 :: (a : Type->Type) -> a 'Data3 -> (b:Type) -> a b -> a b
+'Data3 :: Type
+Data3 :: 'Bool -> 'Char -> 'Bool->'Data3
+Data31 :: 'Int -> 'String -> 'Int->'Data3
+'Data3Case :: (a : 'Data3->Type) -> ((b:'Bool) -> (c:'Char) -> (d:'Bool) -> a (Data3 b c d)) -> ((e:'Int) -> (f:'String) -> (g:'Int) -> a (Data31 e f g)) -> (h:'Data3) -> a h
+match'Data3 :: (a : Type->Type) -> a 'Data3 -> (b:Type) -> a b -> a b
 !type error: can not unify
-'Bool
+'Bool
 with
-'Int
+'Int
 
 in proj
 
diff --git a/testdata/language-features/adt/adt03.reject.out b/testdata/language-features/adt/adt03.reject.out
index 0091dc83..70c0c4e7 100644
--- a/testdata/language-features/adt/adt03.reject.out
+++ b/testdata/language-features/adt/adt03.reject.out
@@ -2,7 +2,7 @@ can't find: a in testdata/language-features/adt/adt03.reject.lc:2:20:
 data Data3 = Data3 a b c
                    ^
 ------------ trace
-'Data3 :: Type
+'Data3 :: Type
 !can't find: a in testdata/language-features/adt/adt03.reject.lc:2:20:
 data Data3 = Data3 a b c
                    ^
diff --git a/testdata/language-features/adt/adt04.reject.out b/testdata/language-features/adt/adt04.reject.out
index bae22981..85b91c2c 100644
--- a/testdata/language-features/adt/adt04.reject.out
+++ b/testdata/language-features/adt/adt04.reject.out
@@ -2,7 +2,7 @@ can't find: a in testdata/language-features/adt/adt04.reject.lc:2:27:
 data Data3 = Data3 { x :: a , y :: b , z :: c }
                           ^
 ------------ trace
-'Data3 :: Type
+'Data3 :: Type
 !can't find: a in testdata/language-features/adt/adt04.reject.lc:2:27:
 data Data3 = Data3 { x :: a , y :: b , z :: c }
                           ^
diff --git a/testdata/language-features/adt/adt05.out b/testdata/language-features/adt/adt05.out
index 97b40b5c..bedb86f2 100644
--- a/testdata/language-features/adt/adt05.out
+++ b/testdata/language-features/adt/adt05.out
@@ -1 +1 @@
-main
\ No newline at end of file
+main
\ No newline at end of file
diff --git a/testdata/language-features/adt/gadt01.out b/testdata/language-features/adt/gadt01.out
index 65af037c..f832724c 100644
--- a/testdata/language-features/adt/gadt01.out
+++ b/testdata/language-features/adt/gadt01.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/language-features/adt/gadt01.reject.out b/testdata/language-features/adt/gadt01.reject.out
index a993010b..39a78fe6 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 cb6cd714..da32d15b 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 :: {a} -> a -> {b:'String} -> 'M2 a b
-'M2Case :: {a} -> (b : (c:'String) -> 'M2 a c -> Type) -> ((d:a) -> {e:'String} -> b e (Value2 d e)) -> {f:'String} -> (g : 'M2 a f) -> b f g
-match'M2 :: (a : Type->Type) -> ((b:Type) -> (c:'String) -> a ('M2 b c)) -> (d:Type) -> a d -> a d
-'M3 :: Type -> 'String->Type
+'M2 :: Type -> 'String->Type
+Value2 :: {a} -> a -> {b:'String} -> 'M2 a b
+'M2Case :: {a} -> (b : (c:'String) -> 'M2 a c -> Type) -> ((d:a) -> {e:'String} -> b e (Value2 d e)) -> {f:'String} -> (g : 'M2 a f) -> b f g
+match'M2 :: (a : Type->Type) -> ((b:Type) -> (c:'String) -> a ('M2 b c)) -> (d:Type) -> 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 1871c4aa..a1aa694f 100644
--- a/testdata/language-features/adt/gadt04.reject.out
+++ b/testdata/language-features/adt/gadt04.reject.out
@@ -5,12 +5,12 @@ already defined Value at testdata/language-features/adt/gadt04.reject.lc:6:3:
   Value :: a -> forall m . M a m
   ^^^^^
 ------------ trace
-'M :: Type -> 'String->Type
-Value :: {a} -> a -> {b:'String} -> 'M a b
-'MCase :: (a : (b:Type) -> (c:'String) -> 'M b c -> Type) -> ({d} -> (e:d) -> {f:'String} -> a d f (Value d e f)) -> {g} -> {h:'String} -> (i : 'M g h) -> a g h i
-match'M :: (a : Type->Type) -> ((b:Type) -> (c:'String) -> a ('M b c)) -> (d:Type) -> a d -> a d
-'M2 :: Type -> 'String->Type
-Value :: {a} -> a -> {b:'String} -> 'M2 a b
+'M :: Type -> 'String->Type
+Value :: {a} -> a -> {b:'String} -> 'M a b
+'MCase :: (a : (b:Type) -> (c:'String) -> 'M b c -> Type) -> ({d} -> (e:d) -> {f:'String} -> a d f (Value d e f)) -> {g} -> {h:'String} -> (i : 'M g h) -> a g h i
+match'M :: (a : Type->Type) -> ((b:Type) -> (c:'String) -> a ('M b c)) -> (d:Type) -> a d -> a d
+'M2 :: Type -> 'String->Type
+Value :: {a} -> a -> {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/as-pattern/as-pattern01.out b/testdata/language-features/as-pattern/as-pattern01.out
index 97b40b5c..bedb86f2 100644
--- a/testdata/language-features/as-pattern/as-pattern01.out
+++ b/testdata/language-features/as-pattern/as-pattern01.out
@@ -1 +1 @@
-main
\ No newline at end of file
+main
\ No newline at end of file
diff --git a/testdata/language-features/as-pattern/as-pattern02.out b/testdata/language-features/as-pattern/as-pattern02.out
index 97b40b5c..bedb86f2 100644
--- a/testdata/language-features/as-pattern/as-pattern02.out
+++ b/testdata/language-features/as-pattern/as-pattern02.out
@@ -1 +1 @@
-main
\ No newline at end of file
+main
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/dotdot01.out b/testdata/language-features/basic-list/dotdot01.out
index 97b40b5c..bedb86f2 100644
--- a/testdata/language-features/basic-list/dotdot01.out
+++ b/testdata/language-features/basic-list/dotdot01.out
@@ -1 +1 @@
-main
\ No newline at end of file
+main
\ No newline at end of file
diff --git a/testdata/language-features/basic-list/list01.out b/testdata/language-features/basic-list/list01.out
index 18efaa40..d4d2b08d 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 :: {a} -> 'List a
-value2 :: {a} -> {_ : 'Num a} -> 'List a
-value3 :: 'List 'Char
+value1 :: {a} -> 'List a
+value2 :: {a} -> {_ : 'Num a} -> 'List a
+value3 :: 'List 'Char
 ------------ tooltips
 testdata/language-features/basic-list/list01.lc 1:1-1:7  {a} -> List a
 testdata/language-features/basic-list/list01.lc 1:10-1:12  {a} -> List a
diff --git a/testdata/language-features/basic-list/list02.out b/testdata/language-features/basic-list/list02.out
index 02f69ace..7863cd3b 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 :: {a} -> 'List a
-value2 :: {a} -> {_ : 'Num a} -> 'List a
-value3 :: 'List 'Char
+value1 :: {a} -> 'List a
+value2 :: {a} -> {_ : 'Num a} -> 'List a
+value3 :: 'List 'Char
 ------------ tooltips
 testdata/language-features/basic-list/list02.lc 1:1-1:7  {a} -> List a
 testdata/language-features/basic-list/list02.lc 1:10-2:4  {a} -> List a
diff --git a/testdata/language-features/basic-list/list07.reject.out b/testdata/language-features/basic-list/list07.reject.out
index 48444536..49e58ae2 100644
--- a/testdata/language-features/basic-list/list07.reject.out
+++ b/testdata/language-features/basic-list/list07.reject.out
@@ -1,15 +1,15 @@
 type error: can not unify
-'Float
+'Float
 with
-'Char
+'Char
 
 in builtin Nil
 
 ------------ trace
 !type error: can not unify
-'Float
+'Float
 with
-'Char
+'Char
 
 in builtin Nil
 
diff --git a/testdata/language-features/basic-list/list08.out b/testdata/language-features/basic-list/list08.out
index 70d5ec40..5817af05 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 a9a3eefa..838f14f3 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/list10.reject.out b/testdata/language-features/basic-list/list10.reject.out
index 01484c77..1a8c354f 100644
--- a/testdata/language-features/basic-list/list10.reject.out
+++ b/testdata/language-features/basic-list/list10.reject.out
@@ -1,15 +1,15 @@
 type error: can not unify
-'Int
+'Int
 with
-'Float
+'Float
 
 in builtin Nil
 
 ------------ trace
 !type error: can not unify
-'Int
+'Int
 with
-'Float
+'Float
 
 in builtin Nil
 
diff --git a/testdata/language-features/basic-list/list11.out b/testdata/language-features/basic-list/list11.out
index 659a85eb..db160d1b 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 :: {a} -> {_ : 'Num a} -> 'List a
+value :: {a} -> {_ : 'Num a} -> 'List a
 ------------ tooltips
 testdata/language-features/basic-list/list11.lc 1:1-1:6  {a} -> {_ : Num a} -> List a
 testdata/language-features/basic-list/list11.lc 1:9-1:10  b_
diff --git a/testdata/language-features/basic-list/list12.out b/testdata/language-features/basic-list/list12.out
index 83ceff3c..eebc55d2 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 :: {a} -> {_ : 'Num a} -> 'List a
+value :: {a} -> {_ : 'Num a} -> 'List a
 ------------ tooltips
 testdata/language-features/basic-list/list12.lc 1:1-1:6  {a} -> {_ : Num a} -> List a
 testdata/language-features/basic-list/list12.lc 1:9-1:10  b_
diff --git a/testdata/language-features/basic-list/list13.out b/testdata/language-features/basic-list/list13.out
index b3a4a01b..048307dc 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/list14.reject.out b/testdata/language-features/basic-list/list14.reject.out
index 2d6d00ea..64380216 100644
--- a/testdata/language-features/basic-list/list14.reject.out
+++ b/testdata/language-features/basic-list/list14.reject.out
@@ -1,7 +1,7 @@
 type error: can not unify
-'List 'Char
+'List 'Char
 with
-()
+()
 
 in testdata/language-features/basic-list/list14.reject.lc:1:17:
 value = 'h':'i':()
@@ -9,9 +9,9 @@ value = 'h':'i':()
 
 ------------ trace
 !type error: can not unify
-'List 'Char
+'List 'Char
 with
-()
+()
 
 in testdata/language-features/basic-list/list14.reject.lc:1:17:
 value = 'h':'i':()
diff --git a/testdata/language-features/basic-list/list15.reject.out b/testdata/language-features/basic-list/list15.reject.out
index 50962086..a4ebc72a 100644
--- a/testdata/language-features/basic-list/list15.reject.out
+++ b/testdata/language-features/basic-list/list15.reject.out
@@ -1,7 +1,7 @@
 type error: can not unify
-'Char
+'Char
 with
-()
+()
 
 in testdata/language-features/basic-list/list15.reject.lc:1:20:
 value = 'h':'i':():[]
@@ -9,9 +9,9 @@ value = 'h':'i':():[]
 
 ------------ trace
 !type error: can not unify
-'Char
+'Char
 with
-()
+()
 
 in testdata/language-features/basic-list/list15.reject.lc:1:20:
 value = 'h':'i':():[]
diff --git a/testdata/language-features/basic-list/list16.reject.out b/testdata/language-features/basic-list/list16.reject.out
index a409c05b..470302ef 100644
--- a/testdata/language-features/basic-list/list16.reject.out
+++ b/testdata/language-features/basic-list/list16.reject.out
@@ -1,7 +1,7 @@
 type error: can not unify
-'List 'Char
+'List 'Char
 with
-'Char
+'Char
 
 in testdata/language-features/basic-list/list16.reject.lc:1:13:
 value = 'h':'i'
@@ -9,9 +9,9 @@ value = 'h':'i'
 
 ------------ trace
 !type error: can not unify
-'List 'Char
+'List 'Char
 with
-'Char
+'Char
 
 in testdata/language-features/basic-list/list16.reject.lc:1:13:
 value = 'h':'i'
diff --git a/testdata/language-features/basic-list/listcomp01.out b/testdata/language-features/basic-list/listcomp01.out
index d361c85d..8b857f79 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 29c0d611..464eb751 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 44f90d26..1873533b 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 a013a9e7..7fe1306f 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 8b16597b..ff871c08 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 fef46590..65679284 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 dad2ff25..6238e239 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/listcomp08.reject.out b/testdata/language-features/basic-list/listcomp08.reject.out
index f5f8f488..8bf99ab5 100644
--- a/testdata/language-features/basic-list/listcomp08.reject.out
+++ b/testdata/language-features/basic-list/listcomp08.reject.out
@@ -1,7 +1,7 @@
 type error: can not unify
-'Bool
+'Bool
 with
-'String
+'String
 
 in testdata/language-features/basic-list/listcomp08.reject.lc:1:23:
 value = [x | x <- [], "not Bool"]
@@ -9,9 +9,9 @@ value = [x | x <- [], "not Bool"]
 
 ------------ trace
 !type error: can not unify
-'Bool
+'Bool
 with
-'String
+'String
 
 in testdata/language-features/basic-list/listcomp08.reject.lc:1:23:
 value = [x | x <- [], "not Bool"]
diff --git a/testdata/language-features/basic-list/listcomp09.out b/testdata/language-features/basic-list/listcomp09.out
index 694e13a4..55d987eb 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 :: {_} -> 'List (()->'String)
+value1 :: {_} -> 'List (()->'String)
 ------------ tooltips
 testdata/language-features/basic-list/listcomp09.lc 1:1-1:7  {_} -> List (()->String)
 testdata/language-features/basic-list/listcomp09.lc 1:10-1:36  List (()->String)
diff --git a/testdata/language-features/basic-values/bool01.out b/testdata/language-features/basic-values/bool01.out
index 5e43b4e6..a78cfe8f 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/case01.out b/testdata/language-features/basic-values/case01.out
index 828801f4..1cbce892 100644
--- a/testdata/language-features/basic-values/case01.out
+++ b/testdata/language-features/basic-values/case01.out
@@ -1,11 +1,11 @@
 main is not found
 ------------ trace
-value1 :: ()
-value2 :: ()
-value3 :: ()
-value4 :: ()
-value5 :: ()
-value6 :: ()
+value1 :: ()
+value2 :: ()
+value3 :: ()
+value4 :: ()
+value5 :: ()
+value6 :: ()
 ------------ tooltips
 testdata/language-features/basic-values/case01.lc 1:1-1:7  ()
 testdata/language-features/basic-values/case01.lc 1:10-1:29  ()
diff --git a/testdata/language-features/basic-values/case02.out b/testdata/language-features/basic-values/case02.out
index b6d80b67..5c602ef2 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 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a}->()
-value2 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a} -> {_ : 'Eq a} -> {_ : 'Num a}->'String
+value1 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a}->()
+value2 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a} -> {_ : 'Eq a} -> {_ : 'Num a}->'String
 ------------ tooltips
 testdata/language-features/basic-values/case02.lc 1:1-1:7  {a} -> {_ : Eq a} -> {_ : Num a}->()
 testdata/language-features/basic-values/case02.lc 1:10-3:10  ()
diff --git a/testdata/language-features/basic-values/case04.reject.out b/testdata/language-features/basic-values/case04.reject.out
index 426c62f7..7bb41248 100644
--- a/testdata/language-features/basic-values/case04.reject.out
+++ b/testdata/language-features/basic-values/case04.reject.out
@@ -1,7 +1,7 @@
 type error: can not unify
-()
+()
 with
-'Char
+'Char
 
 in testdata/language-features/basic-values/case04.reject.lc:2:8:
   1 -> '1'
@@ -9,9 +9,9 @@ in testdata/language-features/basic-values/case04.reject.lc:2:8:
 
 ------------ trace
 !type error: can not unify
-()
+()
 with
-'Char
+'Char
 
 in testdata/language-features/basic-values/case04.reject.lc:2:8:
   1 -> '1'
diff --git a/testdata/language-features/basic-values/case05.out b/testdata/language-features/basic-values/case05.out
index 40113fde..85e6bced 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 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a->'Char
+value :: {a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a->'Char
 ------------ tooltips
 testdata/language-features/basic-values/case05.lc 1:1-1:6  {a} -> {_ : Eq a} -> {_ : Num a} -> a->Char
 testdata/language-features/basic-values/case05.lc 1:11-2:11  Char
diff --git a/testdata/language-features/basic-values/case06.out b/testdata/language-features/basic-values/case06.out
index a4959bfe..2867cc57 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 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a->'Char
+value :: {a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a->'Char
 ------------ tooltips
 testdata/language-features/basic-values/case06.lc 1:1-1:6  {a} -> {_ : Eq a} -> {_ : Num a} -> a->Char
 testdata/language-features/basic-values/case06.lc 1:11-3:11  Char
diff --git a/testdata/language-features/basic-values/data01.out b/testdata/language-features/basic-values/data01.out
index 55a3f99f..a44de4d8 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 :: (a : 'A->Type) -> a B -> a C -> a D -> (b:'A) -> a b
-match'A :: (a : Type->Type) -> a 'A -> (b:Type) -> a b -> a b
-'E :: Type
-F :: 'E
-G :: ()->'E
-H :: 'E
-'ECase :: (a : 'E->Type) -> a F -> ((b:()) -> a (G b)) -> a H -> (c:'E) -> a c
-match'E :: (a : Type->Type) -> a 'E -> (b:Type) -> a b -> a b
-'D1 :: Type
-C1 :: 'D1
-C2 :: ()->'D1
-C3 :: 'D1
-'D1Case :: (a : 'D1->Type) -> a C1 -> ((b:()) -> a (C2 b)) -> a C3 -> (c:'D1) -> a c
-match'D1 :: (a : Type->Type) -> a 'D1 -> (b:Type) -> a b -> a b
+'A :: Type
+B :: 'A
+C :: 'A
+D :: 'A
+'ACase :: (a : 'A->Type) -> a B -> a C -> a D -> (b:'A) -> a b
+match'A :: (a : Type->Type) -> a 'A -> (b:Type) -> a b -> a b
+'E :: Type
+F :: 'E
+G :: ()->'E
+H :: 'E
+'ECase :: (a : 'E->Type) -> a F -> ((b:()) -> a (G b)) -> a H -> (c:'E) -> a c
+match'E :: (a : Type->Type) -> a 'E -> (b:Type) -> a b -> a b
+'D1 :: Type
+C1 :: 'D1
+C2 :: ()->'D1
+C3 :: 'D1
+'D1Case :: (a : 'D1->Type) -> a C1 -> ((b:()) -> a (C2 b)) -> a C3 -> (c:'D1) -> a c
+match'D1 :: (a : Type->Type) -> a 'D1 -> (b:Type) -> a b -> a b
 ------------ 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 1bec17b3..4fa69d6c 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 :: {a} -> {b} -> {_ : 'Num b} -> a->b
-fun2 :: {a} -> {b} -> {c} -> {d} -> {e} -> a -> b -> c -> d -> e->'Char
+unit :: ()
+fun1 :: {a} -> {b} -> {_ : 'Num b} -> a->b
+fun2 :: {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 6a383d9c..ba33b297 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 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a->'Char
+fun :: {a} -> {_ : 'Eq a} -> {_ : 'Num a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a->'Char
 ------------ tooltips
 testdata/language-features/basic-values/def03.lc 1:1-1:4  {a} -> {_ : Eq a} -> {_ : Num a} -> {_ : Eq a} -> {_ : Num a} -> a->Char
 testdata/language-features/basic-values/def03.lc 1:9-1:12  Char
diff --git a/testdata/language-features/basic-values/def04.out b/testdata/language-features/basic-values/def04.out
index b2977f8e..9b3e36f2 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 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a->'Char
-fun2 :: {a} -> {b} -> {_ : 'Eq a} -> {_ : 'Num a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a -> b->'Char
+fun :: {a} -> {_ : 'Eq a} -> {_ : 'Num a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a->'Char
+fun2 :: {a} -> {b} -> {_ : 'Eq a} -> {_ : 'Num a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a -> b->'Char
 ------------ tooltips
 testdata/language-features/basic-values/def04.lc 1:1-1:4  {a} -> {_ : Eq a} -> {_ : Num a} -> {_ : Eq a} -> {_ : Num a} -> a->Char
 testdata/language-features/basic-values/def04.lc 1: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 ecd42e2a..0ce641f7 100644
--- a/testdata/language-features/basic-values/def07.reject.out
+++ b/testdata/language-features/basic-values/def07.reject.out
@@ -5,9 +5,9 @@ fun _ = '_'
 fun 1 = '1'
 ^^^
 ------------ trace
-fun :: {a} -> {_ : 'Eq a} -> {_ : 'Num a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a->'Char
-fun2 :: {a} -> {b} -> {_ : 'Eq a} -> {_ : 'Num a} -> a -> b->'Char
-fun :: {a} -> a->'Char
+fun :: {a} -> {_ : 'Eq a} -> {_ : 'Num a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a->'Char
+fun2 :: {a} -> {b} -> {_ : 'Eq a} -> {_ : 'Num a} -> a -> b->'Char
+fun :: {a} -> a->'Char
 !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 f0e01c94..5dd94137 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 0466faf4..473b93ff 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 dc85017c..f7c5fa08 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 b65d9892..430a18c3 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 66e45676..59230da2 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 706bb6a6..55bffe51 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/fixity01.out b/testdata/language-features/basic-values/fixity01.out
index 56d4a7db..4d3a5cf9 100644
--- a/testdata/language-features/basic-values/fixity01.out
+++ b/testdata/language-features/basic-values/fixity01.out
@@ -1,9 +1,9 @@
 main is not found
 ------------ trace
-funL :: {a} -> {b} -> a -> b->a
-funR :: {a} -> {b} -> a -> b->a
-<<<< :: {a} -> {b} -> a -> b->a
->>>> :: {a} -> {b} -> a -> b->b
+funL :: {a} -> {b} -> a -> b->a
+funR :: {a} -> {b} -> a -> b->a
+<<<< :: {a} -> {b} -> a -> b->a
+>>>> :: {a} -> {b} -> a -> b->b
 ------------ tooltips
 testdata/language-features/basic-values/fixity01.lc 1:1-1:5  {a} -> {b} -> a -> b->a
 testdata/language-features/basic-values/fixity01.lc 1:12-1:13  d_
diff --git a/testdata/language-features/basic-values/fixity02.out b/testdata/language-features/basic-values/fixity02.out
index 0b15ed06..6683f3d9 100644
--- a/testdata/language-features/basic-values/fixity02.out
+++ b/testdata/language-features/basic-values/fixity02.out
@@ -1,25 +1,25 @@
 main is not found
 ------------ trace
-funL :: {a} -> {b} -> a -> b->a
-funR :: {a} -> {b} -> a -> b->b
-<@ :: {a} -> {b} -> a -> b->a
-@> :: {a} -> {b} -> a -> b->b
-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
-funValue8 :: ()
+funL :: {a} -> {b} -> a -> b->a
+funR :: {a} -> {b} -> a -> b->b
+<@ :: {a} -> {b} -> a -> b->a
+@> :: {a} -> {b} -> a -> b->b
+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
+funValue8 :: ()
 ------------ tooltips
 testdata/language-features/basic-values/fixity02.lc 1:1-1:5  {a} -> {b} -> a -> b->a
 testdata/language-features/basic-values/fixity02.lc 1:12-1:13  d_
diff --git a/testdata/language-features/basic-values/if01.out b/testdata/language-features/basic-values/if01.out
index c04dd993..d9211a28 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
+value1 :: ()
+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/if03.reject.out b/testdata/language-features/basic-values/if03.reject.out
index aeb988f9..83ed5e90 100644
--- a/testdata/language-features/basic-values/if03.reject.out
+++ b/testdata/language-features/basic-values/if03.reject.out
@@ -1,7 +1,7 @@
 type error: can not unify
-'Bool
+'Bool
 with
-()
+()
 
 in testdata/language-features/basic-values/if03.reject.lc:1:13:
 value1 = if () then () else ()
@@ -9,9 +9,9 @@ value1 = if () then () else ()
 
 ------------ trace
 !type error: can not unify
-'Bool
+'Bool
 with
-()
+()
 
 in testdata/language-features/basic-values/if03.reject.lc:1:13:
 value1 = if () then () else ()
diff --git a/testdata/language-features/basic-values/if04.reject.out b/testdata/language-features/basic-values/if04.reject.out
index d882b6a8..eed0fc59 100644
--- a/testdata/language-features/basic-values/if04.reject.out
+++ b/testdata/language-features/basic-values/if04.reject.out
@@ -1,7 +1,7 @@
 type error: can not unify
-()
+()
 with
-'Char
+'Char
 
 in testdata/language-features/basic-values/if04.reject.lc:1:31:
 value1 = if True then () else '_'
@@ -9,9 +9,9 @@ value1 = if True then () else '_'
 
 ------------ trace
 !type error: can not unify
-()
+()
 with
-'Char
+'Char
 
 in testdata/language-features/basic-values/if04.reject.lc:1:31:
 value1 = if True then () else '_'
diff --git a/testdata/language-features/basic-values/indentation01.out b/testdata/language-features/basic-values/indentation01.out
index 0139b3c5..3893683c 100644
--- a/testdata/language-features/basic-values/indentation01.out
+++ b/testdata/language-features/basic-values/indentation01.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-tuple1 :: ()
-tuple2 :: ()
+tuple1 :: ()
+tuple2 :: ()
 ------------ tooltips
 testdata/language-features/basic-values/indentation01.lc 1:1-1:7  ()
 testdata/language-features/basic-values/indentation01.lc 1:10-1:12  ()
diff --git a/testdata/language-features/basic-values/indentation02.out b/testdata/language-features/basic-values/indentation02.out
index 64809a57..c6fd7aad 100644
--- a/testdata/language-features/basic-values/indentation02.out
+++ b/testdata/language-features/basic-values/indentation02.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-tuple1 :: ()
-tuple2 :: ()
+tuple1 :: ()
+tuple2 :: ()
 ------------ tooltips
 testdata/language-features/basic-values/indentation02.lc 1:3-1:9  ()
 testdata/language-features/basic-values/indentation02.lc 1:12-1:14  ()
diff --git a/testdata/language-features/basic-values/infix01.out b/testdata/language-features/basic-values/infix01.out
index 46bcea65..d4e62854 100644
--- a/testdata/language-features/basic-values/infix01.out
+++ b/testdata/language-features/basic-values/infix01.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-fun :: {a} -> {b} -> a -> b->()
-value :: {a} -> {b} -> a -> b->()
+fun :: {a} -> {b} -> a -> b->()
+value :: {a} -> {b} -> a -> b->()
 ------------ tooltips
 testdata/language-features/basic-values/infix01.lc 1:1-1:4  {a} -> {b} -> a -> b->()
 testdata/language-features/basic-values/infix01.lc 1:11-1:13  ()
diff --git a/testdata/language-features/basic-values/infix02.out b/testdata/language-features/basic-values/infix02.out
index ced1c18a..16d50a6f 100644
--- a/testdata/language-features/basic-values/infix02.out
+++ b/testdata/language-features/basic-values/infix02.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-fun :: {a} -> {b} -> {c} -> a -> b -> c->()
-value :: {a} -> {b} -> {c} -> a -> b -> c->()
+fun :: {a} -> {b} -> {c} -> a -> b -> c->()
+value :: {a} -> {b} -> {c} -> a -> b -> c->()
 ------------ tooltips
 testdata/language-features/basic-values/infix02.lc 1:1-1:4  {a} -> {b} -> {c} -> a -> b -> c->()
 testdata/language-features/basic-values/infix02.lc 1:13-1:15  ()
diff --git a/testdata/language-features/basic-values/infix03.out b/testdata/language-features/basic-values/infix03.out
index 31c99f85..dcdc1bb6 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 :: (a : 'D->Type) -> ((b:()) -> (c:()) -> a (D2 b c)) -> ((d:()) -> (e:()) -> (f:()) -> a (D3 d e f)) -> (g:'D) -> a g
-match'D :: (a : Type->Type) -> a 'D -> (b:Type) -> a b -> a b
-d2 :: () -> ()->'D
-d3 :: () -> () -> ()->'D
+'D :: Type
+D2 :: () -> ()->'D
+D3 :: () -> () -> ()->'D
+'DCase :: (a : 'D->Type) -> ((b:()) -> (c:()) -> a (D2 b c)) -> ((d:()) -> (e:()) -> (f:()) -> a (D3 d e f)) -> (g:'D) -> a g
+match'D :: (a : Type->Type) -> a 'D -> (b:Type) -> a b -> a b
+d2 :: () -> ()->'D
+d3 :: () -> () -> ()->'D
 ------------ 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/lambda01.out b/testdata/language-features/basic-values/lambda01.out
index 5acf2c1d..14711679 100644
--- a/testdata/language-features/basic-values/lambda01.out
+++ b/testdata/language-features/basic-values/lambda01.out
@@ -1,9 +1,9 @@
 main is not found
 ------------ trace
-fun1 :: {a} -> a->()
-fun2 :: {a} -> a->()
-fun3 :: {a} -> a->()
-fun4 :: {a} -> {b} -> {c} -> {d} -> {e} -> {f} -> {g} -> {h} -> {i} -> a -> b -> c -> d -> e -> f -> g -> h -> i->()
+fun1 :: {a} -> a->()
+fun2 :: {a} -> a->()
+fun3 :: {a} -> a->()
+fun4 :: {a} -> {b} -> {c} -> {d} -> {e} -> {f} -> {g} -> {h} -> {i} -> a -> b -> c -> d -> e -> f -> g -> h -> i->()
 ------------ tooltips
 testdata/language-features/basic-values/lambda01.lc 1:1-1:5  {a} -> a->()
 testdata/language-features/basic-values/lambda01.lc 1:14-1:16  ()
diff --git a/testdata/language-features/basic-values/lambda03.out b/testdata/language-features/basic-values/lambda03.out
index deb16da9..7d9a98ae 100644
--- a/testdata/language-features/basic-values/lambda03.out
+++ b/testdata/language-features/basic-values/lambda03.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-fun1 :: {a} -> {b} -> {c} -> a -> b -> c->b
-fun2 :: {a} -> {b} -> {c} -> {d} -> a -> b -> c -> d->a
+fun1 :: {a} -> {b} -> {c} -> a -> b -> c->b
+fun2 :: {a} -> {b} -> {c} -> {d} -> a -> b -> c -> d->a
 ------------ tooltips
 testdata/language-features/basic-values/lambda03.lc 1:1-1:5  {a} -> {b} -> {c} -> a -> b -> c->b
 testdata/language-features/basic-values/lambda03.lc 1:22-1:23  d_
diff --git a/testdata/language-features/basic-values/let01.out b/testdata/language-features/basic-values/let01.out
index da61b7a6..4c4793b6 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 :: {a} -> {_ : 'Num a}->a
-value2 :: {a} -> {_ : 'Num a}->a
-value3 :: {a} -> {_ : 'Num a}->a
-value4 :: {a} -> {_ : 'Num a}->a
-value5 :: {a} -> {_ : 'Num a}->a
+value1 :: {a} -> {_ : 'Num a}->a
+value2 :: {a} -> {_ : 'Num a}->a
+value3 :: {a} -> {_ : 'Num a}->a
+value4 :: {a} -> {_ : 'Num a}->a
+value5 :: {a} -> {_ : 'Num a}->a
 ------------ tooltips
 testdata/language-features/basic-values/let01.lc 1:1-1:7  {a} -> {_ : Num a}->a
 testdata/language-features/basic-values/let01.lc 1:18-1:19  b_
diff --git a/testdata/language-features/basic-values/let02.out b/testdata/language-features/basic-values/let02.out
index 164dd687..95f6541e 100644
--- a/testdata/language-features/basic-values/let02.out
+++ b/testdata/language-features/basic-values/let02.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: ()
+value :: ()
 ------------ tooltips
 testdata/language-features/basic-values/let02.lc 1:1-1:6  ()
 testdata/language-features/basic-values/let02.lc 2:11-2:13  ()
diff --git a/testdata/language-features/basic-values/literal01.out b/testdata/language-features/basic-values/literal01.out
index 65202fb6..dd36d512 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 :: {a} -> {_ : 'Num a}->a
-intValue2 :: {a} -> {_ : 'Num a}->a
-intValue3 :: {a} -> {_ : 'Num a}->a
-floatValue1 :: 'Float
-floatValue2 :: 'Float
-charValue :: 'Char
-stringValue1 :: 'String
-stringValue2 :: 'String
+intValue1 :: {a} -> {_ : 'Num a}->a
+intValue2 :: {a} -> {_ : 'Num a}->a
+intValue3 :: {a} -> {_ : 'Num a}->a
+floatValue1 :: 'Float
+floatValue2 :: 'Float
+charValue :: 'Char
+stringValue1 :: 'String
+stringValue2 :: 'String
 ------------ tooltips
 testdata/language-features/basic-values/literal01.lc 1:1-1:10  {a} -> {_ : Num a}->a
 testdata/language-features/basic-values/literal01.lc 1:13-1:14  b_
diff --git a/testdata/language-features/basic-values/operator01.out b/testdata/language-features/basic-values/operator01.out
index b17e33e0..78e55853 100644
--- a/testdata/language-features/basic-values/operator01.out
+++ b/testdata/language-features/basic-values/operator01.out
@@ -1,9 +1,9 @@
 main is not found
 ------------ trace
-#$# :: {a} -> {b} -> a -> b->()
-$$# :: {a} -> {b} -> a -> b->()
-$$$# :: {a} -> {b} -> a -> b->()
-$$$ :: {a} -> {b} -> a -> b->()
+#$# :: {a} -> {b} -> a -> b->()
+$$# :: {a} -> {b} -> a -> b->()
+$$$# :: {a} -> {b} -> a -> b->()
+$$$ :: {a} -> {b} -> a -> b->()
 ------------ tooltips
 testdata/language-features/basic-values/operator01.lc 1:3-1:6  {a} -> {b} -> a -> b->()
 testdata/language-features/basic-values/operator01.lc 1:11-1:13  ()
diff --git a/testdata/language-features/basic-values/operator02.reject.out b/testdata/language-features/basic-values/operator02.reject.out
index 31d8ce8c..8e5ed72c 100644
--- a/testdata/language-features/basic-values/operator02.reject.out
+++ b/testdata/language-features/basic-values/operator02.reject.out
@@ -5,9 +5,9 @@ a #$# b = ()
 a #$# b = ()
   ^^^
 ------------ trace
-#$# :: {a} -> {b} -> a -> b->()
-fun :: {a} -> a->()
-#$# :: {a} -> {b} -> a -> b->()
+#$# :: {a} -> {b} -> a -> b->()
+fun :: {a} -> a->()
+#$# :: {a} -> {b} -> a -> b->()
 !already defined #$# at testdata/language-features/basic-values/operator02.reject.lc:3:3:
 a #$# b = ()
   ^^^
diff --git a/testdata/language-features/basic-values/operator05.out b/testdata/language-features/basic-values/operator05.out
index 30bd0d85..16c940fc 100644
--- a/testdata/language-features/basic-values/operator05.out
+++ b/testdata/language-features/basic-values/operator05.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value1 :: ()
+value1 :: ()
 ------------ tooltips
 testdata/language-features/basic-values/operator05.lc 1:1-1:7  ()
 testdata/language-features/basic-values/operator05.lc 1:24-1:26  ()
diff --git a/testdata/language-features/basic-values/operator06.out b/testdata/language-features/basic-values/operator06.out
index 3aaac182..c37005c3 100644
--- a/testdata/language-features/basic-values/operator06.out
+++ b/testdata/language-features/basic-values/operator06.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value1 :: ()
+value1 :: ()
 ------------ tooltips
 testdata/language-features/basic-values/operator06.lc 1:1-1:7  ()
 testdata/language-features/basic-values/operator06.lc 1:10-1:12  ()
diff --git a/testdata/language-features/basic-values/redefine01.reject.out b/testdata/language-features/basic-values/redefine01.reject.out
index b532c14d..04a3868f 100644
--- a/testdata/language-features/basic-values/redefine01.reject.out
+++ b/testdata/language-features/basic-values/redefine01.reject.out
@@ -5,9 +5,9 @@ unit = ()
 unit = ()
 ^^^^
 ------------ trace
-unit :: ()
-tuple :: ()
-unit :: ()
+unit :: ()
+tuple :: ()
+unit :: ()
 !already defined unit at testdata/language-features/basic-values/redefine01.reject.lc:3:1:
 unit = ()
 ^^^^
diff --git a/testdata/language-features/basic-values/shadowing01.out b/testdata/language-features/basic-values/shadowing01.out
index 9208919f..dad7b72b 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 22412fea..a3acdba8 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 :: {a} -> {_ : 'Num a}->a
-world :: 'String
-value2 :: 'Char
+c :: {a} -> {_ : 'Num a}->a
+world :: 'String
+value2 :: 'Char
 ------------ tooltips
 testdata/language-features/basic-values/shadowing02.lc 1:1-1:2  {a} -> {_ : Num a}->a
 testdata/language-features/basic-values/shadowing02.lc 1:5-1:6  b_
diff --git a/testdata/language-features/basic-values/shadowing03.out b/testdata/language-features/basic-values/shadowing03.out
index 9cedd896..f4b60d48 100644
--- a/testdata/language-features/basic-values/shadowing03.out
+++ b/testdata/language-features/basic-values/shadowing03.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-x :: {a} -> {b} -> a -> b->()
+x :: {a} -> {b} -> a -> b->()
 ------------ tooltips
 testdata/language-features/basic-values/shadowing03.lc 1:1-1:2  {a} -> {b} -> a -> b->()
 testdata/language-features/basic-values/shadowing03.lc 1:9-1:11  ()
diff --git a/testdata/language-features/basic-values/shadowing04.out b/testdata/language-features/basic-values/shadowing04.out
index 57eb143c..b1a26817 100644
--- a/testdata/language-features/basic-values/shadowing04.out
+++ b/testdata/language-features/basic-values/shadowing04.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-__ :: {a} -> {b} -> a -> b->()
+__ :: {a} -> {b} -> a -> b->()
 ------------ tooltips
 testdata/language-features/basic-values/shadowing04.lc 1:1-1:3  {a} -> {b} -> a -> b->()
 testdata/language-features/basic-values/shadowing04.lc 1:11-1:13  ()
diff --git a/testdata/language-features/basic-values/tuple01.out b/testdata/language-features/basic-values/tuple01.out
index 90607af2..d3a27511 100644
--- a/testdata/language-features/basic-values/tuple01.out
+++ b/testdata/language-features/basic-values/tuple01.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-unit :: ()
+unit :: ()
 ------------ tooltips
 testdata/language-features/basic-values/tuple01.lc 1:1-1:5  ()
 testdata/language-features/basic-values/tuple01.lc 1:8-1:10  ()
diff --git a/testdata/language-features/basic-values/tuple02.out b/testdata/language-features/basic-values/tuple02.out
index 01174cb2..90605d50 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 :: {a} -> {_ : 'Num a}->(a, 'Float, 'Char, 'String, ())
-tuple2 :: ((), ())
-tuple3 :: (('String, 'Char), ())
+tuple1 :: {a} -> {_ : 'Num a}->(a, 'Float, 'Char, 'String, ())
+tuple2 :: ((), ())
+tuple3 :: (('String, 'Char), ())
 ------------ tooltips
 testdata/language-features/basic-values/tuple02.lc 1:1-1:7  {a} -> {_ : Num a}->(a, Float, Char, String, ())
 testdata/language-features/basic-values/tuple02.lc 1:10-1:33  (b_, Float, Char, String, ())
diff --git a/testdata/language-features/basic-values/typesig01.out b/testdata/language-features/basic-values/typesig01.out
index 00c7fd81..cd018c6f 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 b9d5e913..bbaa5075 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/typesig03.out b/testdata/language-features/basic-values/typesig03.out
index 17b588bb..49f21cd9 100644
--- a/testdata/language-features/basic-values/typesig03.out
+++ b/testdata/language-features/basic-values/typesig03.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-fun1 :: {a} -> {b} -> {c} -> a -> b -> c->()
-fun2 :: {a} -> {b} -> {c} -> a -> b -> c->()
+fun1 :: {a} -> {b} -> {c} -> a -> b -> c->()
+fun2 :: {a} -> {b} -> {c} -> a -> b -> c->()
 ------------ tooltips
 testdata/language-features/basic-values/typesig03.lc 1:9-1:10  f_
 testdata/language-features/basic-values/typesig03.lc 1:9-1:26  Type
diff --git a/testdata/language-features/basic-values/typesig04.out b/testdata/language-features/basic-values/typesig04.out
index fe8c7208..0661ca9c 100644
--- a/testdata/language-features/basic-values/typesig04.out
+++ b/testdata/language-features/basic-values/typesig04.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-fun1 :: {a} -> {b} -> {c} -> a -> (b->c)->()
-fun2 :: {a} -> {b} -> {c} -> a -> (b->c)->()
+fun1 :: {a} -> {b} -> {c} -> a -> (b->c)->()
+fun2 :: {a} -> {b} -> {c} -> a -> (b->c)->()
 ------------ tooltips
 testdata/language-features/basic-values/typesig04.lc 1:9-1:10  f_
 testdata/language-features/basic-values/typesig04.lc 1:9-1:28  Type
diff --git a/testdata/language-features/basic-values/typesig05.out b/testdata/language-features/basic-values/typesig05.out
index 3bd47db6..4c781fa8 100644
--- a/testdata/language-features/basic-values/typesig05.out
+++ b/testdata/language-features/basic-values/typesig05.out
@@ -1,11 +1,11 @@
 main is not found
 ------------ trace
-funL :: {a} -> {b} -> a -> b->a
-funR :: {a} -> {b} -> a -> b->b
-value1 :: 'Char
-value2 :: 'String
-value3 :: 'Char
-value4 :: 'String
+funL :: {a} -> {b} -> a -> b->a
+funR :: {a} -> {b} -> a -> b->b
+value1 :: 'Char
+value2 :: 'String
+value3 :: 'Char
+value4 :: 'String
 ------------ tooltips
 testdata/language-features/basic-values/typesig05.lc 1:1-1:5  {a} -> {b} -> a -> b->a
 testdata/language-features/basic-values/typesig05.lc 1:12-1:13  d_
diff --git a/testdata/language-features/basic-values/typesig06.out b/testdata/language-features/basic-values/typesig06.out
index 74e9a83b..2335d27b 100644
--- a/testdata/language-features/basic-values/typesig06.out
+++ b/testdata/language-features/basic-values/typesig06.out
@@ -1,9 +1,9 @@
 main is not found
 ------------ trace
-funL :: {a} -> {b} -> a -> b->a
-<@ :: {a} -> {b} -> a -> b->a
-value1 :: 'String
-value2 :: 'String
+funL :: {a} -> {b} -> a -> b->a
+<@ :: {a} -> {b} -> a -> b->a
+value1 :: 'String
+value2 :: 'String
 ------------ tooltips
 testdata/language-features/basic-values/typesig06.lc 1:1-1:5  {a} -> {b} -> a -> b->a
 testdata/language-features/basic-values/typesig06.lc 1:12-1:13  d_
diff --git a/testdata/language-features/basic-values/typesig07.out b/testdata/language-features/basic-values/typesig07.out
index 705cd6f0..402f8630 100644
--- a/testdata/language-features/basic-values/typesig07.out
+++ b/testdata/language-features/basic-values/typesig07.out
@@ -1,11 +1,11 @@
 main is not found
 ------------ trace
-value1 :: 'Int
-value2 :: 'Int
-value3 :: 'Int
-value4 :: () -> ()->()
-@@@ :: () -> ()->()
-value6 :: () -> ()->()
+value1 :: 'Int
+value2 :: 'Int
+value3 :: 'Int
+value4 :: () -> ()->()
+@@@ :: () -> ()->()
+value6 :: () -> ()->()
 ------------ tooltips
 testdata/language-features/basic-values/typesig07.lc 1:27-1:30  Type
 testdata/language-features/basic-values/typesig07.lc 3:1-3:7  Int
diff --git a/testdata/language-features/basic-values/typesyn01.out b/testdata/language-features/basic-values/typesyn01.out
index 3e2d214b..f5bf60cf 100644
--- a/testdata/language-features/basic-values/typesyn01.out
+++ b/testdata/language-features/basic-values/typesyn01.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-'MyUnit :: Type
+'MyUnit :: Type
 ------------ tooltips
 testdata/language-features/basic-values/typesyn01.lc 1:6-1:12  Type
 testdata/language-features/basic-values/typesyn01.lc 1:15-1:17  Type
diff --git a/testdata/language-features/basic-values/typesyn02.out b/testdata/language-features/basic-values/typesyn02.out
index e1d50e47..dc6e687e 100644
--- a/testdata/language-features/basic-values/typesyn02.out
+++ b/testdata/language-features/basic-values/typesyn02.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-'MyUnit :: Type
-fun :: {a} -> a -> ()->()
+'MyUnit :: Type
+fun :: {a} -> a -> ()->()
 ------------ tooltips
 testdata/language-features/basic-values/typesyn02.lc 1:6-1:12  Type
 testdata/language-features/basic-values/typesyn02.lc 1:15-1:17  Type
diff --git a/testdata/language-features/basic-values/typesyn03.reject.out b/testdata/language-features/basic-values/typesyn03.reject.out
index e55ce30e..c0fb5268 100644
--- a/testdata/language-features/basic-values/typesyn03.reject.out
+++ b/testdata/language-features/basic-values/typesyn03.reject.out
@@ -5,8 +5,8 @@ type MyUnit = ()
 type MyUnit = ()
      ^^^^^^
 ------------ trace
-'MyUnit :: Type
-'MyUnit :: Type
+'MyUnit :: Type
+'MyUnit :: Type
 !already defined 'MyUnit at testdata/language-features/basic-values/typesyn03.reject.lc:2:6:
 type MyUnit = ()
      ^^^^^^
diff --git a/testdata/language-features/basic-values/typesyn04.reject.out b/testdata/language-features/basic-values/typesyn04.reject.out
index 6e93a12a..c903ddb8 100644
--- a/testdata/language-features/basic-values/typesyn04.reject.out
+++ b/testdata/language-features/basic-values/typesyn04.reject.out
@@ -5,8 +5,8 @@ type MyUnit = ()
 type MyUnit = ()
      ^^^^^^
 ------------ trace
-'MyUnit :: Type
-'MyUnit :: Type
+'MyUnit :: Type
+'MyUnit :: Type
 !already defined 'MyUnit at testdata/language-features/basic-values/typesyn04.reject.lc:2:6:
 type MyUnit = ()
      ^^^^^^
diff --git a/testdata/language-features/basic-values/where01.out b/testdata/language-features/basic-values/where01.out
index 201bbf0a..11498269 100644
--- a/testdata/language-features/basic-values/where01.out
+++ b/testdata/language-features/basic-values/where01.out
@@ -1,16 +1,16 @@
 main is not found
 ------------ trace
-value1 :: ()
-value2 :: ()
-value3 :: ()
-value4 :: ()
-value5 :: ()
-value6 :: ()
-value7 :: ()
-value8 :: ()
-value9 :: ()
-value10 :: ()
-value11 :: ()
+value1 :: ()
+value2 :: ()
+value3 :: ()
+value4 :: ()
+value5 :: ()
+value6 :: ()
+value7 :: ()
+value8 :: ()
+value9 :: ()
+value10 :: ()
+value11 :: ()
 ------------ tooltips
 testdata/language-features/basic-values/where01.lc 1:1-1:7  ()
 testdata/language-features/basic-values/where01.lc 1:10-1:12  ()
diff --git a/testdata/language-features/basic-values/where04.out b/testdata/language-features/basic-values/where04.out
index 0b4065d9..8649acfa 100644
--- a/testdata/language-features/basic-values/where04.out
+++ b/testdata/language-features/basic-values/where04.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
-value1 :: ()
-value2 :: ()
-value3 :: ()
+value1 :: ()
+value2 :: ()
+value3 :: ()
 ------------ tooltips
 testdata/language-features/basic-values/where04.lc 1:1-1:7  ()
 testdata/language-features/basic-values/where04.lc 1:18-1:19  ()
diff --git a/testdata/language-features/basic-values/where05.out b/testdata/language-features/basic-values/where05.out
index 72af1e72..95f7c3c3 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 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a}->()
-value2 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a}->()
-value3 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a}->()
-value4 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a}->()
+value1 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a}->()
+value2 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a}->()
+value3 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a}->()
+value4 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a}->()
 ------------ tooltips
 testdata/language-features/basic-values/where05.lc 1:1-1:7  {a} -> {_ : Eq a} -> {_ : Num a}->()
 testdata/language-features/basic-values/where05.lc 1:10-3:10  ()
diff --git a/testdata/language-features/basic-values/wildcard01.out b/testdata/language-features/basic-values/wildcard01.out
index 6755eb3b..dd651320 100644
--- a/testdata/language-features/basic-values/wildcard01.out
+++ b/testdata/language-features/basic-values/wildcard01.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-funUnit :: {a} -> a->()
+funUnit :: {a} -> a->()
 ------------ tooltips
 testdata/language-features/basic-values/wildcard01.lc 1:1-1:8  {a} -> a->()
 testdata/language-features/basic-values/wildcard01.lc 1:13-1:15  ()
diff --git a/testdata/language-features/guard/guard01.out b/testdata/language-features/guard/guard01.out
index 013da5d2..5f08a0dc 100644
--- a/testdata/language-features/guard/guard01.out
+++ b/testdata/language-features/guard/guard01.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: ()
+value :: ()
 ------------ tooltips
 testdata/language-features/guard/guard01.lc 1:1-1:6  ()
 testdata/language-features/guard/guard01.lc 1:9-1:13  Bool
diff --git a/testdata/language-features/guard/guard02.reject.out b/testdata/language-features/guard/guard02.reject.out
index d06c5b7e..3cff76bd 100644
--- a/testdata/language-features/guard/guard02.reject.out
+++ b/testdata/language-features/guard/guard02.reject.out
@@ -1,7 +1,7 @@
 type error: can not unify
-'String
+'String
 with
-()
+()
 
 in testdata/language-features/guard/guard02.reject.lc:2:12:
   | True = ()
@@ -9,9 +9,9 @@ in testdata/language-features/guard/guard02.reject.lc:2:12:
 
 ------------ trace
 !type error: can not unify
-'String
+'String
 with
-()
+()
 
 in testdata/language-features/guard/guard02.reject.lc:2:12:
   | True = ()
diff --git a/testdata/language-features/guard/guard03.out b/testdata/language-features/guard/guard03.out
index 3f240c28..60e74282 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 5254a0e8..7ce283ad 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/guard05.reject.out b/testdata/language-features/guard/guard05.reject.out
index 7b407416..99275e00 100644
--- a/testdata/language-features/guard/guard05.reject.out
+++ b/testdata/language-features/guard/guard05.reject.out
@@ -1,7 +1,7 @@
 type error: can not unify
-'Bool
+'Bool
 with
-()
+()
 
 in testdata/language-features/guard/guard05.reject.lc:1:9:
 value | () = "wrong"
@@ -9,9 +9,9 @@ value | () = "wrong"
 
 ------------ trace
 !type error: can not unify
-'Bool
+'Bool
 with
-()
+()
 
 in testdata/language-features/guard/guard05.reject.lc:1:9:
 value | () = "wrong"
diff --git a/testdata/language-features/guard/guard06.out b/testdata/language-features/guard/guard06.out
index 00e3bebf..6a42d526 100644
--- a/testdata/language-features/guard/guard06.out
+++ b/testdata/language-features/guard/guard06.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: ()
+value :: ()
 ------------ tooltips
 testdata/language-features/guard/guard06.lc 1:1-1:6  ()
 testdata/language-features/guard/guard06.lc 1:21-1:23  ()
diff --git a/testdata/language-features/guard/guard07.out b/testdata/language-features/guard/guard07.out
index 94f6b321..2a965392 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 0fb1cbe1..7cab16c3 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 58167221..437466c6 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 8c5ea30b..fead2674 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/guard12.reject.out b/testdata/language-features/guard/guard12.reject.out
index 24056827..ca6c50ab 100644
--- a/testdata/language-features/guard/guard12.reject.out
+++ b/testdata/language-features/guard/guard12.reject.out
@@ -1,7 +1,7 @@
 type error: can not unify
-'Char
+'Char
 with
-()
+()
 
 in testdata/language-features/guard/guard12.reject.lc:1:13:
 fun x | x = () | otherwise = 'a'
@@ -9,9 +9,9 @@ fun x | x = () | otherwise = 'a'
 
 ------------ trace
 !type error: can not unify
-'Char
+'Char
 with
-()
+()
 
 in testdata/language-features/guard/guard12.reject.lc:1:13:
 fun x | x = () | otherwise = 'a'
diff --git a/testdata/language-features/guard/guard13.out b/testdata/language-features/guard/guard13.out
index dc689b1e..f801f842 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/guard14.out b/testdata/language-features/guard/guard14.out
index 1229c3ad..ce882094 100644
--- a/testdata/language-features/guard/guard14.out
+++ b/testdata/language-features/guard/guard14.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: ()
+value :: ()
 ------------ tooltips
 testdata/language-features/guard/guard14.lc 1:1-1:6  ()
 testdata/language-features/guard/guard14.lc 1:17-1:21  Bool
diff --git a/testdata/language-features/guard/guard15.out b/testdata/language-features/guard/guard15.out
index 1f3ab140..d15dfe52 100644
--- a/testdata/language-features/guard/guard15.out
+++ b/testdata/language-features/guard/guard15.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: ()
+value :: ()
 ------------ tooltips
 testdata/language-features/guard/guard15.lc 1:1-1:6  ()
 testdata/language-features/guard/guard15.lc 1:9-1:11  ()
diff --git a/testdata/language-features/guard/guard16.out b/testdata/language-features/guard/guard16.out
index e1e6fd18..bb8f2af3 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 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a}->()
+value :: {a} -> {_ : 'Eq a} -> {_ : 'Num a}->()
 ------------ tooltips
 testdata/language-features/guard/guard16.lc 1:1-1:6  {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 6d911abc..08a387f1 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 71039060..17b419db 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 899f1f33..4d5deb19 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 5d80d9f9..347da0c0 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 421619b1..39b689da 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 87502a46..c465589a 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 b361bfeb..e6100f0d 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 59f23c4d..76e2a240 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 466f5547..69ce937f 100644
--- a/testdata/language-features/module/Moduledef10.out
+++ b/testdata/language-features/module/Moduledef10.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
-hello :: 'String
-world :: 'String
-value :: ()
+hello :: 'String
+world :: 'String
+value :: ()
 ------------ tooltips
 testdata/language-features/module/Moduledef10.lc 6:1-6:6  String
 testdata/language-features/module/Moduledef10.lc 6:9-6:16  String
diff --git a/testdata/language-features/module/Moduledef13.out b/testdata/language-features/module/Moduledef13.out
index 75e35b24..a5f17505 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/TypeSyn01Mod.out b/testdata/language-features/module/TypeSyn01Mod.out
index d1af6425..47ed80b8 100644
--- a/testdata/language-features/module/TypeSyn01Mod.out
+++ b/testdata/language-features/module/TypeSyn01Mod.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-'MyUnit :: Type
+'MyUnit :: Type
 ------------ tooltips
 testdata/language-features/module/TypeSyn01Mod.lc 2:6-2:12  Type
 testdata/language-features/module/TypeSyn01Mod.lc 2:15-2:17  Type
diff --git a/testdata/language-features/module/import01.out b/testdata/language-features/module/import01.out
index 0f691e51..f22bf842 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 21739b37..82543ceb 100644
--- a/testdata/language-features/module/import04.reject.out
+++ b/testdata/language-features/module/import04.reject.out
@@ -5,7 +5,7 @@ hello = "hello"
 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 c618c024..2d8e2a30 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 40a4a7c8..7a77815a 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
+hello :: ()
+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 4d508754..818bcafb 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
+hello :: ()
+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 44b4050d..6d053bdf 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
+value :: ()
+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/import09.out b/testdata/language-features/module/import09.out
index 77ac024a..080f162a 100644
--- a/testdata/language-features/module/import09.out
+++ b/testdata/language-features/module/import09.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-fun :: {a} -> a -> ()->()
+fun :: {a} -> a -> ()->()
 ------------ tooltips
 testdata/language-features/module/import09.lc 3:8-3:9  b_
 testdata/language-features/module/import09.lc 3:8-3:29  Type
diff --git a/testdata/language-features/module/import10.reject.out b/testdata/language-features/module/import10.reject.out
index 387cc439..7f8c8d2d 100644
--- a/testdata/language-features/module/import10.reject.out
+++ b/testdata/language-features/module/import10.reject.out
@@ -5,7 +5,7 @@ type MyUnit = ()
 type MyUnit = ()
      ^^^^^^
 ------------ trace
-'MyUnit :: Type
+'MyUnit :: Type
 !already defined 'MyUnit at testdata/language-features/module/import10.reject.lc:3:6:
 type MyUnit = ()
      ^^^^^^
diff --git a/testdata/language-features/module/import11.reject.out b/testdata/language-features/module/import11.reject.out
index 79b26f64..531e98a6 100644
--- a/testdata/language-features/module/import11.reject.out
+++ b/testdata/language-features/module/import11.reject.out
@@ -5,7 +5,7 @@ type MyUnit = ()
 type MyUnit = ()
      ^^^^^^
 ------------ trace
-'MyUnit :: Type
+'MyUnit :: Type
 !already defined 'MyUnit at testdata/language-features/module/import11.reject.lc:3:6:
 type MyUnit = ()
      ^^^^^^
diff --git a/testdata/language-features/module/import12.out b/testdata/language-features/module/import12.out
index f158db78..6f4ea030 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 0b4deb36..bb815c78 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 8d1e2208..cdfebd2b 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 80c15bc6..5217f2c1 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/caseWhere.out b/testdata/language-features/pattern/caseWhere.out
index 65af037c..f832724c 100644
--- a/testdata/language-features/pattern/caseWhere.out
+++ b/testdata/language-features/pattern/caseWhere.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/language-features/pattern/pattern01.out b/testdata/language-features/pattern/pattern01.out
index 8afd1b3e..7cb01af3 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 :: {a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a->'Char
-fun2 :: 'String->'Char
-fun3 :: 'Char->'Char
-fun4 :: ()->'Char
+fun1 :: {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  {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/patternGuard.out b/testdata/language-features/pattern/patternGuard.out
index 65af037c..f832724c 100644
--- a/testdata/language-features/pattern/patternGuard.out
+++ b/testdata/language-features/pattern/patternGuard.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/language-features/pattern/uncovered.out b/testdata/language-features/pattern/uncovered.out
index 5434c818..74f875cb 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 :: {a} -> {_ : 'Num a} -> 'Bool -> 'Bool -> 'Bool->a
+f :: {a} -> {_ : 'Num a} -> 'Bool -> 'Bool -> 'Bool->a
 ------------ tooltips
 testdata/language-features/pattern/uncovered.lc 4:1-4:2  {a} -> {_ : Num a} -> Bool -> Bool -> Bool->a
 testdata/language-features/pattern/uncovered.lc 4:18-4:19  b_
diff --git a/testdata/language-features/pattern/unreachable.out b/testdata/language-features/pattern/unreachable.out
index c2090d56..51c957b3 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 :: {a} -> a->'String
+f :: {a} -> a->'String
 ------------ tooltips
 testdata/language-features/pattern/unreachable.lc 4:1-4:2  {a} -> a->String
 testdata/language-features/pattern/unreachable.lc 4:7-4:14  String
diff --git a/testdata/language-features/pattern/viewPattern.out b/testdata/language-features/pattern/viewPattern.out
index 65af037c..f832724c 100644
--- a/testdata/language-features/pattern/viewPattern.out
+++ b/testdata/language-features/pattern/viewPattern.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/language-features/recursion/mutualConst.out b/testdata/language-features/recursion/mutualConst.out
index 65af037c..f832724c 100644
--- a/testdata/language-features/recursion/mutualConst.out
+++ b/testdata/language-features/recursion/mutualConst.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/language-features/recursion/simplerec01.out b/testdata/language-features/recursion/simplerec01.out
index fd6f16c4..e975d532 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 :: {a} -> {_ : 'Num a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a->'Char
+fun :: {a} -> {_ : 'Num a} -> {_ : 'Eq a} -> {_ : 'Num a} -> a->'Char
 ------------ tooltips
 testdata/language-features/recursion/simplerec01.lc 1:1-1:4  {a} -> {_ : Num a} -> {_ : Eq a} -> {_ : Num a} -> a->Char
 testdata/language-features/recursion/simplerec01.lc 1:9-1:12  Char
diff --git a/testdata/language-features/recursion/simplerec02.out b/testdata/language-features/recursion/simplerec02.out
index 0d2d20b6..96ad9d37 100644
--- a/testdata/language-features/recursion/simplerec02.out
+++ b/testdata/language-features/recursion/simplerec02.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: ()
+value :: ()
 ------------ tooltips
 testdata/language-features/recursion/simplerec02.lc 1:1-1:6  ()
 testdata/language-features/recursion/simplerec02.lc 1:21-1:24  Char
diff --git a/testdata/language-features/recursion/simplerec03.out b/testdata/language-features/recursion/simplerec03.out
index 9a1a3bb2..27c2981e 100644
--- a/testdata/language-features/recursion/simplerec03.out
+++ b/testdata/language-features/recursion/simplerec03.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: ()
+value :: ()
 ------------ tooltips
 testdata/language-features/recursion/simplerec03.lc 1:1-1:6  ()
 testdata/language-features/recursion/simplerec03.lc 1:9-1:11  ()
diff --git a/testdata/language-features/section/section01.out b/testdata/language-features/section/section01.out
index e33ef53b..2f19c090 100644
--- a/testdata/language-features/section/section01.out
+++ b/testdata/language-features/section/section01.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
-!@! :: {a} -> {b} -> a -> b->()
-value1 :: {a} -> {b} -> a -> b->()
-value2 :: {a} -> {b} -> a -> b->()
+!@! :: {a} -> {b} -> a -> b->()
+value1 :: {a} -> {b} -> a -> b->()
+value2 :: {a} -> {b} -> a -> b->()
 ------------ tooltips
 testdata/language-features/section/section01.lc 1:3-1:6  {a} -> {b} -> a -> b->()
 testdata/language-features/section/section01.lc 1:11-1:13  ()
diff --git a/testdata/let.out b/testdata/let.out
index e3da6694..a5c035e3 100644
--- a/testdata/let.out
+++ b/testdata/let.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-f :: {a} -> a->a
+f :: {a} -> a->a
 ------------ tooltips
 testdata/let.lc 2:1-2:2  {a} -> a->a
 testdata/let.lc 2:15-2:17  {a} -> a->a
diff --git a/testdata/letIndent.out b/testdata/letIndent.out
index 9dbbd933..3009d024 100644
--- a/testdata/letIndent.out
+++ b/testdata/letIndent.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-fun :: {a} -> a->a
+fun :: {a} -> a->a
 ------------ tooltips
 testdata/letIndent.lc 2:1-2:4  {a} -> a->a
 testdata/letIndent.lc 3:10-3:11  b_
diff --git a/testdata/listcompr01.out b/testdata/listcompr01.out
index 65af037c..f832724c 100644
--- a/testdata/listcompr01.out
+++ b/testdata/listcompr01.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/listcompr02.out b/testdata/listcompr02.out
index 65af037c..f832724c 100644
--- a/testdata/listcompr02.out
+++ b/testdata/listcompr02.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/listcompr03.out b/testdata/listcompr03.out
index 65af037c..f832724c 100644
--- a/testdata/listcompr03.out
+++ b/testdata/listcompr03.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/listcompr04.out b/testdata/listcompr04.out
index 65af037c..f832724c 100644
--- a/testdata/listcompr04.out
+++ b/testdata/listcompr04.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/listcompr05.out b/testdata/listcompr05.out
index 65af037c..f832724c 100644
--- a/testdata/listcompr05.out
+++ b/testdata/listcompr05.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/localfun.out b/testdata/localfun.out
index 65af037c..f832724c 100644
--- a/testdata/localfun.out
+++ b/testdata/localfun.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/loopIssue.out b/testdata/loopIssue.out
index 65af037c..f832724c 100644
--- a/testdata/loopIssue.out
+++ b/testdata/loopIssue.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/performance/Material.out b/testdata/performance/Material.out
index 0e92cbe1..ca1dbe47 100644
--- a/testdata/performance/Material.out
+++ b/testdata/performance/Material.out
@@ -1,161 +1,161 @@
 main is not found
 ------------ trace
-identityLight :: 'Float
-'Entity :: Type
-Entity :: 'Vec 4 'Float -> 'Vec 4 'Float -> 'Vec 3 'Float -> 'Vec 4 'Float -> 'Entity
-'EntityCase :: (a : 'Entity->Type) -> ((b : 'Vec 4 'Float) -> (c : 'Vec 4 'Float) -> (d : 'Vec 3 'Float) -> (e : 'Vec 4 'Float) -> a (Entity b c d e)) -> (f:'Entity) -> a f
-match'Entity :: (a : Type->Type) -> a 'Entity -> (b:Type) -> 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 :: (a : 'WaveType->Type) -> a WT_Sin -> a WT_Triangle -> a WT_Square -> a WT_Sawtooth -> a WT_InverseSawtooth -> a WT_Noise -> (b:'WaveType) -> a b
-match'WaveType :: (a : Type->Type) -> a 'WaveType -> (b:Type) -> a b -> a b
-'Wave :: Type
-Wave :: 'WaveType -> 'Float -> 'Float -> 'Float -> 'Float->'Wave
-'WaveCase :: (a : 'Wave->Type) -> ((b:'WaveType) -> (c:'Float) -> (d:'Float) -> (e:'Float) -> (f:'Float) -> a (Wave b c d e f)) -> (g:'Wave) -> a g
-match'Wave :: (a : Type->Type) -> a 'Wave -> (b:Type) -> 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 :: (a : 'Deform->Type) -> a D_AutoSprite -> a D_AutoSprite2 -> ((b:'Float) -> (c:'Float) -> (d:'Float) -> a (D_Bulge b c d)) -> ((e : 'Vec 3 'Float) -> (f:'Wave) -> a (D_Move e f)) -> ((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 -> ((i:'Float) -> (j:'Wave) -> a (D_Wave i j)) -> (k:'Deform) -> a k
-match'Deform :: (a : Type->Type) -> a 'Deform -> (b:Type) -> a b -> a b
-'CullType :: Type
-CT_FrontSided :: 'CullType
-CT_BackSided :: 'CullType
-CT_TwoSided :: 'CullType
-'CullTypeCase :: (a : 'CullType->Type) -> a CT_FrontSided -> a CT_BackSided -> a CT_TwoSided -> (b:'CullType) -> a b
-match'CullType :: (a : Type->Type) -> a 'CullType -> (b:Type) -> 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 :: (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 -> (b:'Blending') -> a b
-match'Blending' :: (a : Type->Type) -> a 'Blending' -> (b:Type) -> 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 :: (a : 'RGBGen->Type) -> ((b:'Wave) -> a (RGB_Wave b)) -> ((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 -> (f:'RGBGen) -> a f
-match'RGBGen :: (a : Type->Type) -> a 'RGBGen -> (b:Type) -> 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 :: (a : 'AlphaGen->Type) -> ((b:'Wave) -> a (A_Wave b)) -> ((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 -> (d:'AlphaGen) -> a d
-match'AlphaGen :: (a : Type->Type) -> a 'AlphaGen -> (b:Type) -> 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 :: (a : 'TCGen->Type) -> a TG_Base -> a TG_Lightmap -> a TG_Environment -> ((b : 'Vec 3 'Float) -> (c : 'Vec 3 'Float) -> a (TG_Vector b c)) -> a TG_Undefined -> (d:'TCGen) -> a d
-match'TCGen :: (a : Type->Type) -> a 'TCGen -> (b:Type) -> 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 :: (a : 'TCMod->Type) -> a TM_EntityTranslate -> ((b:'Float) -> a (TM_Rotate b)) -> ((c:'Float) -> (d:'Float) -> a (TM_Scroll c d)) -> ((e:'Float) -> (f:'Float) -> a (TM_Scale e f)) -> ((g:'Wave) -> a (TM_Stretch g)) -> ((h:'Float) -> (i:'Float) -> (j:'Float) -> (k:'Float) -> (l:'Float) -> (m:'Float) -> a (TM_Transform h i j k l m)) -> ((n:'Float) -> (o:'Float) -> (p:'Float) -> (q:'Float) -> a (TM_Turb n o p q)) -> (r:'TCMod) -> a r
-match'TCMod :: (a : Type->Type) -> a 'TCMod -> (b:Type) -> 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 :: (a : 'StageTexture->Type) -> ((b:'String) -> a (ST_Map b)) -> ((c:'String) -> a (ST_ClampMap c)) -> ((d:'Float) -> (e : 'List 'String) -> a (ST_AnimMap d e)) -> a ST_Lightmap -> a ST_WhiteImage -> (f:'StageTexture) -> a f
-match'StageTexture :: (a : Type->Type) -> a 'StageTexture -> (b:Type) -> a b -> a b
-'AlphaFunction :: Type
-A_Gt0 :: 'AlphaFunction
-A_Lt128 :: 'AlphaFunction
-A_Ge128 :: 'AlphaFunction
-'AlphaFunctionCase :: (a : 'AlphaFunction->Type) -> a A_Gt0 -> a A_Lt128 -> a A_Ge128 -> (b:'AlphaFunction) -> a b
-match'AlphaFunction :: (a : Type->Type) -> a 'AlphaFunction -> (b:Type) -> a b -> a b
-'DepthFunction :: Type
-D_Equal :: 'DepthFunction
-D_Lequal :: 'DepthFunction
-'DepthFunctionCase :: (a : 'DepthFunction->Type) -> a D_Equal -> a D_Lequal -> (b:'DepthFunction) -> a b
-match'DepthFunction :: (a : Type->Type) -> a 'DepthFunction -> (b:Type) -> a b -> a b
-'StageAttrs :: Type
-StageAttrs :: 'Maybe ('Blending', 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
-'StageAttrsCase :: (a : 'StageAttrs->Type) -> ((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)) -> (m:'StageAttrs) -> a m
-match'StageAttrs :: (a : Type->Type) -> a 'StageAttrs -> (b:Type) -> 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 :: (a : 'CommonAttrs->Type) -> ((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)) -> (n:'CommonAttrs) -> a n
-match'CommonAttrs :: (a : Type->Type) -> a 'CommonAttrs -> (b:Type) -> 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
+identityLight :: 'Float
+'Entity :: Type
+Entity :: 'Vec 4 'Float -> 'Vec 4 'Float -> 'Vec 3 'Float -> 'Vec 4 'Float -> 'Entity
+'EntityCase :: (a : 'Entity->Type) -> ((b : 'Vec 4 'Float) -> (c : 'Vec 4 'Float) -> (d : 'Vec 3 'Float) -> (e : 'Vec 4 'Float) -> a (Entity b c d e)) -> (f:'Entity) -> a f
+match'Entity :: (a : Type->Type) -> a 'Entity -> (b:Type) -> 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 :: (a : 'WaveType->Type) -> a WT_Sin -> a WT_Triangle -> a WT_Square -> a WT_Sawtooth -> a WT_InverseSawtooth -> a WT_Noise -> (b:'WaveType) -> a b
+match'WaveType :: (a : Type->Type) -> a 'WaveType -> (b:Type) -> a b -> a b
+'Wave :: Type
+Wave :: 'WaveType -> 'Float -> 'Float -> 'Float -> 'Float->'Wave
+'WaveCase :: (a : 'Wave->Type) -> ((b:'WaveType) -> (c:'Float) -> (d:'Float) -> (e:'Float) -> (f:'Float) -> a (Wave b c d e f)) -> (g:'Wave) -> a g
+match'Wave :: (a : Type->Type) -> a 'Wave -> (b:Type) -> 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 :: (a : 'Deform->Type) -> a D_AutoSprite -> a D_AutoSprite2 -> ((b:'Float) -> (c:'Float) -> (d:'Float) -> a (D_Bulge b c d)) -> ((e : 'Vec 3 'Float) -> (f:'Wave) -> a (D_Move e f)) -> ((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 -> ((i:'Float) -> (j:'Wave) -> a (D_Wave i j)) -> (k:'Deform) -> a k
+match'Deform :: (a : Type->Type) -> a 'Deform -> (b:Type) -> a b -> a b
+'CullType :: Type
+CT_FrontSided :: 'CullType
+CT_BackSided :: 'CullType
+CT_TwoSided :: 'CullType
+'CullTypeCase :: (a : 'CullType->Type) -> a CT_FrontSided -> a CT_BackSided -> a CT_TwoSided -> (b:'CullType) -> a b
+match'CullType :: (a : Type->Type) -> a 'CullType -> (b:Type) -> 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 :: (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 -> (b:'Blending') -> a b
+match'Blending' :: (a : Type->Type) -> a 'Blending' -> (b:Type) -> 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 :: (a : 'RGBGen->Type) -> ((b:'Wave) -> a (RGB_Wave b)) -> ((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 -> (f:'RGBGen) -> a f
+match'RGBGen :: (a : Type->Type) -> a 'RGBGen -> (b:Type) -> 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 :: (a : 'AlphaGen->Type) -> ((b:'Wave) -> a (A_Wave b)) -> ((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 -> (d:'AlphaGen) -> a d
+match'AlphaGen :: (a : Type->Type) -> a 'AlphaGen -> (b:Type) -> 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 :: (a : 'TCGen->Type) -> a TG_Base -> a TG_Lightmap -> a TG_Environment -> ((b : 'Vec 3 'Float) -> (c : 'Vec 3 'Float) -> a (TG_Vector b c)) -> a TG_Undefined -> (d:'TCGen) -> a d
+match'TCGen :: (a : Type->Type) -> a 'TCGen -> (b:Type) -> 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 :: (a : 'TCMod->Type) -> a TM_EntityTranslate -> ((b:'Float) -> a (TM_Rotate b)) -> ((c:'Float) -> (d:'Float) -> a (TM_Scroll c d)) -> ((e:'Float) -> (f:'Float) -> a (TM_Scale e f)) -> ((g:'Wave) -> a (TM_Stretch g)) -> ((h:'Float) -> (i:'Float) -> (j:'Float) -> (k:'Float) -> (l:'Float) -> (m:'Float) -> a (TM_Transform h i j k l m)) -> ((n:'Float) -> (o:'Float) -> (p:'Float) -> (q:'Float) -> a (TM_Turb n o p q)) -> (r:'TCMod) -> a r
+match'TCMod :: (a : Type->Type) -> a 'TCMod -> (b:Type) -> 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 :: (a : 'StageTexture->Type) -> ((b:'String) -> a (ST_Map b)) -> ((c:'String) -> a (ST_ClampMap c)) -> ((d:'Float) -> (e : 'List 'String) -> a (ST_AnimMap d e)) -> a ST_Lightmap -> a ST_WhiteImage -> (f:'StageTexture) -> a f
+match'StageTexture :: (a : Type->Type) -> a 'StageTexture -> (b:Type) -> a b -> a b
+'AlphaFunction :: Type
+A_Gt0 :: 'AlphaFunction
+A_Lt128 :: 'AlphaFunction
+A_Ge128 :: 'AlphaFunction
+'AlphaFunctionCase :: (a : 'AlphaFunction->Type) -> a A_Gt0 -> a A_Lt128 -> a A_Ge128 -> (b:'AlphaFunction) -> a b
+match'AlphaFunction :: (a : Type->Type) -> a 'AlphaFunction -> (b:Type) -> a b -> a b
+'DepthFunction :: Type
+D_Equal :: 'DepthFunction
+D_Lequal :: 'DepthFunction
+'DepthFunctionCase :: (a : 'DepthFunction->Type) -> a D_Equal -> a D_Lequal -> (b:'DepthFunction) -> a b
+match'DepthFunction :: (a : Type->Type) -> a 'DepthFunction -> (b:Type) -> a b -> a b
+'StageAttrs :: Type
+StageAttrs :: 'Maybe ('Blending', 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
+'StageAttrsCase :: (a : 'StageAttrs->Type) -> ((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)) -> (m:'StageAttrs) -> a m
+match'StageAttrs :: (a : Type->Type) -> a 'StageAttrs -> (b:Type) -> 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 :: (a : 'CommonAttrs->Type) -> ((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)) -> (n:'CommonAttrs) -> a n
+match'CommonAttrs :: (a : Type->Type) -> a 'CommonAttrs -> (b:Type) -> 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 21d41c59..a3adf868 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/primes.out b/testdata/primes.out
index 703d8fba..39d3d4b9 100644
--- a/testdata/primes.out
+++ b/testdata/primes.out
@@ -1 +1 @@
-31
\ No newline at end of file
+31
\ No newline at end of file
diff --git a/testdata/record01.reject.out b/testdata/record01.reject.out
index 32ed09fc..b2d8d0e8 100644
--- a/testdata/record01.reject.out
+++ b/testdata/record01.reject.out
@@ -1,7 +1,7 @@
 type error: can not unify
-'FrameBuffer b_ a_
+'FrameBuffer b_ a_
 with
-'Float
+'Float
 
 in testdata/record01.reject.lc:26:15:
  in ScreenOut record.fieldA
@@ -9,9 +9,9 @@ in testdata/record01.reject.lc:26:15:
 
 ------------ trace
 !type error: can not unify
-'FrameBuffer b_ a_
+'FrameBuffer b_ a_
 with
-'Float
+'Float
 
 in testdata/record01.reject.lc:26:15:
  in ScreenOut record.fieldA
diff --git a/testdata/record02.out b/testdata/record02.out
index 65af037c..f832724c 100644
--- a/testdata/record02.out
+++ b/testdata/record02.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/reduce06.out b/testdata/reduce06.out
index 65af037c..f832724c 100644
--- a/testdata/reduce06.out
+++ b/testdata/reduce06.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/swizzling.out b/testdata/swizzling.out
index 65af037c..f832724c 100644
--- a/testdata/swizzling.out
+++ b/testdata/swizzling.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/traceTest.out b/testdata/traceTest.out
index 06096c39..c1529ca6 100644
--- a/testdata/traceTest.out
+++ b/testdata/traceTest.out
@@ -1,10 +1,10 @@
 main is not found
 ------------ trace
-id :: {a} -> a->a
-'X :: {a} -> a->Type
-'XCase :: {a} -> {b:a} -> (c : 'X a b -> Type) -> (d : 'X a b) -> c d
-match'X :: (a : Type->Type) -> ({b} -> (c:b) -> a ('X b c)) -> (d:Type) -> a d -> a d
-x :: 'X (Type -> Type->Type) (\(a:Type) (b:Type) -> (a, b))
+id :: {a} -> a->a
+'X :: {a} -> a->Type
+'XCase :: {a} -> {b:a} -> (c : 'X a b -> Type) -> (d : 'X a b) -> c d
+match'X :: (a : Type->Type) -> ({b} -> (c:b) -> a ('X b c)) -> (d:Type) -> a d -> a d
+x :: 'X (Type -> Type->Type) (\(a:Type) (b:Type) -> (a, b))
 ------------ tooltips
 testdata/traceTest.lc 6:1-6:3  {a} -> a->a
 testdata/traceTest.lc 6:8-6:9  b_
diff --git a/testdata/typeclass.out b/testdata/typeclass.out
index 36725be0..e0da48d1 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
-'Eq :: Type->Type
-== :: {a} -> {_ : 'Eq a} -> a -> a->'Bool
-/= :: {a} -> {_ : 'Eq a} -> a -> a->'Bool
+not :: 'Bool->'Bool
+&& :: 'Bool -> 'Bool->'Bool
+|| :: 'Bool -> 'Bool->'Bool
+'Eq :: Type->Type
+== :: {a} -> {_ : 'Eq a} -> a -> a->'Bool
+/= :: {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/typeclass0.out b/testdata/typeclass0.out
index 65af037c..f832724c 100644
--- a/testdata/typeclass0.out
+++ b/testdata/typeclass0.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/typesig.reject.out b/testdata/typesig.reject.out
index 923cc1be..05632bc8 100644
--- a/testdata/typesig.reject.out
+++ b/testdata/typesig.reject.out
@@ -1,12 +1,12 @@
-focus checkMetas: \a -> (\(b:Type) -> primFix a b) (\(a:=Type) -> \(c:Type) -> <<HERE>>)
-\(a : Type~a_) (b : b_~'X) -> typeAnn c_ (labend X)
+focus checkMetas: \a -> (\(b:Type) -> primFix a b) (\(a:=Type) -> \(c:Type) -> <<HERE>>)
+\(a : Type~a_) (b : b_~'X) -> typeAnn c_ (labend X)
 ------------ trace
-'X :: Type
-X :: 'X
-'XCase :: (a : 'X->Type) -> a X -> (b:'X) -> a b
-match'X :: (a : Type->Type) -> a 'X -> (b:Type) -> a b -> a b
-!focus checkMetas: \a -> (\(b:Type) -> primFix a b) (\(a:=Type) -> \(c:Type) -> <<HERE>>)
-\(a : Type~a_) (b : b_~'X) -> typeAnn c_ (labend X)
+'X :: Type
+X :: 'X
+'XCase :: (a : 'X->Type) -> a X -> (b:'X) -> a b
+match'X :: (a : Type->Type) -> a 'X -> (b:Type) -> a b -> a b
+!focus checkMetas: \a -> (\(b:Type) -> primFix a b) (\(a:=Type) -> \(c:Type) -> <<HERE>>)
+\(a : Type~a_) (b : b_~'X) -> typeAnn c_ (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 6696ad4a..63c575ce 100644
--- a/testdata/typesigctx.reject.out
+++ b/testdata/typesigctx.reject.out
@@ -2,12 +2,12 @@ type error: no instance of 'Show' on ???
 in Wildcard2 builtin 'Type
 
 ------------ trace
-'X :: Type
-X :: 'X
-'XCase :: (a : 'X->Type) -> a X -> (b:'X) -> a b
-match'X :: (a : Type->Type) -> a 'X -> (b:Type) -> a b -> a b
-'Show' :: Type->Type
-show' :: {a} -> {_ : 'Show' a} -> a->'X
+'X :: Type
+X :: 'X
+'XCase :: (a : 'X->Type) -> a X -> (b:'X) -> a b
+match'X :: (a : Type->Type) -> a 'X -> (b:Type) -> a b -> a b
+'Show' :: Type->Type
+show' :: {a} -> {_ : 'Show' a} -> a->'X
 !type error: no instance of 'Show' on ???
 in Wildcard2 builtin 'Type
 
diff --git a/testdata/typesyn.out b/testdata/typesyn.out
index 65af037c..f832724c 100644
--- a/testdata/typesyn.out
+++ b/testdata/typesyn.out
@@ -1 +1 @@
-True
\ No newline at end of file
+True
\ No newline at end of file
diff --git a/testdata/where.out b/testdata/where.out
index 5f12696d..2b62fedf 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 c77e525e..02f84ae5 100644
--- a/testdata/zip01.out
+++ b/testdata/zip01.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-zip2 :: {a} -> {b} -> 'List a -> 'List b -> 'List (a, b)
+zip2 :: {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