refactoring

135 files changed, 841 insertions, 135 deletions

diff --git a/testdata/Builtins.out b/testdata/Builtins.out
index ffe2badf..7087ba31 100644
--- a/testdata/Builtins.out
+++ b/testdata/Builtins.out
@@ -1,9 +1,12 @@
+main is not found
 ------------ desugared source code
 id = \(a :: _) -> _rhs a
+
 data VecS (_ :: Type) :: Nat -> Type where
     V2 :: forall a . a -> a -> VecS a (fromInt 2)
     V3 :: forall b . b -> b -> b -> VecS b (fromInt 3)
     V4 :: forall c . c -> c -> c -> c -> VecS c (fromInt 4)
+
 mapVec :: forall (a :: _) (b :: _) (c :: _) . (a -> b) -> VecS a c -> VecS b c
 mapVec
   = \(a :: _) (b :: _) -> case'VecS
@@ -12,8 +15,10 @@ mapVec
     (\(e :: _) (f :: _) (g :: _) -> _rhs (V3 (a e) (a f) (a g)))
     (\(h :: _) (i :: _) (j :: _) (k :: _) -> _rhs (V4 (a h) (a i) (a j) (a k)))
     b
+
 'Vec :: Nat -> Type -> Type
 'Vec = \(a :: _) (b :: _) -> _rhs ('VecS b a)
+
 'VecScalar :: Nat -> Type -> Type
 'VecScalar
   = \(a :: _) (b :: _) -> case'Nat
@@ -25,6 +30,7 @@ mapVec
       (\(d :: _) -> _rhs ('Vec (Succ (Succ d)) b))
       c)
     a
+
 data Mat :: Nat -> Nat -> Type -> Type where
     M22F
       :: Vec (fromInt 2) Float
@@ -62,6 +68,7 @@ data Mat :: Nat -> Nat -> Type -> Type where
         -> Vec (fromInt 4) Float
           -> Vec (fromInt 4) Float
             -> Vec (fromInt 4) Float -> Mat (fromInt 4) (fromInt 4) Float
+
 'MatVecScalarElem :: Type -> Type
 'MatVecScalarElem
   = \(a :: _) -> match'Float
@@ -81,6 +88,7 @@ data Mat :: Nat -> Nat -> Type -> Type where
           (\(b :: _) _ -> _rhs b)
           a
           (match'Mat (\_ -> _) (\_ _ (c :: _) -> _rhs c) a undefined))))
+
 'Signed :: Type -> Type
 'Signed
   = \(a :: _) -> match'Int
@@ -92,6 +100,7 @@ data Mat :: Nat -> Nat -> Type -> Type where
       (_rhs 'Unit)
       a
       (_rhs ('Empty "no instance of 'Signed on ???")))
+
 'Component :: Type -> Type
 'Component
   = \(a :: _) -> match'Int
@@ -163,6 +172,7 @@ data Mat :: Nat -> Nat -> Type -> Type where
             (_rhs 'Unit)
             a
             (_rhs ('Empty "no instance of 'Component on ???"))))))
+
 zero :: forall a . Component a => a
 zero
   = \ @a @_ -> match'Int
@@ -230,6 +240,7 @@ zero
               (_rhs undefined)))
           a
           (match'Bool (\_ -> _) (_rhs \(u := _rhs False) -> u) a (_rhs undefined)))))
+
 one :: forall a . Component a => a
 one
   = \ @a @_ -> match'Int
@@ -297,6 +308,7 @@ one
               (_rhs undefined)))
           a
           (match'Bool (\_ -> _) (_rhs \(u := _rhs True) -> u) a (_rhs undefined)))))
+
 'Integral :: Type -> Type
 'Integral
   = \(a :: _) -> match'Int
@@ -308,6 +320,7 @@ one
       (_rhs 'Unit)
       a
       (_rhs ('Empty "no instance of 'Integral on ???")))
+
 'Floating :: Type -> Type
 'Floating
   = \(a :: _) -> match'Float
@@ -463,282 +476,422 @@ one
           h)
         a
         (_rhs ('Empty "no instance of 'Floating on ???"))))
+
 PrimAdd :: forall (a :: _) . Num (MatVecScalarElem a) => a -> a -> a
+
 PrimSub :: forall (a :: _) . Num (MatVecScalarElem a) => a -> a -> a
+
 PrimMul :: forall (a :: _) . Num (MatVecScalarElem a) => a -> a -> a
+
 PrimAddS
   :: forall (a :: _) (b :: _) . (a ~ MatVecScalarElem b, Num a) => b -> a -> b
+
 PrimSubS
   :: forall (a :: _) (b :: _) . (a ~ MatVecScalarElem b, Num a) => b -> a -> b
+
 PrimMulS
   :: forall (a :: _) (b :: _) . (a ~ MatVecScalarElem b, Num a) => b -> a -> b
+
 PrimDiv
   :: forall (a :: _) (b :: _) (c :: _) . (Num a, b ~ VecScalar c a) => b -> b -> b
+
 PrimMod
   :: forall (a :: _) (b :: _) (c :: _) . (Num a, b ~ VecScalar c a) => b -> b -> b
+
 PrimDivS
   :: forall (a :: _) (b :: _) (c :: _) . (Num a, b ~ VecScalar c a) => b -> a -> b
+
 PrimModS
   :: forall (a :: _) (b :: _) (c :: _) . (Num a, b ~ VecScalar c a) => b -> a -> b
+
 PrimNeg :: forall (a :: _) . Signed (MatVecScalarElem a) => a -> a
+
 PrimBAnd
   :: forall (a :: _) (b :: _) (c :: _)
     . (Integral a, b ~ VecScalar c a) => b -> b -> b
+
 PrimBOr
   :: forall (a :: _) (b :: _) (c :: _)
     . (Integral a, b ~ VecScalar c a) => b -> b -> b
+
 PrimBXor
   :: forall (a :: _) (b :: _) (c :: _)
     . (Integral a, b ~ VecScalar c a) => b -> b -> b
+
 PrimBAndS
   :: forall (a :: _) (b :: _) (c :: _)
     . (Integral a, b ~ VecScalar c a) => b -> a -> b
+
 PrimBOrS
   :: forall (a :: _) (b :: _) (c :: _)
     . (Integral a, b ~ VecScalar c a) => b -> a -> b
+
 PrimBXorS
   :: forall (a :: _) (b :: _) (c :: _)
     . (Integral a, b ~ VecScalar c a) => b -> a -> b
+
 PrimBNot
   :: forall (a :: _) (b :: _) (c :: _) . (Integral a, b ~ VecScalar c a) => b -> b
+
 PrimBShiftL
   :: forall (a :: _) (b :: _) (c :: _) (d :: _)
     . (Integral a, b ~ VecScalar c a, d ~ VecScalar c Word) => b -> d -> b
+
 PrimBShiftR
   :: forall (a :: _) (b :: _) (c :: _) (d :: _)
     . (Integral a, b ~ VecScalar c a, d ~ VecScalar c Word) => b -> d -> b
+
 PrimBShiftLS
   :: forall (a :: _) (b :: _) (c :: _)
     . (Integral a, b ~ VecScalar c a) => b -> Word -> b
+
 PrimBShiftRS
   :: forall (a :: _) (b :: _) (c :: _)
     . (Integral a, b ~ VecScalar c a) => b -> Word -> b
+
 PrimAnd :: Bool -> Bool -> Bool
+
 PrimOr :: Bool -> Bool -> Bool
+
 PrimXor :: Bool -> Bool -> Bool
+
 PrimNot :: forall (a :: _) (b :: _) . (a ~ VecScalar b Bool) => a -> a
+
 PrimAny :: forall (a :: _) . VecScalar a Bool -> Bool
+
 PrimAll :: forall (a :: _) . VecScalar a Bool -> Bool
+
 PrimACos :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimACosH :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimASin :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimASinH :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimATan :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimATanH :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimCos :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimCosH :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimDegrees :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimRadians :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimSin :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimSinH :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimTan :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimTanH :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimExp :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimLog :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimExp2 :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimLog2 :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimSqrt :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimInvSqrt :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimPow :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a -> a
+
 PrimATan2 :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a -> a
+
 PrimFloor :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimTrunc :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimRound :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimRoundEven :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimCeil :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimFract :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimMin
   :: forall (a :: _) (b :: _) (c :: _) . (Num a, b ~ VecScalar c a) => b -> b -> b
+
 PrimMax
   :: forall (a :: _) (b :: _) (c :: _) . (Num a, b ~ VecScalar c a) => b -> b -> b
+
 PrimMinS
   :: forall (a :: _) (b :: _) (c :: _) . (Num a, b ~ VecScalar c a) => b -> a -> b
+
 PrimMaxS
   :: forall (a :: _) (b :: _) (c :: _) . (Num a, b ~ VecScalar c a) => b -> a -> b
+
 PrimIsNan
   :: forall (a :: _) (b :: _) (c :: _)
     . (a ~ VecScalar b Float, c ~ VecScalar b Bool) => a -> c
+
 PrimIsInf
   :: forall (a :: _) (b :: _) (c :: _)
     . (a ~ VecScalar b Float, c ~ VecScalar b Bool) => a -> c
+
 PrimAbs
   :: forall (a :: _) (b :: _) (c :: _) . (Signed a, b ~ VecScalar c a) => b -> b
+
 PrimSign
   :: forall (a :: _) (b :: _) (c :: _) . (Signed a, b ~ VecScalar c a) => b -> b
+
 PrimModF
   :: forall (a :: _) (b :: _)
     . (a ~ VecScalar b Float) => a -> HList (a : a : '[])
+
 PrimClamp
   :: forall (a :: _) (b :: _) (c :: _)
     . (Num a, b ~ VecScalar c a) => b -> b -> b -> b
+
 PrimClampS
   :: forall (a :: _) (b :: _) (c :: _)
     . (Num a, b ~ VecScalar c a) => b -> a -> a -> b
+
 PrimMix
   :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a -> a -> a
+
 PrimMixS
   :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a -> Float -> a
+
 PrimMixB
   :: forall (a :: _) (b :: _) (c :: _)
     . (a ~ VecScalar b Float, c ~ VecScalar b Bool) => a -> a -> c -> a
+
 PrimStep :: forall (a :: _) (b :: _) . (a ~ Vec b Float) => a -> a -> a
+
 PrimStepS
   :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => Float -> a -> a
+
 PrimSmoothStep
   :: forall (a :: _) (b :: _) . (a ~ Vec b Float) => a -> a -> a -> a
+
 PrimSmoothStepS
   :: forall (a :: _) (b :: _)
     . (a ~ VecScalar b Float) => Float -> Float -> a -> a
+
 PrimFloatBitsToInt :: forall (a :: _) . VecScalar a Float -> VecScalar a Int
+
 PrimFloatBitsToUInt :: forall (a :: _) . VecScalar a Float -> VecScalar a Word
+
 PrimIntBitsToFloat :: forall (a :: _) . VecScalar a Int -> VecScalar a Float
+
 PrimUIntBitsToFloat :: forall (a :: _) . VecScalar a Word -> VecScalar a Float
+
 PrimLength :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> Float
+
 PrimDistance
   :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a -> Float
+
 PrimDot :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a -> Float
+
 PrimCross :: forall (a :: _) . (a ~ VecScalar (fromInt 3) Float) => a -> a -> a
+
 PrimNormalize :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimFaceForward
   :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a -> a -> a
+
 PrimRefract
   :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a -> a -> a
+
 PrimReflect :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a -> a
+
 PrimTranspose :: forall (a :: _) (b :: _) (c :: _) . Mat a b c -> Mat b a c
+
 PrimDeterminant :: forall (a :: _) (b :: _) . Mat a a b -> Float
+
 PrimInverse :: forall (a :: _) (b :: _) . Mat a a b -> Mat a a b
+
 PrimOuterProduct
   :: forall (a :: _) (b :: _) (c :: _) . Vec a b -> Vec c b -> Mat c a b
+
 PrimMulMatVec
   :: forall (a :: _) (b :: _) (c :: _) . Mat a b c -> Vec b c -> Vec a c
+
 PrimMulVecMat
   :: forall (a :: _) (b :: _) (c :: _) . Vec a b -> Mat a c b -> Vec c b
+
 PrimMulMatMat
   :: forall (a :: _) (b :: _) (c :: _) (d :: _)
     . Mat a b c -> Mat b d c -> Mat a d c
+
 PrimLessThan
   :: forall (a :: _) (b :: _) (c :: _) (d :: _)
     . (Num c, a ~ VecScalar b c, d ~ VecScalar b Bool) => a -> a -> d
+
 PrimLessThanEqual
   :: forall (a :: _) (b :: _) (c :: _) (d :: _)
     . (Num c, a ~ VecScalar b c, d ~ VecScalar b Bool) => a -> a -> d
+
 PrimGreaterThan
   :: forall (a :: _) (b :: _) (c :: _) (d :: _)
     . (Num c, a ~ VecScalar b c, d ~ VecScalar b Bool) => a -> a -> d
+
 PrimGreaterThanEqual
   :: forall (a :: _) (b :: _) (c :: _) (d :: _)
     . (Num c, a ~ VecScalar b c, d ~ VecScalar b Bool) => a -> a -> d
+
 PrimEqualV
   :: forall (a :: _) (b :: _) (c :: _) (d :: _)
     . (Num c, a ~ VecScalar b c, d ~ VecScalar b Bool) => a -> a -> d
+
 PrimNotEqualV
   :: forall (a :: _) (b :: _) (c :: _) (d :: _)
     . (Num c, a ~ VecScalar b c, d ~ VecScalar b Bool) => a -> a -> d
+
 PrimEqual
   :: forall (a :: _) (b :: _) . (b ~ MatVecScalarElem a) => a -> a -> Bool
+
 PrimNotEqual
   :: forall (a :: _) (b :: _) . (b ~ MatVecScalarElem a) => a -> a -> Bool
+
 PrimDFdx :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimDFdy :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimFWidth :: forall (a :: _) (b :: _) . (a ~ VecScalar b Float) => a -> a
+
 PrimNoise1 :: forall (a :: _) . VecScalar a Float -> Float
+
 PrimNoise2 :: forall (a :: _) . VecScalar a Float -> Vec (fromInt 2) Float
+
 PrimNoise3 :: forall (a :: _) . VecScalar a Float -> Vec (fromInt 3) Float
+
 PrimNoise4 :: forall (a :: _) . VecScalar a Float -> Vec (fromInt 4) Float
+
 head
   = \(a :: _) -> case'List (\_ -> _) (_rhs undefined) (\(b :: _) _ -> _rhs b) a
+
 (++)
   = \(a :: _) (b :: _) -> case'List
     (\_ -> _)
     (_rhs b)
     (\(c :: _) (d :: _) -> _rhs (c : d ++ b))
     a
+
 foldr
   = \(a :: _) (b :: _) (c :: _) -> case'List
     (\_ -> _)
     (_rhs b)
     (\(d :: _) (e :: _) -> _rhs (a d (foldr a b e)))
     c
+
 concat = _rhs (foldr (++) [])
+
 map
   = \(a :: _) (b :: _) -> case'List
     (\_ -> _)
     (_rhs [])
     (\(c :: _) (d :: _) -> _rhs (a c : map a d))
     b
+
 concatMap :: forall (a :: _) (b :: _) . (a -> [b]) -> [a] -> [b]
 concatMap = \(a :: _) (b :: _) -> _rhs (concat (map a b))
+
 len
   = \(a :: _) -> case'List
     (\_ -> _)
     (_rhs (fromInt 0))
     (\_ (b :: _) -> _rhs (fromInt 1 `primAddInt` len b))
     a
+
 data Maybe (_ :: Type) :: Type where
     Nothing :: forall a . Maybe a
     Just :: forall b . b -> Maybe b
+
 data Vector (_ :: Nat) (_ :: Type) :: Type where
     
+
 data PrimitiveType :: Type where
     Triangle :: PrimitiveType
     Line :: PrimitiveType
     Point :: PrimitiveType
     TriangleAdjacency :: PrimitiveType
     LineAdjacency :: PrimitiveType
+
 data Primitive (_ :: Type) :: PrimitiveType -> Type where
     PrimPoint :: forall a . a -> Primitive a Point
     PrimLine :: forall b . b -> b -> Primitive b Line
     PrimTriangle :: forall c . c -> c -> c -> Primitive c Triangle
+
 mapPrimitive
   :: forall (a :: _) (b :: _) (c :: _)
     . (a -> b) -> Primitive a c -> Primitive b c
+
 'PrimitiveStream = \(a :: _) (b :: _) -> _rhs ['Primitive b a]
+
 mapPrimitives
   :: forall (a :: _) (b :: _) (c :: _)
     . (a -> b) -> PrimitiveStream c a -> PrimitiveStream c b
 mapPrimitives = \(a :: _) -> _rhs (map (mapPrimitive a))
+
 'ListElem :: Type -> Type
 'ListElem = \(a :: _) -> match'List (\_ -> _) (\(b :: _) -> _rhs b) a undefined
+
 fetchArrays
   :: forall (a :: _) (b :: _) (c :: _)
     . (b ~ map ListElem c) => HList c -> PrimitiveStream a (HList b)
+
 fetch
   :: forall (a :: _) (b :: _) . String -> HList b -> PrimitiveStream a (HList b)
+
 Attribute :: forall (a :: _) . String -> a
+
 fetchStream
   :: forall (a :: _) (b :: [Type])
     . String
       -> forall (c :: [String]) -> (len c ~ len b) => PrimitiveStream a (HList b)
+
 data SimpleFragment (_ :: Type) :: Type where
     SimpleFragment :: forall a . Vec (fromInt 3) Float -> a -> SimpleFragment a
+
 'Fragment = \(a :: _) (b :: _) -> _rhs ('Vector a ('Maybe ('SimpleFragment b)))
+
 sFragmentCoords
   = \(a :: _) -> case'SimpleFragment (\_ -> _) (\(b :: _) _ -> _rhs b) a
+
 sFragmentValue
   = \(a :: _) -> case'SimpleFragment (\_ -> _) (\_ (b :: _) -> _rhs b) a
+
 'FragmentStream = \(a :: _) (b :: _) -> _rhs ['Fragment a b]
+
 customizeDepth
   :: forall (a :: _) (b :: _) . (a -> Float) -> Fragment b a -> Fragment b a
+
 customizeDepths
   :: forall (a :: _) (b :: _)
     . (a -> Float) -> FragmentStream b a -> FragmentStream b a
 customizeDepths = \(a :: _) -> _rhs (map (customizeDepth a))
+
 filterFragment
   :: forall (a :: _) (b :: _) . (a -> Bool) -> Fragment b a -> Fragment b a
+
 filterFragments
   :: forall (a :: _) (b :: _)
     . (a -> Bool) -> FragmentStream b a -> FragmentStream b a
 filterFragments = \(a :: _) -> _rhs (map (filterFragment a))
+
 mapFragment
   :: forall (a :: _) (b :: _) (c :: _) . (a -> b) -> Fragment c a -> Fragment c b
+
 mapFragments
   :: forall (a :: _) (b :: _) (c :: _)
     . (a -> b) -> FragmentStream c a -> FragmentStream c b
 mapFragments = \(a :: _) -> _rhs (map (mapFragment a))
+
 data ImageKind :: Type where
     Color :: Type -> ImageKind
     Depth :: ImageKind
     Stencil :: ImageKind
+
 imageType :: ImageKind -> Type
 imageType
   = \(a :: _) -> case'ImageKind
@@ -747,20 +900,28 @@ imageType
     (_rhs 'Float)
     (_rhs 'Int)
     a
+
 data Image (_ :: Nat) (_ :: ImageKind) :: Type where
     
+
 ColorImage
   :: forall (a :: _) (b :: _) (c :: _) (d :: _)
     . (Num c, d ~ VecScalar b c) => d -> Image a (Color d)
+
 DepthImage :: forall (a :: _) . Float -> Image a Depth
+
 StencilImage :: forall (a :: _) . Int -> Image a Stencil
+
 emptyDepthImage = _rhs (DepthImage @(fromInt 1))
+
 emptyColorImage = _rhs (ColorImage @(fromInt 1))
+
 data Swizz :: Type where
     Sx :: Swizz
     Sy :: Swizz
     Sz :: Swizz
     Sw :: Swizz
+
 swizzscalar :: forall (a :: _) (b :: _) . Vec b a -> Swizz -> a
 swizzscalar
   = \(a :: _) (b :: _) -> case'VecS
@@ -787,6 +948,7 @@ swizzscalar
       (_rhs k)
       b)
     a
+
 definedVec :: forall (a :: _) (b :: _) . Vec b a -> Bool
 definedVec
   = \(a :: _) -> case'VecS
@@ -795,6 +957,7 @@ definedVec
     (\_ _ _ -> _rhs True)
     (\_ _ _ _ -> _rhs True)
     a
+
 swizzvector
   :: forall (a :: _) (b :: _) (c :: _) . Vec b a -> Vec c Swizz -> Vec c a
 swizzvector
@@ -803,6 +966,7 @@ swizzvector
     (_rhs undefined)
     (_rhs (mapVec (swizzscalar a) b))
     (definedVec a)
+
 data BlendingFactor :: Type where
     ZeroBF :: BlendingFactor
     OneBF :: BlendingFactor
@@ -819,12 +983,14 @@ data BlendingFactor :: Type where
     ConstantAlpha :: BlendingFactor
     OneMinusConstantAlpha :: BlendingFactor
     SrcAlphaSaturate :: BlendingFactor
+
 data BlendEquation :: Type where
     FuncAdd :: BlendEquation
     FuncSubtract :: BlendEquation
     FuncReverseSubtract :: BlendEquation
     Min :: BlendEquation
     Max :: BlendEquation
+
 data LogicOperation :: Type where
     Clear :: LogicOperation
     And :: LogicOperation
@@ -842,6 +1008,7 @@ data LogicOperation :: Type where
     OrInverted :: LogicOperation
     Nand :: LogicOperation
     Set :: LogicOperation
+
 data StencilOperation :: Type where
     OpZero :: StencilOperation
     OpKeep :: StencilOperation
@@ -851,6 +1018,7 @@ data StencilOperation :: Type where
     OpDecr :: StencilOperation
     OpDecrWrap :: StencilOperation
     OpInvert :: StencilOperation
+
 data ComparisonFunction :: Type where
     Never :: ComparisonFunction
     Less :: ComparisonFunction
@@ -860,28 +1028,37 @@ data ComparisonFunction :: Type where
     Notequal :: ComparisonFunction
     Gequal :: ComparisonFunction
     Always :: ComparisonFunction
+
 data ProvokingVertex :: Type where
     LastVertex :: ProvokingVertex
     FirstVertex :: ProvokingVertex
+
 data CullMode :: Type where
     CullFront :: CullMode
     CullBack :: CullMode
     CullNone :: CullMode
+
 data PointSize (_ :: Type) :: Type where
     PointSize :: forall a . Float -> PointSize a
     ProgramPointSize :: forall b . (b -> Float) -> PointSize b
+
 data PolygonMode (_ :: Type) :: Type where
     PolygonFill :: forall a . PolygonMode a
     PolygonPoint :: forall b . PointSize b -> PolygonMode b
     PolygonLine :: forall c . Float -> PolygonMode c
+
 data PolygonOffset :: Type where
     NoOffset :: PolygonOffset
     Offset :: Float -> Float -> PolygonOffset
+
 data PointSpriteCoordOrigin :: Type where
     LowerLeft :: PointSpriteCoordOrigin
     UpperLeft :: PointSpriteCoordOrigin
+
 primTexture :: HList '[] -> Vec (fromInt 2) Float -> Vec (fromInt 4) Float
+
 Uniform :: forall (a :: _) . String -> a
+
 data RasterContext (_ :: Type) :: PrimitiveType -> Type where
     TriangleCtx
       :: forall a
@@ -891,6 +1068,7 @@ data RasterContext (_ :: Type) :: PrimitiveType -> Type where
       :: forall b
         . PointSize b -> Float -> PointSpriteCoordOrigin -> RasterContext b Point
     LineCtx :: forall c . Float -> ProvokingVertex -> RasterContext c Line
+
 data Blending :: Type -> Type where
     NoBlending :: forall (a :: _) . Blending a
     BlendLogicOp :: forall (b :: _) . Integral b => LogicOperation -> Blending b
@@ -900,10 +1078,13 @@ data Blending :: Type -> Type where
             (HList (BlendingFactor : BlendingFactor : '[])
               : HList (BlendingFactor : BlendingFactor : '[]) : '[])
           -> Vec (fromInt 4) Float -> Blending Float
+
 data StencilTests :: Type where
     
+
 data StencilOps :: Type where
     
+
 data FragmentOperation :: ImageKind -> Type where
     ColorOp
       :: forall (a :: _) (b :: _)
@@ -912,21 +1093,26 @@ data FragmentOperation :: ImageKind -> Type where
     DepthOp :: ComparisonFunction -> Bool -> FragmentOperation Depth
     StencilOp
       :: StencilTests -> StencilOps -> StencilOps -> FragmentOperation Stencil
+
 data Interpolated (_ :: Type) :: Type where
     Smooth :: forall a . Floating a => Interpolated a
     NoPerspective :: forall b . Floating b => Interpolated b
     Flat :: forall c . Interpolated c
+
 rasterizePrimitive
   :: forall (a :: _) (b :: _) (c :: _) (d :: _)
     . (map Interpolated a ~ b, c ~ Vec (fromInt 4) Float : a)
       => HList b
         -> RasterContext (HList c) d
           -> Primitive (HList c) d -> FragmentStream (fromInt 1) (HList a)
+
 rasterizePrimitives
   = \(a :: _) (b :: _) (c :: _) -> _rhs (concat (map (rasterizePrimitive b a) c))
+
 'ImageLC :: Type -> Nat
 'ImageLC
   = \(a :: _) -> match'Image (\_ -> _) (\(b :: _) _ -> _rhs b) a undefined
+
 allSame :: forall (a :: _) . [a] -> Type
 allSame
   = \(a :: _) -> case'List
@@ -938,9 +1124,12 @@ allSame
       (\(d :: _) (e :: _) -> _rhs ('T2 (b `'EqCTt` d) (allSame (d : e))))
       c)
     a
+
 sameLayerCounts = \(a :: _) -> _rhs (allSame (map 'ImageLC a))
+
 data FrameBuffer (_ :: Nat) (_ :: [ImageKind]) :: Type where
     
+
 imageType' :: [ImageKind] -> [Type]
 imageType'
   = \(a :: _) -> case'List
@@ -953,6 +1142,7 @@ imageType'
       (_rhs (map imageType a))
       b)
     a
+
 'FragmentOperationKind :: Type -> ImageKind
 'FragmentOperationKind
   = \(a :: _) -> match'FragmentOperation
@@ -960,12 +1150,15 @@ imageType'
     (\(b :: _) -> _rhs b)
     a
     undefined
+
 Accumulate
   :: forall (a :: _) (b :: Nat) (c :: [Type])
     . (a ~ map FragmentOperationKind c)
       => HList c
         -> FragmentStream b (HList (imageType' a)) -> FrameBuffer b a -> FrameBuffer b a
+
 accumulateWith = \(a :: _) (b :: _) -> _rhs (HCons a (HCons b HNil))
+
 overlay
   = \(a :: _) (b :: _) -> hlistConsCase
     _
@@ -974,43 +1167,57 @@ overlay
       (\(e :: _) (f :: _) -> hlistNilCase _ (_rhs (Accumulate c e a)) f)
       d)
     b
+
 infixl 0 overlay
+
 'GetImageKind :: Type -> ImageKind
 'GetImageKind
   = \(a :: _) -> match'Image (\_ -> _) (\_ (b :: _) -> _rhs b) a undefined
+
 FrameBuffer
   :: forall (a :: [Type])
     . sameLayerCounts a
       => HList a -> FrameBuffer (ImageLC (head a)) (map GetImageKind a)
+
 imageFrame = _rhs FrameBuffer
+
 accumulate
   = \(a :: _) (b :: _) (c :: _) (d :: _) -> _rhs
     (Accumulate a (mapFragments b c) d)
+
 PrjImage
   :: forall (a :: _) . FrameBuffer (fromInt 1) (a : '[]) -> Image (fromInt 1) a
+
 PrjImageColor
   :: FrameBuffer (fromInt 1) ('Depth : 'Color (Vec (fromInt 4) Float) : '[])
     -> Image (fromInt 1) (Color (Vec (fromInt 4) Float))
+
 data Output :: Type where
     ScreenOut :: forall (a :: _) (b :: _) . FrameBuffer a b -> Output
+
 renderFrame = _rhs ScreenOut
+
 data Texture :: Type where
     Texture2DSlot :: String -> Texture
     Texture2D
       :: Vec (fromInt 2) Int
         -> Image (fromInt 1) (Color (Vec (fromInt 4) Float)) -> Texture
+
 data Filter :: Type where
     PointFilter :: Filter
     LinearFilter :: Filter
+
 data EdgeMode :: Type where
     Repeat :: EdgeMode
     MirroredRepeat :: EdgeMode
     ClampToEdge :: EdgeMode
+
 data Sampler :: Type where
     Sampler :: Filter -> EdgeMode -> Texture -> Sampler
+
 texture2D :: Sampler -> Vec (fromInt 2) Float -> Vec (fromInt 4) Float
+
 accumulationContext = \(a :: _) -> _rhs a
-main is not found
 ------------ trace
 id :: forall a . a -> a
 'VecS :: Type -> Nat -> Type
diff --git a/testdata/Internals.out b/testdata/Internals.out
index b3eac04a..22ff0f64 100644
--- a/testdata/Internals.out
+++ b/testdata/Internals.out
@@ -1,60 +1,100 @@
+main is not found
 ------------ desugared source code
 typeAnn = \(a :: _) -> _rhs a
+
 parens = \(a :: _) -> _rhs a
+
 undefined :: forall a . a
+
 primFix :: forall a . (a -> a) -> a
+
 data Unit :: Type where
     TT :: Unit
+
 data String :: Type where
     
+
 data Empty (_ :: String) :: Type where
     
+
 unsafeCoerce :: forall (a :: _) (b :: _) . a -> b
+
 'EqCT :: forall a -> a -> a -> Type
+
 parEval :: forall (a :: _) -> a -> a -> a
+
 'T2 :: Type -> Type -> Type
+
 match'Type :: forall (a :: Type -> Type) -> a Type -> forall b -> a b -> a b
+
 'EqCTt = _rhs ('EqCT (_ :: _))
+
 t2C :: Unit -> Unit -> Unit
+
 data Int :: Type where
     
+
 data Word :: Type where
     
+
 data Float :: Type where
     
+
 data Char :: Type where
     
+
 data Bool :: Type where
     False :: Bool
     True :: Bool
+
 data Ordering :: Type where
     LT :: Ordering
     EQ :: Ordering
     GT :: Ordering
+
 data Nat :: Type where
     Zero :: Nat
     Succ :: Nat -> Nat
+
 primIntToWord :: Int -> Word
+
 primIntToFloat :: Int -> Float
+
 primIntToNat :: Int -> Nat
+
 primCompareInt :: Int -> Int -> Ordering
+
 primCompareWord :: Word -> Word -> Ordering
+
 primCompareFloat :: Float -> Float -> Ordering
+
 primCompareChar :: Char -> Char -> Ordering
+
 primCompareString :: String -> String -> Ordering
+
 primNegateInt :: Int -> Int
+
 primNegateWord :: Word -> Word
+
 primNegateFloat :: Float -> Float
+
 primAddInt :: Int -> Int -> Int
+
 primSubInt :: Int -> Int -> Int
+
 primModInt :: Int -> Int -> Int
+
 primSqrtFloat :: Float -> Float
+
 primRound :: Float -> Int
+
 primIfThenElse :: forall (a :: _) . Bool -> a -> a -> a
 primIfThenElse
   = \(a :: _) (b :: _) (c :: _) -> case'Bool (\_ -> _) (_rhs c) (_rhs b) a
+
 isEQ
   = \(a :: _) -> case'Ordering (\_ -> _) (_rhs False) (_rhs True) (_rhs False) a
+
 'Num :: Type -> Type
 'Num
   = \(a :: _) -> match'Int
@@ -74,6 +114,7 @@ isEQ
           (_rhs 'Unit)
           a
           (_rhs ('Empty "no instance of 'Num on ???")))))
+
 fromInt :: forall a . Num a => Int -> a
 fromInt
   = \ @a @_ -> match'Int
@@ -89,6 +130,7 @@ fromInt
         (_rhs \(e := _rhs primIntToFloat) -> e)
         a
         (match'Nat (\_ -> _) (_rhs \(f := _rhs primIntToNat) -> f) a (_rhs undefined))))
+
 compare :: forall a . Num a => a -> a -> Ordering
 compare
   = \ @a @_ -> match'Int
@@ -104,6 +146,7 @@ compare
         (_rhs \(d := _rhs primCompareFloat) -> d)
         a
         (match'Nat (\_ -> _) (_rhs \(e := _rhs undefined) -> e) a (_rhs undefined))))
+
 negate :: forall a . Num a => a -> a
 negate
   = \ @a @_ -> match'Int
@@ -119,6 +162,7 @@ negate
         (_rhs \(d := _rhs primNegateFloat) -> d)
         a
         (match'Nat (\_ -> _) (_rhs \(e := _rhs undefined) -> e) a (_rhs undefined))))
+
 'Eq :: Type -> Type
 'Eq
   = \(a :: _) -> match'String
@@ -146,6 +190,7 @@ negate
               (_rhs 'Unit)
               a
               (_rhs ('Empty "no instance of 'Eq on ???")))))))
+
 (==) :: forall a . Eq a => a -> a -> Bool
 (==)
   = \ @a @_ -> match'String
@@ -185,19 +230,24 @@ negate
                     r) -> q)
               a
               (_rhs undefined))))))
+
 infix 4 ==
+
 data List (_ :: Type) :: Type where
     [] :: forall a . [a]
     (:) :: forall b . b -> [b] -> [b]
+
 infixr 5 :
+
 data HList :: [Type] -> Type where
     HNil :: HList '[]
     HCons :: forall (a :: _) (b :: _) . a -> HList b -> HList (a : b)
+
 hlistNilCase :: forall (a :: _) -> a -> HList [] -> a
+
 hlistConsCase
   :: forall a (b :: [Type])
     . forall (c :: _) -> (a -> HList b -> c) -> HList (a : b) -> c
-main is not found
 ------------ trace
 typeAnn :: forall a . a -> a
 parens :: forall a . a -> a
diff --git a/testdata/Material.out b/testdata/Material.out
index 360c8021..27c646fd 100644
--- a/testdata/Material.out
+++ b/testdata/Material.out
@@ -1,16 +1,23 @@
+main is not found
 ------------ desugared source code
 identityLight :: Float
 identityLight = _rhs (fromInt 1)
+
 data Entity :: Type where
     Entity
       :: Vec (fromInt 4) Float
         -> Vec (fromInt 4) Float
           -> Vec (fromInt 3) Float -> Vec (fromInt 4) Float -> Entity
+
 eAmbientLight = \(a :: _) -> case'Entity (\_ -> _) (\(b :: _) _ _ _ -> _rhs b) a
+
 eDirectedLight
   = \(a :: _) -> case'Entity (\_ -> _) (\_ (b :: _) _ _ -> _rhs b) a
+
 eLightDir = \(a :: _) -> case'Entity (\_ -> _) (\_ _ (b :: _) _ -> _rhs b) a
+
 eShaderRGBA = \(a :: _) -> case'Entity (\_ -> _) (\_ _ _ (b :: _) -> _rhs b) a
+
 data WaveType :: Type where
     WT_Sin :: WaveType
     WT_Triangle :: WaveType
@@ -18,8 +25,10 @@ data WaveType :: Type where
     WT_Sawtooth :: WaveType
     WT_InverseSawtooth :: WaveType
     WT_Noise :: WaveType
+
 data Wave :: Type where
     Wave :: WaveType -> Float -> Float -> Float -> Float -> Wave
+
 data Deform :: Type where
     D_AutoSprite :: Deform
     D_AutoSprite2 :: Deform
@@ -36,10 +45,12 @@ data Deform :: Type where
     D_Text6 :: Deform
     D_Text7 :: Deform
     D_Wave :: Float -> Wave -> Deform
+
 data CullType :: Type where
     CT_FrontSided :: CullType
     CT_BackSided :: CullType
     CT_TwoSided :: CullType
+
 data Blending' :: Type where
     B_DstAlpha :: Blending'
     B_DstColor :: Blending'
@@ -52,6 +63,7 @@ data Blending' :: Type where
     B_SrcAlphaSaturate :: Blending'
     B_SrcColor :: Blending'
     B_Zero :: Blending'
+
 data RGBGen :: Type where
     RGB_Wave :: Wave -> RGBGen
     RGB_Const :: Float -> Float -> Float -> RGBGen
@@ -64,6 +76,7 @@ data RGBGen :: Type where
     RGB_LightingDiffuse :: RGBGen
     RGB_OneMinusVertex :: RGBGen
     RGB_Undefined :: RGBGen
+
 data AlphaGen :: Type where
     A_Wave :: Wave -> AlphaGen
     A_Const :: Float -> AlphaGen
@@ -74,12 +87,14 @@ data AlphaGen :: Type where
     A_Vertex :: AlphaGen
     A_LightingSpecular :: AlphaGen
     A_OneMinusVertex :: AlphaGen
+
 data TCGen :: Type where
     TG_Base :: TCGen
     TG_Lightmap :: TCGen
     TG_Environment :: TCGen
     TG_Vector :: Vec (fromInt 3) Float -> Vec (fromInt 3) Float -> TCGen
     TG_Undefined :: TCGen
+
 data TCMod :: Type where
     TM_EntityTranslate :: TCMod
     TM_Rotate :: Float -> TCMod
@@ -88,19 +103,23 @@ data TCMod :: Type where
     TM_Stretch :: Wave -> TCMod
     TM_Transform :: Float -> Float -> Float -> Float -> Float -> Float -> TCMod
     TM_Turb :: Float -> Float -> Float -> Float -> TCMod
+
 data StageTexture :: Type where
     ST_Map :: String -> StageTexture
     ST_ClampMap :: String -> StageTexture
     ST_AnimMap :: Float -> [String] -> StageTexture
     ST_Lightmap :: StageTexture
     ST_WhiteImage :: StageTexture
+
 data AlphaFunction :: Type where
     A_Gt0 :: AlphaFunction
     A_Lt128 :: AlphaFunction
     A_Ge128 :: AlphaFunction
+
 data DepthFunction :: Type where
     D_Equal :: DepthFunction
     D_Lequal :: DepthFunction
+
 data StageAttrs :: Type where
     StageAttrs
       :: Maybe (HList (Blending' : Blending' : '[]))
@@ -110,61 +129,73 @@ data StageAttrs :: Type where
               -> [TCMod]
                 -> StageTexture
                   -> Bool -> DepthFunction -> Maybe AlphaFunction -> Bool -> String -> StageAttrs
+
 saBlend
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\(b :: _) _ _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
+
 saRGBGen
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\_ (b :: _) _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
+
 saAlphaGen
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\_ _ (b :: _) _ _ _ _ _ _ _ _ -> _rhs b)
     a
+
 saTCGen
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\_ _ _ (b :: _) _ _ _ _ _ _ _ -> _rhs b)
     a
+
 saTCMod
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\_ _ _ _ (b :: _) _ _ _ _ _ _ -> _rhs b)
     a
+
 saTexture
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\_ _ _ _ _ (b :: _) _ _ _ _ _ -> _rhs b)
     a
+
 saDepthWrite
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ (b :: _) _ _ _ _ -> _rhs b)
     a
+
 saDepthFunc
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ _ (b :: _) _ _ _ -> _rhs b)
     a
+
 saAlphaFunc
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ _ _ (b :: _) _ _ -> _rhs b)
     a
+
 saDepthMaskExplicit
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ _ _ _ (b :: _) _ -> _rhs b)
     a
+
 saTextureUniform
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ _ _ _ _ (b :: _) -> _rhs b)
     a
+
 defaultStageAttrs :: StageAttrs
 defaultStageAttrs
   = _rhs
@@ -180,6 +211,7 @@ defaultStageAttrs
       Nothing
       False
       "")
+
 data CommonAttrs :: Type where
     CommonAttrs
       :: HList '[]
@@ -189,66 +221,79 @@ data CommonAttrs :: Type where
               -> Bool
                 -> Bool
                   -> CullType -> [Deform] -> Bool -> Bool -> [StageAttrs] -> Bool -> CommonAttrs
+
 caSkyParms
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\(b :: _) _ _ _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
+
 caFogParms
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ (b :: _) _ _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
+
 caPortal
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ _ (b :: _) _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
+
 caSort
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ _ _ (b :: _) _ _ _ _ _ _ _ _ -> _rhs b)
     a
+
 caEntityMergable
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ _ _ _ (b :: _) _ _ _ _ _ _ _ -> _rhs b)
     a
+
 caFogOnly
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ _ _ _ _ (b :: _) _ _ _ _ _ _ -> _rhs b)
     a
+
 caCull
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ (b :: _) _ _ _ _ _ -> _rhs b)
     a
+
 caDeformVertexes
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ _ (b :: _) _ _ _ _ -> _rhs b)
     a
+
 caNoMipMaps
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ _ _ (b :: _) _ _ _ -> _rhs b)
     a
+
 caPolygonOffset
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ _ _ _ (b :: _) _ _ -> _rhs b)
     a
+
 caStages
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ _ _ _ _ (b :: _) _ -> _rhs b)
     a
+
 caIsSky
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ _ _ _ _ _ (b :: _) -> _rhs b)
     a
+
 defaultCommonAttrs :: CommonAttrs
 defaultCommonAttrs
   = _rhs
@@ -265,7 +310,6 @@ defaultCommonAttrs
       False
       []
       False)
-main is not found
 ------------ trace
 identityLight :: Float
 'Entity :: Type
diff --git a/testdata/Prelude.out b/testdata/Prelude.out
index 3e8b2b17..e1b26503 100644
--- a/testdata/Prelude.out
+++ b/testdata/Prelude.out
@@ -1,15 +1,27 @@
+main is not found
 ------------ desugared source code
 infixr 9 .
+
 infixl 7 PrimMulMatVec
+
 infixl 7 PrimDot
+
 infixr 5 ++
+
 infixr 3 ***
+
 infixr 0 $
+
 const = \(a :: _) _ -> _rhs a
+
 otherwise = _rhs True
+
 (&) = \(a :: _) (b :: _) -> _rhs (b a)
+
 ($) = _rhs \(a :: _) (b :: _) -> a b
+
 (.) = _rhs \(a :: _) (b :: _) (c :: _) -> a (b c)
+
 uncurry
   = \(a :: _) (b :: _) -> hlistConsCase
     _
@@ -18,6 +30,7 @@ uncurry
       (\(e :: _) (f :: _) -> hlistNilCase _ (_rhs (a c e)) f)
       d)
     b
+
 (***)
   = \(a :: _) (b :: _) (c :: _) -> hlistConsCase
     _
@@ -26,7 +39,9 @@ uncurry
       (\(f :: _) (g :: _) -> hlistNilCase _ (_rhs (HCons (a d) (HCons (b f) HNil))) g)
       e)
     c
+
 pi = _rhs 3.141592653589793
+
 zip :: forall (a :: _) (b :: _) . [a] -> [b] -> [HList (a : b : '[])]
 zip
   = \(a :: _) (b :: _) -> case'List
@@ -38,6 +53,7 @@ zip
       (\(e :: _) (f :: _) -> _rhs (HCons c (HCons e HNil) : zip d f))
       b)
     a
+
 unzip
   :: forall (a :: _) (b :: _) . [HList (a : b : '[])] -> HList ([a] : [b] : '[])
 unzip
@@ -70,6 +86,7 @@ unzip
         e)
       b)
     a
+
 filter
   = \(a :: _) (b :: _) -> case'List
     (\_ -> _)
@@ -77,23 +94,28 @@ filter
     (\(c :: _) (d :: _) -> _rhs
       ((\(e :: _) -> case'Bool (\_ -> _) (filter a d) (c : filter a d) e) (a c)))
     b
+
 tail :: forall (a :: _) . [a] -> [a]
 tail
   = \(a :: _) -> case'List (\_ -> _) (_rhs undefined) (\_ (b :: _) -> _rhs b) a
+
 pairs :: forall (a :: _) . [a] -> [HList (a : a : '[])]
 pairs = \(a :: _) -> _rhs (zip a (tail a))
+
 foldl'
   = \(a :: _) (b :: _) (c :: _) -> case'List
     (\_ -> _)
     (_rhs b)
     (\(d :: _) (e :: _) -> _rhs (foldl' a (a b d) e))
     c
+
 foldr1
   = \(a :: _) (b :: _) -> case'List
     (\_ -> _)
     (_rhs undefined)
     (\(c :: _) (d :: _) -> _rhs (foldr a c d))
     b
+
 split
   = \(a :: _) -> case'List
     (\_ -> _)
@@ -115,6 +137,7 @@ split
                   k)
                 d)) -> HCons (b : e) (HCons f HNil))
     a
+
 mergeBy
   = \(a :: _) (b :: _) (c :: _) -> case'List
     (\_ -> _)
@@ -132,6 +155,7 @@ mergeBy
           (a d f)))
       c)
     b
+
 sortBy
   = \(a :: _) (b :: _) -> case'List
     (\_ -> _)
@@ -142,8 +166,10 @@ sortBy
       (\_ _ -> _rhs (uncurry (mergeBy a) ((sortBy a *** sortBy a) (split b))))
       d)
     b
+
 iterate :: forall (a :: _) . (a -> a) -> a -> [a]
 iterate = \(a :: _) (b :: _) -> _rhs (b : iterate a (a b))
+
 fst
   = \(a :: _) -> hlistConsCase
     _
@@ -152,6 +178,7 @@ fst
       (\_ (d :: _) -> hlistNilCase _ (_rhs b) d)
       c)
     a
+
 snd
   = \(a :: _) -> hlistConsCase
     _
@@ -160,15 +187,23 @@ snd
       (\(c :: _) (d :: _) -> hlistNilCase _ (_rhs c) d)
       b)
     a
+
 (|||) = \(a :: _) (b :: _) -> case'Bool (\_ -> _) (_rhs b) (_rhs True) a
+
 infixr 2 |||
+
 (&&&) = \(a :: _) (b :: _) -> case'Bool (\_ -> _) (_rhs False) (_rhs b) a
+
 infixr 3 &&&
+
 data RecItem :: Type where
     RecItem :: String -> Type -> RecItem
+
 recItemType = \(a :: _) -> case'RecItem (\_ -> _) (\_ (b :: _) -> _rhs b) a
+
 data RecordC (_ :: [RecItem]) :: Type where
     RecordCons :: forall (a :: [RecItem]) . HList (map recItemType a) -> RecordC a
+
 isKeyC
   = \(a :: _) (b :: _) (c :: _) -> case'List
     (\_ -> _)
@@ -179,8 +214,11 @@ isKeyC
         (primIfThenElse (a == f) (b `'EqCTt` g) (isKeyC a b e)))
       d)
     c
+
 fstTup = _rhs (hlistConsCase (_ :: _) \(a :: _) _ -> a)
+
 sndTup = _rhs (hlistConsCase (_ :: _) \_ (a :: _) -> a)
+
 project
   :: forall (a :: _) (b :: [RecItem])
     . forall (c :: String) -> isKeyC c a b => RecordC b -> a
@@ -207,156 +245,304 @@ project
         d)
       e)
     b
+
 rgb = \(a :: _) (b :: _) (c :: _) -> _rhs (V4 a b c 1.0)
+
 black = _rhs (rgb 0.0 0.0 0.0)
+
 gray = _rhs (rgb 0.5 0.5 0.5)
+
 silver = _rhs (rgb 0.75 0.75 0.75)
+
 white = _rhs (rgb 1.0 1.0 1.0)
+
 maroon = _rhs (rgb 0.5 0.0 0.0)
+
 red = _rhs (rgb 1.0 0.0 0.0)
+
 olive = _rhs (rgb 0.5 0.5 0.0)
+
 yellow = _rhs (rgb 1.0 1.0 0.0)
+
 green = _rhs (rgb 0.0 0.5 0.0)
+
 lime = _rhs (rgb 0.0 1.0 0.0)
+
 teal = _rhs (rgb 0.0 0.5 0.5)
+
 aqua = _rhs (rgb 0.0 1.0 1.0)
+
 navy = _rhs (rgb 0.0 0.0 0.5)
+
 blue = _rhs (rgb 0.0 0.0 1.0)
+
 purple = _rhs (rgb 0.5 0.0 0.5)
+
 fuchsia = _rhs (rgb 1.0 0.0 1.0)
+
 colorImage1 = _rhs (ColorImage @(fromInt 1))
+
 colorImage2 = _rhs (ColorImage @(fromInt 2))
+
 depthImage1 = _rhs (DepthImage @(fromInt 1))
+
 v3FToV4F :: Vec (fromInt 3) Float -> Vec (fromInt 4) Float
 v3FToV4F
   = \(a :: _) -> _rhs
     (V4 (swizzscalar a Sx) (swizzscalar a Sy) (swizzscalar a Sz) (fromInt 1))
+
 radians = _rhs PrimRadians
+
 degrees = _rhs PrimDegrees
+
 sin = _rhs PrimSin
+
 cos = _rhs PrimCos
+
 tan = _rhs PrimTan
+
 sinh = _rhs PrimSinH
+
 cosh = _rhs PrimCosH
+
 tanh = _rhs PrimTanH
+
 asin = _rhs PrimASin
+
 asinh = _rhs PrimASinH
+
 acos = _rhs PrimACos
+
 acosh = _rhs PrimACosH
+
 atan = _rhs PrimATan
+
 atanh = _rhs PrimATanH
+
 atan2 = _rhs PrimATan2
+
 pow = _rhs PrimPow
+
 exp = _rhs PrimExp
+
 log = _rhs PrimLog
+
 exp2 = _rhs PrimExp2
+
 log2 = _rhs PrimLog2
+
 sqrt = _rhs PrimSqrt
+
 inversesqrt = _rhs PrimInvSqrt
+
 abs = _rhs PrimAbs
+
 sign = _rhs PrimSign
+
 floor = _rhs PrimFloor
+
 trunc = _rhs PrimTrunc
+
 round = _rhs PrimRound
+
 roundEven = _rhs PrimRoundEven
+
 ceil = _rhs PrimCeil
+
 fract = _rhs PrimFract
+
 mod = _rhs PrimMod
+
 min = _rhs PrimMin
+
 max = _rhs PrimMax
+
 modF = _rhs PrimModF
+
 clamp = _rhs PrimClamp
+
 clampS = _rhs PrimClampS
+
 mix = _rhs PrimMix
+
 mixS = _rhs PrimMixS
+
 mixB = _rhs PrimMixB
+
 step = _rhs PrimStep
+
 stepS = _rhs PrimStepS
+
 smoothstep = _rhs PrimSmoothStep
+
 smoothstepS = _rhs PrimSmoothStepS
+
 isNan = _rhs PrimIsNan
+
 isInf = _rhs PrimIsInf
+
 dFdx = _rhs PrimDFdx
+
 dFdy = _rhs PrimDFdy
+
 fWidth = _rhs PrimFWidth
+
 noise1 = _rhs PrimNoise1
+
 noise2 = _rhs PrimNoise2
+
 noise3 = _rhs PrimNoise3
+
 noise4 = _rhs PrimNoise4
+
 length = _rhs PrimLength
+
 distance = _rhs PrimDistance
+
 dot = _rhs PrimDot
+
 cross = _rhs PrimCross
+
 normalize = _rhs PrimNormalize
+
 faceforward = _rhs PrimFaceForward
+
 reflect = _rhs PrimReflect
+
 refract = _rhs PrimRefract
+
 transpose = _rhs PrimTranspose
+
 det = _rhs PrimDeterminant
+
 inv = _rhs PrimInverse
+
 outer = _rhs PrimOuterProduct
+
 bAnd = _rhs PrimBAnd
+
 bOr = _rhs PrimBOr
+
 bXor = _rhs PrimBXor
+
 bNot = _rhs PrimBNot
+
 bAndS = _rhs PrimBAndS
+
 bOrS = _rhs PrimBOrS
+
 bXorS = _rhs PrimBXorS
+
 shiftL = _rhs PrimBShiftL
+
 shiftR = _rhs PrimBShiftR
+
 shiftLS = _rhs PrimBShiftLS
+
 shiftRS = _rhs PrimBShiftRS
+
 floatBitsToInt = _rhs PrimFloatBitsToInt
+
 floatBitsToWord = _rhs PrimFloatBitsToUInt
+
 intBitsToFloat = _rhs PrimIntBitsToFloat
+
 wordBitsToFloat = _rhs PrimUIntBitsToFloat
+
 infixl 7 *
+
 infixl 7 /
+
 infixl 7 %
+
 infixl 6 +
+
 infixl 6 -
+
 infix 4 /=
+
 infix 4 <
+
 infix 4 <=
+
 infix 4 >=
+
 infix 4 >
+
 infixr 3 &&
+
 infixr 2 ||
+
 infix 7 dot
+
 infix 7 cross
+
 infixr 7 *.
+
 infixl 7 .*
+
 infixl 7 .*.
+
 (+) = \(a :: _) (b :: _) -> _rhs (PrimAdd a b)
+
 (-) = \(a :: _) (b :: _) -> _rhs (PrimSub a b)
+
 (*) = \(a :: _) (b :: _) -> _rhs (PrimMul a b)
+
 (/) = \(a :: _) (b :: _) -> _rhs (PrimDiv a b)
+
 (%) = \(a :: _) (b :: _) -> _rhs (PrimMod a b)
+
 neg = \(a :: _) -> _rhs (PrimNeg a)
+
 (/=) = \(a :: _) (b :: _) -> _rhs (PrimNotEqual a b)
+
 (<) = \(a :: _) (b :: _) -> _rhs (PrimLessThan a b)
+
 (<=) = \(a :: _) (b :: _) -> _rhs (PrimLessThanEqual a b)
+
 (>=) = \(a :: _) (b :: _) -> _rhs (PrimGreaterThanEqual a b)
+
 (>) = \(a :: _) (b :: _) -> _rhs (PrimGreaterThan a b)
+
 (&&) = \(a :: _) (b :: _) -> _rhs (PrimAnd a b)
+
 (||) = \(a :: _) (b :: _) -> _rhs (PrimOr a b)
+
 xor = _rhs PrimXor
+
 not = \(a :: _) -> _rhs (PrimNot a)
+
 any = \(a :: _) -> _rhs (PrimAny a)
+
 all = \(a :: _) -> _rhs (PrimAll a)
+
 (.*.) = \(a :: _) (b :: _) -> _rhs (PrimMulMatMat a b)
+
 (*.) = \(a :: _) (b :: _) -> _rhs (PrimMulMatVec a b)
+
 (.*) = \(a :: _) (b :: _) -> _rhs (PrimMulVecMat a b)
+
 infixl 7 *!
+
 infixl 7 /!
+
 infixl 7 %!
+
 infixl 6 +!
+
 infixl 6 -!
+
 (+!) = \(a :: _) (b :: _) -> _rhs (PrimAddS a b)
+
 (-!) = \(a :: _) (b :: _) -> _rhs (PrimSubS a b)
+
 (*!) = \(a :: _) (b :: _) -> _rhs (PrimMulS a b)
+
 (/!) = \(a :: _) (b :: _) -> _rhs (PrimDivS a b)
+
 (%!) = \(a :: _) (b :: _) -> _rhs (PrimModS a b)
+
 perspective
   :: Float -> Float -> Float -> Float -> Mat (fromInt 4) (fromInt 4) Float
 perspective
@@ -376,6 +562,7 @@ perspective
         (fromInt 0)
         (fromInt 0 - fromInt 2 * b * a / (b - a))
         (fromInt 0))
+
 rotMatrixZ
   = \(a :: _) -> _rhs
     \(b := _rhs (cos a)) (c := _rhs (sin a)) -> M44F
@@ -383,6 +570,7 @@ rotMatrixZ
       (V4 (fromInt 0 - c) b (fromInt 0) (fromInt 0))
       (V4 (fromInt 0) (fromInt 0) (fromInt 1) (fromInt 0))
       (V4 (fromInt 0) (fromInt 0) (fromInt 0) (fromInt 1))
+
 rotMatrixY
   = \(a :: _) -> _rhs
     \(b := _rhs (cos a)) (c := _rhs (sin a)) -> M44F
@@ -390,6 +578,7 @@ rotMatrixY
       (V4 (fromInt 0) (fromInt 1) (fromInt 0) (fromInt 0))
       (V4 c (fromInt 0) b (fromInt 0))
       (V4 (fromInt 0) (fromInt 0) (fromInt 0) (fromInt 1))
+
 rotMatrixX
   = \(a :: _) -> _rhs
     \(b := _rhs (cos a)) (c := _rhs (sin a)) -> M44F
@@ -397,9 +586,11 @@ rotMatrixX
       (V4 (fromInt 0) b c (fromInt 0))
       (V4 (fromInt 0) (fromInt 0 - c) b (fromInt 0))
       (V4 (fromInt 0) (fromInt 0) (fromInt 0) (fromInt 1))
+
 rotationEuler
   = \(a :: _) (b :: _) (c :: _) -> _rhs
     (rotMatrixY a .*. rotMatrixX b .*. rotMatrixZ c)
+
 translateBefore4 :: Vec (fromInt 3) Float -> Mat (fromInt 4) (fromInt 4) Float
 translateBefore4
   = \(a :: _) -> _rhs
@@ -413,6 +604,7 @@ translateBefore4
                 (swizzscalar a Sy)
                 (swizzscalar a Sz)
                 (fromInt 1))) -> M44F b c d e
+
 lookat
   :: Vec (fromInt 3) Float
     -> Vec (fromInt 3) Float
@@ -434,7 +626,9 @@ lookat
                     (d e)
                     (V4 (fromInt 0) (fromInt 0) (fromInt 0) (fromInt 1)))) -> h
       .*. translateBefore4 (neg a)
+
 scale = \(a :: _) (b :: _) -> _rhs (b * V4 a a a 1.0)
+
 fromTo :: Float -> Float -> [Float]
 fromTo
   = \(a :: _) (b :: _) -> case'Bool
@@ -442,6 +636,7 @@ fromTo
     (_rhs (a : fromTo (a + fromInt 1) b))
     (_rhs [])
     (a > b)
+
 (!!) :: forall (a :: _) . [a] -> Int -> a
 (!!)
   = \(a :: _) (b :: _) -> case'List
@@ -453,7 +648,6 @@ fromTo
       (_rhs c)
       (fromInt 0 == b))
     a
-main is not found
 ------------ trace
 const :: forall a b . a -> b -> a
 otherwise :: Bool
diff --git a/testdata/SampleMaterial.out b/testdata/SampleMaterial.out
index 91701a48..d0bc2e7d 100644
--- a/testdata/SampleMaterial.out
+++ b/testdata/SampleMaterial.out
@@ -1,3 +1,4 @@
+main is not found
 ------------ desugared source code
 sampleMaterial
   = _rhs
@@ -2076,7 +2077,6 @@ sampleMaterial
                                                                                                               False)
                                                                                                             HNil)
                                                                                                         : [])
-main is not found
 ------------ trace
 sampleMaterial :: [(String, CommonAttrs)]
 ------------ tooltips
diff --git a/testdata/ambig.out b/testdata/ambig.out
index ce1a76fb..53770b84 100644
--- a/testdata/ambig.out
+++ b/testdata/ambig.out
@@ -1,3 +1,4 @@
+main is not found
 ------------ desugared source code
 h
   = \(a :: _) (b :: _) _ -> _rhs
@@ -11,7 +12,6 @@ h
               f)
             d)
           b)) -> c
-main is not found
 ------------ trace
 h :: forall a b c d . (b -> d -> c) -> (b, d) -> a -> c
 ------------ tooltips
diff --git a/testdata/complex.out b/testdata/complex.out
index 1ae39c8d..18a95a8c 100644
--- a/testdata/complex.out
+++ b/testdata/complex.out
@@ -1,15 +1,21 @@
+main is not found
 ------------ desugared source code
 data Repr :: Type where
     Normal :: Repr
     Polar :: Repr
+
 data Complex :: Repr -> Type where
     Complex :: forall (a :: _) . Float -> Float -> Complex a
+
 repr :: forall (a :: _) . Complex a -> Repr
 repr = \ @(a :: _) _ -> _rhs a
+
 normal :: Float -> Float -> Complex Normal
 normal = \(a :: _) (b :: _) -> _rhs (Complex a b)
+
 polar :: Float -> Float -> Complex Polar
 polar = \(a :: _) (b :: _) -> _rhs (Complex a b)
+
 cabs :: forall (a :: _) . Complex a -> Float
 cabs
   = \ @(a :: _) (b :: _) -> case'Repr
@@ -17,6 +23,7 @@ cabs
     (case'Complex (\_ _ -> _) (\(c :: _) (d :: _) -> _rhs (sqrt (c * c + d * d))) b)
     (case'Complex (\_ _ -> _) (\(e :: _) _ -> _rhs e) b)
     a
+
 toPolar :: Complex Normal -> Complex Polar
 toPolar
   = \(a :: _) -> case'Complex
@@ -39,13 +46,16 @@ toPolar
                 (polar d (fromInt 0 - pi / 2.0))
                 undefined)))))
     a
+
 toNormal :: Complex Polar -> Complex Normal
 toNormal
   = \(a :: _) -> case'Complex
     (\_ _ -> _)
     (\(b :: _) (c :: _) -> _rhs (Complex (b * cos c) (b * sin c)))
     a
+
 it_should_fail = \(a :: _) -> case'Complex (\_ _ -> _) (\(b :: _) _ -> _rhs b) a
+
 add :: forall (a :: _) (b :: _) . Complex a -> Complex b -> Complex a
 add
   = \ @(a :: _) @(b :: _) (c :: _) (d :: _) -> case'Repr
@@ -63,6 +73,7 @@ add
       b)
     (_rhs undefined)
     a
+
 mul :: forall (a :: _) (b :: _) . Complex a -> Complex b -> Complex a
 mul
   = \ @(a :: _) @(b :: _) (c :: _) (d :: _) -> case'Repr
@@ -80,12 +91,15 @@ mul
       b)
     (_rhs undefined)
     a
+
 s :: forall (a :: _) . Complex a -> Complex a
 s = \(a :: _) -> _rhs (mul a a `add` a)
+
 s4 = \(a :: _) -> _rhs (s (s (s (s a))))
+
 iter = _rhs s4
+
 mandel = \(a :: _) -> _rhs (cabs (iter a) < 2.0)
-main is not found
 ------------ trace
 'Repr :: Type
 Normal :: Repr
diff --git a/testdata/data.out b/testdata/data.out
index d1952aed..1f6a592f 100644
--- a/testdata/data.out
+++ b/testdata/data.out
@@ -1,13 +1,17 @@
+main is not found
 ------------ desugared source code
 data Data0 :: Type where
     Data0 :: Data0
+
 data Data1 (_ :: Type) (_ :: Type) (_ :: Type) :: Type where
     Data1 :: forall a b c . a -> b -> c -> Data1 a b c
+
 data Data2 :: Type where
     Data21 :: Int -> Data2
     Data22 :: Int -> Int -> Data2
     Data23 :: Int -> Data2
     Data24 :: Data2
+
 x
   = \(a :: _) -> case'Data2
     (\_ -> _)
@@ -16,6 +20,7 @@ x
     (\(c :: _) -> _rhs c)
     (_rhs undefined)
     a
+
 y
   = \(a :: _) -> case'Data2
     (\_ -> _)
@@ -24,10 +29,12 @@ y
     (\_ -> _rhs undefined)
     (_rhs undefined)
     a
+
 data Data5 (_ :: Type) (_ :: Type) (_ :: Type) :: Type where
     Data51 :: forall a b c . a -> Data5 a b c
     Data52 :: forall d e f . d -> e -> f -> Data5 d e f
     Data53 :: forall g h i . Int -> g -> Float -> h -> i -> Data5 g h i
+
 a5
   = \(a :: _) -> case'Data5
     (\_ -> _)
@@ -35,6 +42,7 @@ a5
     (\(c :: _) _ _ -> _rhs c)
     (\_ _ _ _ _ -> _rhs undefined)
     a
+
 b5
   = \(a :: _) -> case'Data5
     (\_ -> _)
@@ -42,6 +50,7 @@ b5
     (\_ (b :: _) _ -> _rhs b)
     (\_ _ _ _ _ -> _rhs undefined)
     a
+
 c5
   = \(a :: _) -> case'Data5
     (\_ -> _)
@@ -49,7 +58,6 @@ c5
     (\_ _ (b :: _) -> _rhs b)
     (\_ _ _ _ _ -> _rhs undefined)
     a
-main is not found
 ------------ trace
 'Data0 :: Type
 Data0 :: Data0
diff --git a/testdata/empty.out b/testdata/empty.out
index 41c61ca7..4cf07220 100644
--- a/testdata/empty.out
+++ b/testdata/empty.out
@@ -1,7 +1,7 @@
+main is not found
 ------------ desugared source code
 data Empty :: Type where
     
-main is not found
 ------------ trace
 'Empty :: Type
 case'Empty :: forall (a :: Empty -> Type) (b :: Empty) -> a b
diff --git a/testdata/id.out b/testdata/id.out
index 3273b516..b087590c 100644
--- a/testdata/id.out
+++ b/testdata/id.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 main' = _rhs \(a := _rhs \(b :: _) -> b) -> HCons (a 4.0) (HCons (a True) HNil)
-main is not found
 ------------ trace
 main' :: (Float, Bool)
 ------------ tooltips
diff --git a/testdata/instantiate.out b/testdata/instantiate.out
index e6746d48..66d45bf7 100644
--- a/testdata/instantiate.out
+++ b/testdata/instantiate.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 main' = _rhs \(a := _rhs PrimAdd) -> a (V2 1.0 2.0) (V2 1.0 2.0)
-main is not found
 ------------ trace
 main' :: VecS Float 2
 ------------ tooltips
diff --git a/testdata/language-features/basic-list/list01.out b/testdata/language-features/basic-list/list01.out
index 5df5b1a0..41b1f057 100644
--- a/testdata/language-features/basic-list/list01.out
+++ b/testdata/language-features/basic-list/list01.out
@@ -1,8 +1,10 @@
+main is not found
 ------------ desugared source code
 value1 = _rhs []
+
 value2 = _rhs (fromInt 1 : fromInt 2 : fromInt 3 : fromInt 4 : [])
+
 value3 = _rhs ('h' : 'e' : 'l' : 'l' : 'o' : [])
-main is not found
 ------------ trace
 value1 :: forall a . [a]
 value2 :: forall a . Num a => [a]
diff --git a/testdata/language-features/basic-list/list02.out b/testdata/language-features/basic-list/list02.out
index dec74991..6101a1fa 100644
--- a/testdata/language-features/basic-list/list02.out
+++ b/testdata/language-features/basic-list/list02.out
@@ -1,8 +1,10 @@
+main is not found
 ------------ desugared source code
 value1 = _rhs []
+
 value2 = _rhs (fromInt 1 : fromInt 2 : fromInt 3 : fromInt 4 : [])
+
 value3 = _rhs ('h' : 'e' : 'l' : 'l' : 'o' : [])
-main is not found
 ------------ trace
 value1 :: forall a . [a]
 value2 :: forall a . Num a => [a]
diff --git a/testdata/language-features/basic-list/list08.out b/testdata/language-features/basic-list/list08.out
index aebab457..800c75aa 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
 ------------ desugared source code
 value = _rhs (fromInt 1 : 1.2 : [])
-main is not found
 ------------ trace
 value :: [Float]
 ------------ tooltips
diff --git a/testdata/language-features/basic-list/list09.out b/testdata/language-features/basic-list/list09.out
index 11abf486..79bb9d42 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
 ------------ desugared source code
 value = _rhs (fromInt 1 : 1.2 : [] :: [Float])
-main is not found
 ------------ trace
 value :: [Float]
 ------------ tooltips
diff --git a/testdata/language-features/basic-list/list11.out b/testdata/language-features/basic-list/list11.out
index b70c324c..005c6959 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
 ------------ desugared source code
 value = _rhs (fromInt 1 : [])
-main is not found
 ------------ trace
 value :: forall a . Num a => [a]
 ------------ tooltips
diff --git a/testdata/language-features/basic-list/list12.out b/testdata/language-features/basic-list/list12.out
index 5a5f796d..75cc03e1 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
 ------------ desugared source code
 value = _rhs (fromInt 1 : fromInt 2 : fromInt 3 : fromInt 4 : fromInt 5 : [])
-main is not found
 ------------ trace
 value :: forall a . Num a => [a]
 ------------ tooltips
diff --git a/testdata/language-features/basic-list/list13.out b/testdata/language-features/basic-list/list13.out
index 66403b86..9e72ee74 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
 ------------ desugared source code
 value = _rhs ('h' : 'e' : 'l' : 'l' : 'o' : [])
-main is not found
 ------------ trace
 value :: [Char]
 ------------ tooltips
diff --git a/testdata/language-features/basic-list/listcomp01.out b/testdata/language-features/basic-list/listcomp01.out
index fe914476..52af0c94 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
 ------------ desugared source code
 value = _rhs (concatMap (\_ -> HNil : []) (HNil : HNil : HNil : HNil : []))
-main is not found
 ------------ trace
 value :: [()]
 ------------ tooltips
diff --git a/testdata/language-features/basic-list/listcomp02.out b/testdata/language-features/basic-list/listcomp02.out
index 8d7d9de5..7a2a2998 100644
--- a/testdata/language-features/basic-list/listcomp02.out
+++ b/testdata/language-features/basic-list/listcomp02.out
@@ -1,7 +1,8 @@
+main is not found
 ------------ desugared source code
 l = _rhs (HNil : HNil : HNil : HNil : [])
+
 value = _rhs (concatMap (\(a :: _) -> a : []) l)
-main is not found
 ------------ trace
 l :: [()]
 value :: [()]
diff --git a/testdata/language-features/basic-list/listcomp03.out b/testdata/language-features/basic-list/listcomp03.out
index 3de6ae88..ee6dfd4a 100644
--- a/testdata/language-features/basic-list/listcomp03.out
+++ b/testdata/language-features/basic-list/listcomp03.out
@@ -1,10 +1,10 @@
+main is not found
 ------------ desugared source code
 value
   = _rhs
     (concatMap
       (\_ -> primIfThenElse False (HNil : []) [])
       (HNil : HNil : HNil : HNil : []))
-main is not found
 ------------ trace
 value :: [()]
 ------------ tooltips
diff --git a/testdata/language-features/basic-list/listcomp04.out b/testdata/language-features/basic-list/listcomp04.out
index dce40a1a..1069a83b 100644
--- a/testdata/language-features/basic-list/listcomp04.out
+++ b/testdata/language-features/basic-list/listcomp04.out
@@ -1,7 +1,8 @@
+main is not found
 ------------ desugared source code
 l = _rhs (HNil : HNil : HNil : HNil : [])
+
 value = _rhs (concatMap (\_ -> concatMap (\_ -> HNil : []) l) l)
-main is not found
 ------------ trace
 l :: [()]
 value :: [()]
diff --git a/testdata/language-features/basic-list/listcomp05.out b/testdata/language-features/basic-list/listcomp05.out
index 69de4559..b9c7afdb 100644
--- a/testdata/language-features/basic-list/listcomp05.out
+++ b/testdata/language-features/basic-list/listcomp05.out
@@ -1,10 +1,10 @@
+main is not found
 ------------ desugared source code
 value
   = _rhs
     (concatMap
       (\_ (a := _rhs HNil) (b := _rhs ((\(c :: _) -> c) a)) -> b : [])
       (HNil : HNil : []))
-main is not found
 ------------ trace
 value :: [()]
 ------------ tooltips
diff --git a/testdata/language-features/basic-list/listcomp06.out b/testdata/language-features/basic-list/listcomp06.out
index 590793bb..51a69cf6 100644
--- a/testdata/language-features/basic-list/listcomp06.out
+++ b/testdata/language-features/basic-list/listcomp06.out
@@ -1,3 +1,4 @@
+main is not found
 ------------ desugared source code
 value1
   = _rhs
@@ -7,6 +8,7 @@ value1
         (b : [])
         [])
       (HNil : HNil : []))
+
 value2
   = _rhs
     (concatMap
@@ -15,7 +17,6 @@ value2
         (\(a := _rhs HNil) (b := _rhs ((\(c :: _) -> c) a)) -> b : [])
         [])
       (HNil : HNil : []))
-main is not found
 ------------ trace
 value1 :: [()]
 value2 :: [()]
diff --git a/testdata/language-features/basic-list/listcomp07.out b/testdata/language-features/basic-list/listcomp07.out
index a3e5a671..483d128f 100644
--- a/testdata/language-features/basic-list/listcomp07.out
+++ b/testdata/language-features/basic-list/listcomp07.out
@@ -1,3 +1,4 @@
+main is not found
 ------------ desugared source code
 value1
   = _rhs
@@ -7,6 +8,7 @@ value1
         (\(d := _rhs b) (e := _rhs ((\(f :: _) -> f) d)) -> b : [])
         [])
       (HNil : HNil : []))
+
 value2
   = _rhs
     (concatMap
@@ -15,6 +17,7 @@ value2
         (\(d := _rhs b) (e := _rhs ((\(f :: _) -> f) d)) -> b : [])
         [])
       (HNil : HNil : []))
+
 value3
   = _rhs
     (concatMap
@@ -23,7 +26,6 @@ value3
         (\(d := _rhs b) (e := _rhs ((\(f :: _) -> f) d)) -> b : [])
         [])
       (HNil : HNil : []))
-main is not found
 ------------ trace
 value1 :: [()]
 value2 :: [()]
diff --git a/testdata/language-features/basic-list/listcomp09.out b/testdata/language-features/basic-list/listcomp09.out
index 96351e61..75d2dbf5 100644
--- a/testdata/language-features/basic-list/listcomp09.out
+++ b/testdata/language-features/basic-list/listcomp09.out
@@ -1,7 +1,7 @@
+main is not found
 ------------ desugared source code
 value1
   = _rhs (concatMap (\_ -> (\(a :: _) -> hlistNilCase _ "Hello" a) : []) [])
-main is not found
 ------------ trace
 value1 :: Type => [() -> String]
 ------------ tooltips
diff --git a/testdata/language-features/basic-values/bool01.out b/testdata/language-features/basic-values/bool01.out
index 80315cf0..339dbe3a 100644
--- a/testdata/language-features/basic-values/bool01.out
+++ b/testdata/language-features/basic-values/bool01.out
@@ -1,7 +1,8 @@
+main is not found
 ------------ desugared source code
 value1 = _rhs True
+
 value2 = _rhs False
-main is not found
 ------------ trace
 value1 :: Bool
 value2 :: Bool
diff --git a/testdata/language-features/basic-values/case01.out b/testdata/language-features/basic-values/case01.out
index 8b4334e6..7a952e7a 100644
--- a/testdata/language-features/basic-values/case01.out
+++ b/testdata/language-features/basic-values/case01.out
@@ -1,11 +1,16 @@
+main is not found
 ------------ desugared source code
 value1 = _rhs ((\(a :: _) -> hlistNilCase _ HNil a) HNil)
+
 value2 = _rhs ((\(a :: _) -> hlistNilCase _ HNil a) HNil)
+
 value3 = _rhs ((\(a :: _) -> hlistNilCase _ HNil a) HNil)
+
 value4 = _rhs ((\(a :: _) -> hlistNilCase _ HNil a) HNil)
+
 value5 = _rhs ((\(a :: _) -> hlistNilCase _ HNil a) HNil)
+
 value6 = _rhs ((\_ -> HNil) HNil)
-main is not found
 ------------ trace
 value1 :: ()
 value2 :: ()
diff --git a/testdata/language-features/basic-values/case02.out b/testdata/language-features/basic-values/case02.out
index a5f57070..9456dae9 100644
--- a/testdata/language-features/basic-values/case02.out
+++ b/testdata/language-features/basic-values/case02.out
@@ -1,7 +1,9 @@
+main is not found
 ------------ desugared source code
 value1
   = _rhs
     ((\(a :: _) -> case'Bool (\_ -> _) HNil HNil (fromInt 1 == a)) (fromInt 1))
+
 value2
   = _rhs
     ((\(a :: _) -> case'Bool
@@ -10,7 +12,6 @@ value2
         "1"
         (fromInt 1 == a))
       (fromInt 2))
-main is not found
 ------------ trace
 value1 :: forall a . (Eq a, Num a) => ()
 value2 :: forall a . (Eq a, Num a, Eq a, Num a) => String
diff --git a/testdata/language-features/basic-values/case05.out b/testdata/language-features/basic-values/case05.out
index e099d30d..2c1ab232 100644
--- a/testdata/language-features/basic-values/case05.out
+++ b/testdata/language-features/basic-values/case05.out
@@ -1,8 +1,8 @@
+main is not found
 ------------ desugared source code
 value
   = \(a :: _) -> _rhs
     ((\(b :: _) -> case'Bool (\_ -> _) undefined '1' (fromInt 1 == b)) a)
-main is not found
 ------------ trace
 value :: forall a . (Eq a, Num a) => a -> Char
 ------------ tooltips
diff --git a/testdata/language-features/basic-values/case06.out b/testdata/language-features/basic-values/case06.out
index aaeff605..65999ca4 100644
--- a/testdata/language-features/basic-values/case06.out
+++ b/testdata/language-features/basic-values/case06.out
@@ -1,8 +1,8 @@
+main is not found
 ------------ desugared source code
 value
   = \(a :: _) -> _rhs
     ((\(b :: _) -> case'Bool (\_ -> _) '_' '1' (fromInt 1 == b)) a)
-main is not found
 ------------ trace
 value :: forall a . (Eq a, Num a) => a -> Char
 ------------ tooltips
diff --git a/testdata/language-features/basic-values/data01.out b/testdata/language-features/basic-values/data01.out
index 7845cf0a..9efc26b6 100644
--- a/testdata/language-features/basic-values/data01.out
+++ b/testdata/language-features/basic-values/data01.out
@@ -1,17 +1,19 @@
+main is not found
 ------------ desugared source code
 data A :: Type where
     B :: A
     C :: A
     D :: A
+
 data E :: Type where
     F :: E
     G :: HList '[] -> E
     H :: E
+
 data D1 :: Type where
     C1 :: D1
     C2 :: HList '[] -> D1
     C3 :: D1
-main is not found
 ------------ trace
 'A :: Type
 B :: A
diff --git a/testdata/language-features/basic-values/def01.out b/testdata/language-features/basic-values/def01.out
index 6aa4d014..520b99c3 100644
--- a/testdata/language-features/basic-values/def01.out
+++ b/testdata/language-features/basic-values/def01.out
@@ -1,8 +1,10 @@
+main is not found
 ------------ desugared source code
 unit = _rhs HNil
+
 fun1 = \_ -> _rhs (fromInt 1)
+
 fun2 = \_ _ _ _ _ -> _rhs 'c'
-main is not found
 ------------ trace
 unit :: ()
 fun1 :: forall a b . Num b => a -> b
diff --git a/testdata/language-features/basic-values/def03.out b/testdata/language-features/basic-values/def03.out
index ceb6a8e1..c4bed094 100644
--- a/testdata/language-features/basic-values/def03.out
+++ b/testdata/language-features/basic-values/def03.out
@@ -1,3 +1,4 @@
+main is not found
 ------------ desugared source code
 fun
   = \(a :: _) -> case'Bool
@@ -5,7 +6,6 @@ fun
     (case'Bool (\_ -> _) (_rhs undefined) (_rhs '2') (fromInt 2 == a))
     (_rhs '1')
     (fromInt 1 == a)
-main is not found
 ------------ trace
 fun :: forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
 ------------ tooltips
diff --git a/testdata/language-features/basic-values/def04.out b/testdata/language-features/basic-values/def04.out
index e52f9d64..e6dfbba7 100644
--- a/testdata/language-features/basic-values/def04.out
+++ b/testdata/language-features/basic-values/def04.out
@@ -1,3 +1,4 @@
+main is not found
 ------------ desugared source code
 fun
   = \(a :: _) -> case'Bool
@@ -5,13 +6,13 @@ fun
     (case'Bool (\_ -> _) (_rhs '_') (_rhs '2') (fromInt 2 == a))
     (_rhs '1')
     (fromInt 1 == a)
+
 fun2
   = \(a :: _) _ -> case'Bool
     (\_ -> _)
     (case'Bool (\_ -> _) (_rhs '_') (_rhs '2') (fromInt 2 == a))
     (_rhs '1')
     (fromInt 1 == a)
-main is not found
 ------------ trace
 fun :: forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
 fun2 :: forall a b . (Eq a, Num a, Eq a, Num a) => a -> b -> Char
diff --git a/testdata/language-features/basic-values/deforder01.out b/testdata/language-features/basic-values/deforder01.out
index 2d6ace49..14117b02 100644
--- a/testdata/language-features/basic-values/deforder01.out
+++ b/testdata/language-features/basic-values/deforder01.out
@@ -1,7 +1,8 @@
+main is not found
 ------------ desugared source code
 x = _rhs '1'
+
 y = _rhs x
-main is not found
 ------------ trace
 x :: Char
 y :: Char
diff --git a/testdata/language-features/basic-values/deforder02.out b/testdata/language-features/basic-values/deforder02.out
index 7a36e690..23d62c33 100644
--- a/testdata/language-features/basic-values/deforder02.out
+++ b/testdata/language-features/basic-values/deforder02.out
@@ -1,7 +1,8 @@
+main is not found
 ------------ desugared source code
 x = _rhs '1'
+
 y = _rhs x
-main is not found
 ------------ trace
 x :: Char
 y :: Char
diff --git a/testdata/language-features/basic-values/deforder03.out b/testdata/language-features/basic-values/deforder03.out
index efc49155..8065aa9f 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
 ------------ desugared source code
 value = _rhs \(a := _rhs HNil) (b := _rhs a) -> '1'
-main is not found
 ------------ trace
 value :: Char
 ------------ tooltips
diff --git a/testdata/language-features/basic-values/deforder04.out b/testdata/language-features/basic-values/deforder04.out
index 05e51d11..8f80d78e 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
 ------------ desugared source code
 value = _rhs \(a := _rhs HNil) (b := _rhs a) -> '1'
-main is not found
 ------------ trace
 value :: Char
 ------------ tooltips
diff --git a/testdata/language-features/basic-values/deforder05.out b/testdata/language-features/basic-values/deforder05.out
index b5da0fdd..853498eb 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
 ------------ desugared source code
 value = _rhs \(a := _rhs HNil) (b := _rhs a) -> '1'
-main is not found
 ------------ trace
 value :: Char
 ------------ tooltips
diff --git a/testdata/language-features/basic-values/deforder06.out b/testdata/language-features/basic-values/deforder06.out
index 7c4a2b4a..565b3ee0 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
 ------------ desugared source code
 value = _rhs \(a := _rhs HNil) (b := _rhs a) -> '1'
-main is not found
 ------------ trace
 value :: Char
 ------------ tooltips
diff --git a/testdata/language-features/basic-values/fixity01.out b/testdata/language-features/basic-values/fixity01.out
index bcc2a126..22e2ae45 100644
--- a/testdata/language-features/basic-values/fixity01.out
+++ b/testdata/language-features/basic-values/fixity01.out
@@ -1,13 +1,20 @@
+main is not found
 ------------ desugared source code
 funL = \(a :: _) _ -> _rhs a
+
 funR = \(a :: _) _ -> _rhs a
+
 (<<<<) = \(a :: _) _ -> _rhs a
+
 (>>>>) = \_ (a :: _) -> _rhs a
+
 infixr 7 funL
+
 infixr 7 <<<<
+
 infixr 6 >>>>
+
 infixr 6 funR
-main is not found
 ------------ trace
 funL :: forall a b . a -> b -> a
 funR :: forall a b . a -> b -> a
diff --git a/testdata/language-features/basic-values/fixity02.out b/testdata/language-features/basic-values/fixity02.out
index acdd5309..841eda57 100644
--- a/testdata/language-features/basic-values/fixity02.out
+++ b/testdata/language-features/basic-values/fixity02.out
@@ -1,29 +1,52 @@
+main is not found
 ------------ desugared source code
 funL = \(a :: _) _ -> _rhs a
+
 funR = \_ (a :: _) -> _rhs a
+
 (<@) = \(a :: _) _ -> _rhs a
+
 (@>) = \_ (a :: _) -> _rhs a
+
 infixr 7 funL
+
 infixr 7 <@
+
 infixr 6 @>
+
 infixr 6 funR
+
 value1 = _rhs (HNil @> 'c' @> "hi" @> 1.2 :: Float)
+
 value2 = _rhs (HNil @> 'c' <@ "hi" @> 1.2 :: Float)
+
 value3 = _rhs (HNil <@ 'c' @> "hi" @> 1.2 :: Float)
+
 value4 = _rhs (HNil <@ 'c' <@ "hi" @> 1.2 :: Float)
+
 value5 = _rhs (HNil @> 'c' @> "hi" <@ 1.2 :: String)
+
 value6 = _rhs (HNil @> 'c' <@ "hi" <@ 1.2 :: Char)
+
 value7 = _rhs (HNil <@ 'c' @> "hi" <@ 1.2 :: String)
+
 value8 = _rhs (HNil <@ 'c' <@ "hi" <@ 1.2 :: HList '[])
+
 funValue1 = _rhs (HNil `funR` 'c' `funR` "hi" `funR` 1.2 :: Float)
+
 funValue2 = _rhs (HNil `funR` 'c' `funL` "hi" `funR` 1.2 :: Float)
+
 funValue3 = _rhs (HNil `funL` 'c' `funR` "hi" `funR` 1.2 :: Float)
+
 funValue4 = _rhs (HNil `funL` 'c' `funL` "hi" `funR` 1.2 :: Float)
+
 funValue5 = _rhs (HNil `funR` 'c' `funR` "hi" `funL` 1.2 :: String)
+
 funValue6 = _rhs (HNil `funR` 'c' `funL` "hi" `funL` 1.2 :: Char)
+
 funValue7 = _rhs (HNil `funL` 'c' `funR` "hi" `funL` 1.2 :: String)
+
 funValue8 = _rhs (HNil `funL` 'c' `funL` "hi" `funL` 1.2 :: HList '[])
-main is not found
 ------------ trace
 funL :: forall a b . a -> b -> a
 funR :: forall a b . a -> b -> b
diff --git a/testdata/language-features/basic-values/if01.out b/testdata/language-features/basic-values/if01.out
index b16d8586..fdd04aba 100644
--- a/testdata/language-features/basic-values/if01.out
+++ b/testdata/language-features/basic-values/if01.out
@@ -1,7 +1,8 @@
+main is not found
 ------------ desugared source code
 value1 = _rhs (primIfThenElse True HNil HNil)
+
 value2 = _rhs (primIfThenElse False 1.0 2.0)
-main is not found
 ------------ trace
 value1 :: ()
 value2 :: Float
diff --git a/testdata/language-features/basic-values/indentation01.out b/testdata/language-features/basic-values/indentation01.out
index a607690b..3c77aa23 100644
--- a/testdata/language-features/basic-values/indentation01.out
+++ b/testdata/language-features/basic-values/indentation01.out
@@ -1,7 +1,8 @@
+main is not found
 ------------ desugared source code
 tuple1 = _rhs HNil
+
 tuple2 = _rhs HNil
-main is not found
 ------------ trace
 tuple1 :: ()
 tuple2 :: ()
diff --git a/testdata/language-features/basic-values/indentation02.out b/testdata/language-features/basic-values/indentation02.out
index 97b138e0..9a4cafc0 100644
--- a/testdata/language-features/basic-values/indentation02.out
+++ b/testdata/language-features/basic-values/indentation02.out
@@ -1,7 +1,8 @@
+main is not found
 ------------ desugared source code
 tuple1 = _rhs HNil
+
 tuple2 = _rhs HNil
-main is not found
 ------------ trace
 tuple1 :: ()
 tuple2 :: ()
diff --git a/testdata/language-features/basic-values/infix01.out b/testdata/language-features/basic-values/infix01.out
index 013b0a25..3e4ec8a6 100644
--- a/testdata/language-features/basic-values/infix01.out
+++ b/testdata/language-features/basic-values/infix01.out
@@ -1,7 +1,8 @@
+main is not found
 ------------ desugared source code
 fun = \_ _ -> _rhs HNil
+
 value = \(a :: _) (b :: _) -> _rhs (a `fun` b)
-main is not found
 ------------ trace
 fun :: forall a b . a -> b -> ()
 value :: forall a b . a -> b -> ()
diff --git a/testdata/language-features/basic-values/infix02.out b/testdata/language-features/basic-values/infix02.out
index dd15a9e9..be8609ef 100644
--- a/testdata/language-features/basic-values/infix02.out
+++ b/testdata/language-features/basic-values/infix02.out
@@ -1,7 +1,8 @@
+main is not found
 ------------ desugared source code
 fun = \_ _ _ -> _rhs HNil
+
 value = \(a :: _) (b :: _) -> _rhs (a `fun` b)
-main is not found
 ------------ trace
 fun :: forall a b c . a -> b -> c -> ()
 value :: forall a b c . a -> b -> c -> ()
diff --git a/testdata/language-features/basic-values/infix03.out b/testdata/language-features/basic-values/infix03.out
index 81521b91..3b7d6ec2 100644
--- a/testdata/language-features/basic-values/infix03.out
+++ b/testdata/language-features/basic-values/infix03.out
@@ -1,10 +1,12 @@
+main is not found
 ------------ desugared source code
 data D :: Type where
     D2 :: HList '[] -> HList '[] -> D
     D3 :: HList '[] -> HList '[] -> HList '[] -> D
+
 d2 = \(a :: _) (b :: _) -> _rhs (a `D2` b)
+
 d3 = \(a :: _) (b :: _) -> _rhs (a `D3` b)
-main is not found
 ------------ trace
 'D :: Type
 D2 :: () -> () -> D
diff --git a/testdata/language-features/basic-values/lambda01.out b/testdata/language-features/basic-values/lambda01.out
index 0d73915c..9a7c4583 100644
--- a/testdata/language-features/basic-values/lambda01.out
+++ b/testdata/language-features/basic-values/lambda01.out
@@ -1,9 +1,12 @@
+main is not found
 ------------ desugared source code
 fun1 = _rhs \_ -> HNil
+
 fun2 = _rhs \_ -> HNil
+
 fun3 = _rhs \_ -> HNil
+
 fun4 = _rhs \_ _ _ _ _ _ _ _ _ -> HNil
-main is not found
 ------------ trace
 fun1 :: forall a . a -> ()
 fun2 :: forall a . a -> ()
diff --git a/testdata/language-features/basic-values/lambda03.out b/testdata/language-features/basic-values/lambda03.out
index 5ea529b3..97ee5c15 100644
--- a/testdata/language-features/basic-values/lambda03.out
+++ b/testdata/language-features/basic-values/lambda03.out
@@ -1,7 +1,8 @@
+main is not found
 ------------ desugared source code
 fun1 = _rhs \_ (a :: _) _ -> a
+
 fun2 = \(a :: _) -> _rhs \_ _ _ -> a
-main is not found
 ------------ trace
 fun1 :: forall a b c . a -> b -> c -> b
 fun2 :: forall a b c d . a -> b -> c -> d -> a
diff --git a/testdata/language-features/basic-values/let01.out b/testdata/language-features/basic-values/let01.out
index 33524e88..dd6cad7e 100644
--- a/testdata/language-features/basic-values/let01.out
+++ b/testdata/language-features/basic-values/let01.out
@@ -1,10 +1,14 @@
+main is not found
 ------------ desugared source code
 value1 = _rhs \(a := _rhs (fromInt 1)) -> fromInt 1
+
 value2 = _rhs \(a := _rhs (fromInt 1)) -> fromInt 1
+
 value3 = _rhs \(a := _rhs (fromInt 1)) (b := _rhs 'c') -> fromInt 1
+
 value4 = _rhs \(a := _rhs (fromInt 1)) -> fromInt 1
+
 value5 = _rhs \(a := _rhs (fromInt 1)) (b := _rhs (fromInt 2)) -> fromInt 1
-main is not found
 ------------ trace
 value1 :: forall a . Num a => a
 value2 :: forall a . Num a => a
diff --git a/testdata/language-features/basic-values/let02.out b/testdata/language-features/basic-values/let02.out
index 44be34a1..f4e67d6a 100644
--- a/testdata/language-features/basic-values/let02.out
+++ b/testdata/language-features/basic-values/let02.out
@@ -1,3 +1,4 @@
+main is not found
 ------------ desugared source code
 value
   = _rhs
@@ -6,7 +7,6 @@ value
         (c
           := _rhs
             \(e := _rhs HNil) (f := _rhs (fromInt 1)) (g := _rhs "hello") -> 'B') -> HNil
-main is not found
 ------------ trace
 value :: ()
 ------------ tooltips
diff --git a/testdata/language-features/basic-values/literal01.out b/testdata/language-features/basic-values/literal01.out
index b45e2a20..ec3b6908 100644
--- a/testdata/language-features/basic-values/literal01.out
+++ b/testdata/language-features/basic-values/literal01.out
@@ -1,13 +1,20 @@
+main is not found
 ------------ desugared source code
 intValue1 = _rhs (fromInt 0)
+
 intValue2 = _rhs (fromInt 1)
+
 intValue3 = _rhs (fromInt 12345)
+
 floatValue1 = _rhs 2.0
+
 floatValue2 = _rhs 123400.0
+
 charValue = _rhs 'A'
+
 stringValue1 = _rhs "Hello World"
+
 stringValue2 = _rhs "\nHello World\tagain!\r\n"
-main is not found
 ------------ trace
 intValue1 :: forall a . Num a => a
 intValue2 :: forall a . Num a => a
diff --git a/testdata/language-features/basic-values/operator01.out b/testdata/language-features/basic-values/operator01.out
index b6848082..df8d10ac 100644
--- a/testdata/language-features/basic-values/operator01.out
+++ b/testdata/language-features/basic-values/operator01.out
@@ -1,9 +1,12 @@
+main is not found
 ------------ desugared source code
 (#$#) = \_ _ -> _rhs HNil
+
 ($$#) = \_ _ -> _rhs HNil
+
 ($$$#) = \_ _ -> _rhs HNil
+
 ($$$) = \_ _ -> _rhs HNil
-main is not found
 ------------ trace
 (#$#) :: forall a b . a -> b -> ()
 ($$#) :: forall a b . a -> b -> ()
diff --git a/testdata/language-features/basic-values/operator05.out b/testdata/language-features/basic-values/operator05.out
index 58ad31cd..91f34d29 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
 ------------ desugared source code
 value1 = _rhs \(a := \_ _ -> _rhs HNil) -> a HNil HNil
-main is not found
 ------------ trace
 value1 :: ()
 ------------ tooltips
diff --git a/testdata/language-features/basic-values/operator06.out b/testdata/language-features/basic-values/operator06.out
index 6f5d6982..adbffc11 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
 ------------ desugared source code
 value1 = _rhs \(a := \_ _ -> _rhs HNil) -> a HNil HNil
-main is not found
 ------------ trace
 value1 :: ()
 ------------ tooltips
diff --git a/testdata/language-features/basic-values/shadowing01.out b/testdata/language-features/basic-values/shadowing01.out
index 39fdca99..bf07b5e5 100644
--- a/testdata/language-features/basic-values/shadowing01.out
+++ b/testdata/language-features/basic-values/shadowing01.out
@@ -1,3 +1,4 @@
+main is not found
 ------------ desugared source code
 value
   = _rhs
@@ -10,7 +11,6 @@ value
                 (f
                   := _rhs
                     \(g := _rhs HNil) (h := _rhs 'C') (i := _rhs 3.12) -> "world") -> HNil) -> '7'
-main is not found
 ------------ trace
 value :: Char
 ------------ tooltips
diff --git a/testdata/language-features/basic-values/shadowing02.out b/testdata/language-features/basic-values/shadowing02.out
index 4da8cccd..69f3e1f6 100644
--- a/testdata/language-features/basic-values/shadowing02.out
+++ b/testdata/language-features/basic-values/shadowing02.out
@@ -1,6 +1,9 @@
+main is not found
 ------------ desugared source code
 c = _rhs (fromInt 7)
+
 world = _rhs "world"
+
 value2
   = _rhs
     \(a := _rhs 'A')
@@ -14,7 +17,6 @@ value2
                     := _rhs
                       \(h := _rhs HNil)
                         (i := _rhs 'C') (j := _rhs 3.12) (k := _rhs c) -> world) -> HNil) -> '7'
-main is not found
 ------------ trace
 c :: forall a . Num a => a
 world :: String
diff --git a/testdata/language-features/basic-values/shadowing03.out b/testdata/language-features/basic-values/shadowing03.out
index 6e0ca5e0..00820b70 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
 ------------ desugared source code
 x = \_ _ -> _rhs HNil
-main is not found
 ------------ trace
 x :: forall a b . a -> b -> ()
 ------------ tooltips
diff --git a/testdata/language-features/basic-values/shadowing04.out b/testdata/language-features/basic-values/shadowing04.out
index 6d20512d..29066c7b 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
 ------------ desugared source code
 __ = \_ _ -> _rhs HNil
-main is not found
 ------------ trace
 __ :: forall a b . a -> b -> ()
 ------------ tooltips
diff --git a/testdata/language-features/basic-values/tuple01.out b/testdata/language-features/basic-values/tuple01.out
index 9ae4b926..48aa799f 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
 ------------ desugared source code
 unit = _rhs HNil
-main is not found
 ------------ trace
 unit :: ()
 ------------ tooltips
diff --git a/testdata/language-features/basic-values/tuple02.out b/testdata/language-features/basic-values/tuple02.out
index 8cdbb1b2..33a7b35c 100644
--- a/testdata/language-features/basic-values/tuple02.out
+++ b/testdata/language-features/basic-values/tuple02.out
@@ -1,10 +1,12 @@
+main is not found
 ------------ desugared source code
 tuple1
   = _rhs
     (HCons (fromInt 1) (HCons 2.3 (HCons 'D' (HCons "string" (HCons HNil HNil)))))
+
 tuple2 = _rhs (HCons HNil (HCons HNil HNil))
+
 tuple3 = _rhs (HCons (HCons "name" (HCons 'c' HNil)) (HCons HNil HNil))
-main is not found
 ------------ trace
 tuple1 :: forall a . Num a => (a, Float, Char, String, ())
 tuple2 :: ((), ())
diff --git a/testdata/language-features/basic-values/typesig01.out b/testdata/language-features/basic-values/typesig01.out
index 9936930a..4b710886 100644
--- a/testdata/language-features/basic-values/typesig01.out
+++ b/testdata/language-features/basic-values/typesig01.out
@@ -1,9 +1,10 @@
+main is not found
 ------------ desugared source code
 value1 :: Char
 value1 = _rhs 'a'
+
 value2 :: Char
 value2 = _rhs 'a'
-main is not found
 ------------ trace
 value1 :: Char
 value2 :: Char
diff --git a/testdata/language-features/basic-values/typesig02.out b/testdata/language-features/basic-values/typesig02.out
index cfd8e29d..a685db82 100644
--- a/testdata/language-features/basic-values/typesig02.out
+++ b/testdata/language-features/basic-values/typesig02.out
@@ -1,7 +1,8 @@
+main is not found
 ------------ desugared source code
 value1 = _rhs ('a' :: Char)
+
 value2 = _rhs ('a' :: Char)
-main is not found
 ------------ trace
 value1 :: Char
 value2 :: Char
diff --git a/testdata/language-features/basic-values/typesig03.out b/testdata/language-features/basic-values/typesig03.out
index 8a2f8bbb..c0f5769f 100644
--- a/testdata/language-features/basic-values/typesig03.out
+++ b/testdata/language-features/basic-values/typesig03.out
@@ -1,9 +1,10 @@
+main is not found
 ------------ desugared source code
 fun1 :: forall (a :: _) (b :: _) (c :: _) . a -> b -> c -> HList '[]
 fun1 = \_ _ _ -> _rhs HNil
+
 fun2 :: forall (a :: _) (b :: _) (c :: _) . a -> b -> c -> HList '[]
 fun2 = \_ _ _ -> _rhs HNil
-main is not found
 ------------ trace
 fun1 :: forall a b c . a -> b -> c -> ()
 fun2 :: forall a b c . a -> b -> c -> ()
diff --git a/testdata/language-features/basic-values/typesig04.out b/testdata/language-features/basic-values/typesig04.out
index 0c98ffa1..b7a2c6b1 100644
--- a/testdata/language-features/basic-values/typesig04.out
+++ b/testdata/language-features/basic-values/typesig04.out
@@ -1,9 +1,10 @@
+main is not found
 ------------ desugared source code
 fun1 :: forall (a :: _) (b :: _) (c :: _) . a -> (b -> c) -> HList '[]
 fun1 = \_ _ -> _rhs HNil
+
 fun2 :: forall (a :: _) (b :: _) (c :: _) . a -> (b -> c) -> HList '[]
 fun2 = \_ _ -> _rhs HNil
-main is not found
 ------------ trace
 fun1 :: forall a b c . a -> (b -> c) -> ()
 fun2 :: forall a b c . a -> (b -> c) -> ()
diff --git a/testdata/language-features/basic-values/typesig05.out b/testdata/language-features/basic-values/typesig05.out
index edceee72..0f4f157e 100644
--- a/testdata/language-features/basic-values/typesig05.out
+++ b/testdata/language-features/basic-values/typesig05.out
@@ -1,13 +1,18 @@
+main is not found
 ------------ desugared source code
 funL = \(a :: _) _ -> _rhs a
+
 funR = \_ (a :: _) -> _rhs a
+
 value1 = _rhs (funL 'a' "b" :: Char)
+
 value2 = _rhs (funR 'a' "b" :: String)
+
 value3 :: Char
 value3 = _rhs (funL 'a' "b")
+
 value4 :: String
 value4 = _rhs (funR 'a' "b")
-main is not found
 ------------ trace
 funL :: forall a b . a -> b -> a
 funR :: forall a b . a -> b -> b
diff --git a/testdata/language-features/basic-values/typesig06.out b/testdata/language-features/basic-values/typesig06.out
index 664b9dec..b933dda4 100644
--- a/testdata/language-features/basic-values/typesig06.out
+++ b/testdata/language-features/basic-values/typesig06.out
@@ -1,9 +1,12 @@
+main is not found
 ------------ desugared source code
 funL = \(a :: _) _ -> _rhs a
+
 (<@) = \(a :: _) _ -> _rhs a
+
 value1 = _rhs ("hi" <@ 1.2 :: String)
+
 value2 = _rhs ("hi" `funL` 1.2 :: String)
-main is not found
 ------------ trace
 funL :: forall a b . a -> b -> a
 (<@) :: forall a b . a -> b -> a
diff --git a/testdata/language-features/basic-values/typesig07.out b/testdata/language-features/basic-values/typesig07.out
index 07a8d0b9..f300eced 100644
--- a/testdata/language-features/basic-values/typesig07.out
+++ b/testdata/language-features/basic-values/typesig07.out
@@ -1,17 +1,22 @@
+main is not found
 ------------ desugared source code
 value1 :: Int
 value1 = _rhs (fromInt 1)
+
 value2 :: Int
 value2 = _rhs (fromInt 2)
+
 value3 :: Int
 value3 = _rhs (fromInt 3)
+
 value4 :: HList '[] -> HList '[] -> HList '[]
 value4 = \_ _ -> _rhs HNil
+
 (@@@) :: HList '[] -> HList '[] -> HList '[]
 (@@@) = \_ _ -> _rhs HNil
+
 value6 :: HList '[] -> HList '[] -> HList '[]
 value6 = \_ _ -> _rhs HNil
-main is not found
 ------------ trace
 value1 :: Int
 value2 :: Int
diff --git a/testdata/language-features/basic-values/typesyn01.out b/testdata/language-features/basic-values/typesyn01.out
index 1b35d979..9481b2bf 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
 ------------ desugared source code
 'MyUnit = _rhs ('HList [])
-main is not found
 ------------ trace
 'MyUnit :: Type
 ------------ tooltips
diff --git a/testdata/language-features/basic-values/typesyn02.out b/testdata/language-features/basic-values/typesyn02.out
index 7713c92a..74f2b730 100644
--- a/testdata/language-features/basic-values/typesyn02.out
+++ b/testdata/language-features/basic-values/typesyn02.out
@@ -1,8 +1,9 @@
+main is not found
 ------------ desugared source code
 'MyUnit = _rhs ('HList [])
+
 fun :: forall (a :: _) . a -> MyUnit -> MyUnit
 fun = \_ (a :: _) -> hlistNilCase _ (_rhs HNil) a
-main is not found
 ------------ trace
 'MyUnit :: Type
 fun :: forall a . a -> () -> ()
diff --git a/testdata/language-features/basic-values/where01.out b/testdata/language-features/basic-values/where01.out
index 9ff7eb28..d278100a 100644
--- a/testdata/language-features/basic-values/where01.out
+++ b/testdata/language-features/basic-values/where01.out
@@ -1,16 +1,26 @@
+main is not found
 ------------ desugared source code
 value1 = _rhs \(a := _rhs HNil) -> HNil
+
 value2 = _rhs \(a := _rhs HNil) -> a
+
 value3 = _rhs \(a := _rhs HNil) (b := _rhs HNil) -> a
+
 value4 = _rhs \(a := _rhs HNil) (b := _rhs HNil) -> b
+
 value5 = _rhs \(a := _rhs HNil) (b := _rhs HNil) -> a
+
 value6 = _rhs HNil
+
 value7 = _rhs HNil
+
 value8 = _rhs HNil
+
 value9 = _rhs \(a := _rhs HNil) (b := _rhs HNil) -> a
+
 value10 = _rhs \(a := _rhs HNil) (b := _rhs HNil) -> a
+
 value11 = _rhs \(a := _rhs HNil) (b := _rhs HNil) -> a
-main is not found
 ------------ trace
 value1 :: ()
 value2 :: ()
diff --git a/testdata/language-features/basic-values/where04.out b/testdata/language-features/basic-values/where04.out
index f5e16747..39410991 100644
--- a/testdata/language-features/basic-values/where04.out
+++ b/testdata/language-features/basic-values/where04.out
@@ -1,8 +1,10 @@
+main is not found
 ------------ desugared source code
 value1 = _rhs \(a := _rhs \(b := _rhs HNil) -> b) -> a
+
 value2 = _rhs \(a := _rhs \(b := _rhs HNil) -> b) -> a
+
 value3 = _rhs \(a := _rhs \(b := _rhs HNil) -> b) -> a
-main is not found
 ------------ trace
 value1 :: ()
 value2 :: ()
diff --git a/testdata/language-features/basic-values/where05.out b/testdata/language-features/basic-values/where05.out
index 8c082555..08d64648 100644
--- a/testdata/language-features/basic-values/where05.out
+++ b/testdata/language-features/basic-values/where05.out
@@ -1,3 +1,4 @@
+main is not found
 ------------ desugared source code
 value1
   = _rhs
@@ -7,6 +8,7 @@ value1
         (\(b := _rhs HNil) -> b)
         (fromInt 1 == a))
       (fromInt 1))
+
 value2
   = _rhs
     ((\(a :: _) -> case'Bool
@@ -15,6 +17,7 @@ value2
         (\(b := _rhs HNil) -> b)
         (fromInt 1 == a))
       (fromInt 1))
+
 value3
   = _rhs
     ((\(a :: _) -> case'Bool
@@ -23,11 +26,11 @@ value3
         (\(b := _rhs HNil) -> b)
         (fromInt 1 == a))
       (fromInt 1))
+
 value4
   = _rhs
     \(a := _rhs HNil) -> (\(b :: _) -> case'Bool (\_ -> _) HNil a (fromInt 1 == b))
       (fromInt 1)
-main is not found
 ------------ trace
 value1 :: forall a . (Eq a, Num a) => ()
 value2 :: forall a . (Eq a, Num a) => ()
diff --git a/testdata/language-features/basic-values/wildcard01.out b/testdata/language-features/basic-values/wildcard01.out
index 61b6a8c4..49f84c4b 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
 ------------ desugared source code
 funUnit = \_ -> _rhs HNil
-main is not found
 ------------ trace
 funUnit :: forall a . a -> ()
 ------------ tooltips
diff --git a/testdata/language-features/comment/comment01.out b/testdata/language-features/comment/comment01.out
index 907bca84..521dcdfe 100644
--- a/testdata/language-features/comment/comment01.out
+++ b/testdata/language-features/comment/comment01.out
@@ -1,2 +1,2 @@
------------- desugared source code
 main is not found
+------------ desugared source code
\ No newline at end of file
diff --git a/testdata/language-features/comment/comment02.out b/testdata/language-features/comment/comment02.out
index 907bca84..521dcdfe 100644
--- a/testdata/language-features/comment/comment02.out
+++ b/testdata/language-features/comment/comment02.out
@@ -1,2 +1,2 @@
------------- desugared source code
 main is not found
+------------ desugared source code
\ No newline at end of file
diff --git a/testdata/language-features/comment/comment03.out b/testdata/language-features/comment/comment03.out
index 907bca84..521dcdfe 100644
--- a/testdata/language-features/comment/comment03.out
+++ b/testdata/language-features/comment/comment03.out
@@ -1,2 +1,2 @@
------------- desugared source code
 main is not found
+------------ desugared source code
\ No newline at end of file
diff --git a/testdata/language-features/comment/comment04.out b/testdata/language-features/comment/comment04.out
index 907bca84..521dcdfe 100644
--- a/testdata/language-features/comment/comment04.out
+++ b/testdata/language-features/comment/comment04.out
@@ -1,2 +1,2 @@
------------- desugared source code
 main is not found
+------------ desugared source code
\ No newline at end of file
diff --git a/testdata/language-features/emptysource.out b/testdata/language-features/emptysource.out
index 907bca84..521dcdfe 100644
--- a/testdata/language-features/emptysource.out
+++ b/testdata/language-features/emptysource.out
@@ -1,2 +1,2 @@
------------- desugared source code
 main is not found
+------------ desugared source code
\ No newline at end of file
diff --git a/testdata/language-features/guard/guard01.out b/testdata/language-features/guard/guard01.out
index b4195756..1405debb 100644
--- a/testdata/language-features/guard/guard01.out
+++ b/testdata/language-features/guard/guard01.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 value = case'Bool (\_ -> _) (_rhs undefined) (_rhs HNil) True
-main is not found
 ------------ trace
 value :: ()
 ------------ tooltips
diff --git a/testdata/language-features/guard/guard03.out b/testdata/language-features/guard/guard03.out
index 7d7f8a4d..6540522a 100644
--- a/testdata/language-features/guard/guard03.out
+++ b/testdata/language-features/guard/guard03.out
@@ -1,3 +1,4 @@
+main is not found
 ------------ desugared source code
 value
   = case'Bool
@@ -5,7 +6,6 @@ value
     (case'Bool (\_ -> _) (_rhs undefined) (_rhs "False") False)
     (_rhs "True")
     True
-main is not found
 ------------ trace
 value :: String
 ------------ tooltips
diff --git a/testdata/language-features/guard/guard04.out b/testdata/language-features/guard/guard04.out
index 21a9ff19..5b55275b 100644
--- a/testdata/language-features/guard/guard04.out
+++ b/testdata/language-features/guard/guard04.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 value = case'Bool (\_ -> _) (_rhs "False") (_rhs "True") True
-main is not found
 ------------ trace
 value :: String
 ------------ tooltips
diff --git a/testdata/language-features/guard/guard06.out b/testdata/language-features/guard/guard06.out
index a62258cc..c568bf3c 100644
--- a/testdata/language-features/guard/guard06.out
+++ b/testdata/language-features/guard/guard06.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 value = _rhs HNil
-main is not found
 ------------ trace
 value :: ()
 ------------ tooltips
diff --git a/testdata/language-features/guard/guard07.out b/testdata/language-features/guard/guard07.out
index acc704ba..acd4ea18 100644
--- a/testdata/language-features/guard/guard07.out
+++ b/testdata/language-features/guard/guard07.out
@@ -1,3 +1,4 @@
+main is not found
 ------------ desugared source code
 value
   = case'Bool
@@ -5,7 +6,6 @@ value
     (case'Bool (\_ -> _) (_rhs undefined) (_rhs "False") False)
     (_rhs "True")
     True
-main is not found
 ------------ trace
 value :: String
 ------------ tooltips
diff --git a/testdata/language-features/guard/guard08.out b/testdata/language-features/guard/guard08.out
index eeef1da6..1f5e5ab3 100644
--- a/testdata/language-features/guard/guard08.out
+++ b/testdata/language-features/guard/guard08.out
@@ -1,3 +1,4 @@
+main is not found
 ------------ desugared source code
 value
   = case'Bool
@@ -5,7 +6,6 @@ value
     (case'Bool (\_ -> _) (_rhs undefined) (_rhs "False") False)
     (_rhs "True")
     True
-main is not found
 ------------ trace
 value :: String
 ------------ tooltips
diff --git a/testdata/language-features/guard/guard09.out b/testdata/language-features/guard/guard09.out
index 09a72fa0..1aa3c7a2 100644
--- a/testdata/language-features/guard/guard09.out
+++ b/testdata/language-features/guard/guard09.out
@@ -1,3 +1,4 @@
+main is not found
 ------------ desugared source code
 value
   = case'Bool
@@ -5,7 +6,6 @@ value
     (case'Bool (\_ -> _) (_rhs undefined) (_rhs "False") False)
     (_rhs "True")
     True
-main is not found
 ------------ trace
 value :: String
 ------------ tooltips
diff --git a/testdata/language-features/guard/guard11.out b/testdata/language-features/guard/guard11.out
index 1d173fb2..b8449128 100644
--- a/testdata/language-features/guard/guard11.out
+++ b/testdata/language-features/guard/guard11.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 fun = \(a :: _) -> case'Bool (\_ -> _) (_rhs "False") (_rhs "True") a
-main is not found
 ------------ trace
 fun :: Bool -> String
 ------------ tooltips
diff --git a/testdata/language-features/guard/guard13.out b/testdata/language-features/guard/guard13.out
index e8bd4c84..3c1e364a 100644
--- a/testdata/language-features/guard/guard13.out
+++ b/testdata/language-features/guard/guard13.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 fun = \(a :: _) -> case'Bool (\_ -> _) (_rhs HNil) (_rhs HNil) a
-main is not found
 ------------ trace
 fun :: Bool -> ()
 ------------ tooltips
diff --git a/testdata/language-features/guard/guard14.out b/testdata/language-features/guard/guard14.out
index e0b32348..a5a039bf 100644
--- a/testdata/language-features/guard/guard14.out
+++ b/testdata/language-features/guard/guard14.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 value = _rhs \(a := case'Bool (\_ -> _) (_rhs HNil) (_rhs HNil) True) -> HNil
-main is not found
 ------------ trace
 value :: ()
 ------------ tooltips
diff --git a/testdata/language-features/guard/guard15.out b/testdata/language-features/guard/guard15.out
index 733c2b34..5c7fc3b8 100644
--- a/testdata/language-features/guard/guard15.out
+++ b/testdata/language-features/guard/guard15.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 value = _rhs \(a := case'Bool (\_ -> _) (_rhs HNil) (_rhs HNil) True) -> HNil
-main is not found
 ------------ trace
 value :: ()
 ------------ tooltips
diff --git a/testdata/language-features/guard/guard16.out b/testdata/language-features/guard/guard16.out
index 4fc90e30..311d7db0 100644
--- a/testdata/language-features/guard/guard16.out
+++ b/testdata/language-features/guard/guard16.out
@@ -1,3 +1,4 @@
+main is not found
 ------------ desugared source code
 value
   = _rhs
@@ -7,7 +8,6 @@ value
         (case'Bool (\_ -> _) HNil HNil True)
         (fromInt 1 == a))
       (fromInt 1))
-main is not found
 ------------ trace
 value :: forall a . (Eq a, Num a) => ()
 ------------ tooltips
diff --git a/testdata/language-features/module/Hello01.out b/testdata/language-features/module/Hello01.out
index aee194f1..34f3f918 100644
--- a/testdata/language-features/module/Hello01.out
+++ b/testdata/language-features/module/Hello01.out
@@ -1,7 +1,8 @@
+main is not found
 ------------ desugared source code
 hello = _rhs "hello"
+
 world = _rhs "world"
-main is not found
 ------------ trace
 hello :: String
 world :: String
diff --git a/testdata/language-features/module/Hello02.out b/testdata/language-features/module/Hello02.out
index 9d582484..fc3a7be7 100644
--- a/testdata/language-features/module/Hello02.out
+++ b/testdata/language-features/module/Hello02.out
@@ -1,7 +1,8 @@
+main is not found
 ------------ desugared source code
 hello = _rhs "hello"
+
 world = _rhs "world"
-main is not found
 ------------ trace
 hello :: String
 world :: String
diff --git a/testdata/language-features/module/Hello03.out b/testdata/language-features/module/Hello03.out
index 98956c8a..8a645fda 100644
--- a/testdata/language-features/module/Hello03.out
+++ b/testdata/language-features/module/Hello03.out
@@ -1,7 +1,8 @@
+main is not found
 ------------ desugared source code
 greeting = _rhs 'G'
+
 value = _rhs 12.2
-main is not found
 ------------ trace
 greeting :: Char
 value :: Float
diff --git a/testdata/language-features/module/ModulePackage/SubModule01.out b/testdata/language-features/module/ModulePackage/SubModule01.out
index 44457c17..119eaeac 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
 ------------ desugared source code
 hello = _rhs "Hello"
-main is not found
 ------------ trace
 hello :: String
 ------------ tooltips
diff --git a/testdata/language-features/module/Moduledef01.out b/testdata/language-features/module/Moduledef01.out
index 907bca84..521dcdfe 100644
--- a/testdata/language-features/module/Moduledef01.out
+++ b/testdata/language-features/module/Moduledef01.out
@@ -1,2 +1,2 @@
------------- desugared source code
 main is not found
+------------ desugared source code
\ No newline at end of file
diff --git a/testdata/language-features/module/Moduledef06.out b/testdata/language-features/module/Moduledef06.out
index 95f989ee..ef523d5a 100644
--- a/testdata/language-features/module/Moduledef06.out
+++ b/testdata/language-features/module/Moduledef06.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 hello = _rhs "hello"
-main is not found
 ------------ trace
 hello :: String
 ------------ tooltips
diff --git a/testdata/language-features/module/Moduledef07.out b/testdata/language-features/module/Moduledef07.out
index 0dafaaa8..ac2aa83e 100644
--- a/testdata/language-features/module/Moduledef07.out
+++ b/testdata/language-features/module/Moduledef07.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 hello = _rhs "hello"
-main is not found
 ------------ trace
 hello :: String
 ------------ tooltips
diff --git a/testdata/language-features/module/Moduledef08.out b/testdata/language-features/module/Moduledef08.out
index d7add14b..e2b3e946 100644
--- a/testdata/language-features/module/Moduledef08.out
+++ b/testdata/language-features/module/Moduledef08.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 hello = _rhs "hello"
-main is not found
 ------------ trace
 hello :: String
 ------------ tooltips
diff --git a/testdata/language-features/module/Moduledef09.out b/testdata/language-features/module/Moduledef09.out
index f90be0b2..503326bb 100644
--- a/testdata/language-features/module/Moduledef09.out
+++ b/testdata/language-features/module/Moduledef09.out
@@ -1,7 +1,8 @@
+main is not found
 ------------ desugared source code
 hello = _rhs "hello"
+
 world = _rhs "world"
-main is not found
 ------------ trace
 hello :: String
 world :: String
diff --git a/testdata/language-features/module/Moduledef10.out b/testdata/language-features/module/Moduledef10.out
index 2928a534..42b98df9 100644
--- a/testdata/language-features/module/Moduledef10.out
+++ b/testdata/language-features/module/Moduledef10.out
@@ -1,8 +1,10 @@
+main is not found
 ------------ desugared source code
 hello = _rhs "hello"
+
 world = _rhs "world"
+
 value = _rhs HNil
-main is not found
 ------------ trace
 hello :: String
 world :: String
diff --git a/testdata/language-features/module/Moduledef13.out b/testdata/language-features/module/Moduledef13.out
index 7b6fb91d..90ae50c7 100644
--- a/testdata/language-features/module/Moduledef13.out
+++ b/testdata/language-features/module/Moduledef13.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 hello = _rhs "hello"
-main is not found
 ------------ trace
 hello :: String
 ------------ tooltips
diff --git a/testdata/language-features/module/TypeSyn01Mod.out b/testdata/language-features/module/TypeSyn01Mod.out
index a43e184e..51565796 100644
--- a/testdata/language-features/module/TypeSyn01Mod.out
+++ b/testdata/language-features/module/TypeSyn01Mod.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 'MyUnit = _rhs ('HList [])
-main is not found
 ------------ trace
 'MyUnit :: Type
 ------------ tooltips
diff --git a/testdata/language-features/module/import01.out b/testdata/language-features/module/import01.out
index 0c9e505e..531eae39 100644
--- a/testdata/language-features/module/import01.out
+++ b/testdata/language-features/module/import01.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 x = _rhs hello
-main is not found
 ------------ trace
 x :: String
 ------------ tooltips
diff --git a/testdata/language-features/module/import05.out b/testdata/language-features/module/import05.out
index 4cb3a2f4..9dfe0dba 100644
--- a/testdata/language-features/module/import05.out
+++ b/testdata/language-features/module/import05.out
@@ -1,7 +1,7 @@
+main is not found
 ------------ desugared source code
 x :: String
 x = _rhs hello
-main is not found
 ------------ trace
 x :: String
 ------------ tooltips
diff --git a/testdata/language-features/module/import06.out b/testdata/language-features/module/import06.out
index a8852987..fd792bd3 100644
--- a/testdata/language-features/module/import06.out
+++ b/testdata/language-features/module/import06.out
@@ -1,7 +1,8 @@
+main is not found
 ------------ desugared source code
 hello = _rhs HNil
+
 x = _rhs world
-main is not found
 ------------ trace
 hello :: ()
 x :: String
diff --git a/testdata/language-features/module/import07.out b/testdata/language-features/module/import07.out
index c9285662..4bb045c3 100644
--- a/testdata/language-features/module/import07.out
+++ b/testdata/language-features/module/import07.out
@@ -1,7 +1,8 @@
+main is not found
 ------------ desugared source code
 hello = _rhs HNil
+
 x = _rhs world
-main is not found
 ------------ trace
 hello :: ()
 x :: String
diff --git a/testdata/language-features/module/import08.out b/testdata/language-features/module/import08.out
index ce0235db..aad9ca58 100644
--- a/testdata/language-features/module/import08.out
+++ b/testdata/language-features/module/import08.out
@@ -1,12 +1,15 @@
+main is not found
 ------------ desugared source code
 value = _rhs HNil
+
 g :: Char
 g = _rhs greeting
+
 h :: String
 h = _rhs hello
+
 w :: String
 w = _rhs world
-main is not found
 ------------ trace
 value :: ()
 g :: Char
diff --git a/testdata/language-features/module/import09.out b/testdata/language-features/module/import09.out
index 42b1de3a..12e13325 100644
--- a/testdata/language-features/module/import09.out
+++ b/testdata/language-features/module/import09.out
@@ -1,7 +1,7 @@
+main is not found
 ------------ desugared source code
 fun :: forall (a :: _) . a -> MyUnit -> MyUnit
 fun = \_ (a :: _) -> hlistNilCase _ (_rhs HNil) a
-main is not found
 ------------ trace
 fun :: forall a . a -> () -> ()
 ------------ tooltips
diff --git a/testdata/language-features/module/import12.out b/testdata/language-features/module/import12.out
index 32b7bdd8..df4d894b 100644
--- a/testdata/language-features/module/import12.out
+++ b/testdata/language-features/module/import12.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 fun = _rhs hello
-main is not found
 ------------ trace
 fun :: String
 ------------ tooltips
diff --git a/testdata/language-features/module/import13.out b/testdata/language-features/module/import13.out
index 7167ad27..68ed44d8 100644
--- a/testdata/language-features/module/import13.out
+++ b/testdata/language-features/module/import13.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 fun = _rhs hello
-main is not found
 ------------ trace
 fun :: String
 ------------ tooltips
diff --git a/testdata/language-features/module/import14.out b/testdata/language-features/module/import14.out
index 19d18b88..958207ba 100644
--- a/testdata/language-features/module/import14.out
+++ b/testdata/language-features/module/import14.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 fun = _rhs hello
-main is not found
 ------------ trace
 fun :: String
 ------------ tooltips
diff --git a/testdata/language-features/module/import15.out b/testdata/language-features/module/import15.out
index bb60b565..8727ac08 100644
--- a/testdata/language-features/module/import15.out
+++ b/testdata/language-features/module/import15.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 fun = _rhs hello
-main is not found
 ------------ trace
 fun :: String
 ------------ tooltips
diff --git a/testdata/language-features/pattern/pattern01.out b/testdata/language-features/pattern/pattern01.out
index 1683fdec..eeda616d 100644
--- a/testdata/language-features/pattern/pattern01.out
+++ b/testdata/language-features/pattern/pattern01.out
@@ -1,9 +1,12 @@
+main is not found
 ------------ desugared source code
 fun1 = \(a :: _) -> case'Bool (\_ -> _) (_rhs '_') (_rhs '0') (fromInt 0 == a)
+
 fun2 = \(a :: _) -> case'Bool (\_ -> _) (_rhs '_') (_rhs '0') ("0" == a)
+
 fun3 = \(a :: _) -> case'Bool (\_ -> _) (_rhs '_') (_rhs '0') ('0' == a)
+
 fun4 = \(a :: _) -> hlistNilCase _ (_rhs '0') a
-main is not found
 ------------ trace
 fun1 :: forall a . (Eq a, Num a) => a -> Char
 fun2 :: String -> Char
diff --git a/testdata/language-features/pattern/uncovered.out b/testdata/language-features/pattern/uncovered.out
index 531a913a..4302e4ac 100644
--- a/testdata/language-features/pattern/uncovered.out
+++ b/testdata/language-features/pattern/uncovered.out
@@ -1,3 +1,4 @@
+main is not found
 ------------ desugared source code
 f
   = \(a :: _) (b :: _) (c :: _) -> case'Bool
@@ -13,6 +14,7 @@ f
       (case'Bool (\_ -> _) (_rhs (fromInt 1)) (_rhs undefined) a)
       c)
     b
+
 g
   = \(a :: _) -> case'List
     (\_ -> _)
@@ -39,6 +41,7 @@ g
         c)
       b)
     a
+
 h
   = \(a :: _) -> case'List
     (\_ -> _)
@@ -73,7 +76,6 @@ h
         d)
       b)
     a
-main is not found
 ------------ trace
 f :: forall a . Num a => Bool -> Bool -> Bool -> a
 g :: [Bool] -> Bool
diff --git a/testdata/language-features/pattern/unreachable.out b/testdata/language-features/pattern/unreachable.out
index 06c9ca43..f7961855 100644
--- a/testdata/language-features/pattern/unreachable.out
+++ b/testdata/language-features/pattern/unreachable.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 f = \_ -> _rhs "hello"
-main is not found
 ------------ trace
 f :: forall a . a -> String
 ------------ tooltips
diff --git a/testdata/language-features/pragma/pragma01.out b/testdata/language-features/pragma/pragma01.out
index 907bca84..521dcdfe 100644
--- a/testdata/language-features/pragma/pragma01.out
+++ b/testdata/language-features/pragma/pragma01.out
@@ -1,2 +1,2 @@
------------- desugared source code
 main is not found
+------------ desugared source code
\ No newline at end of file
diff --git a/testdata/language-features/pragma/pragma02.out b/testdata/language-features/pragma/pragma02.out
index 907bca84..521dcdfe 100644
--- a/testdata/language-features/pragma/pragma02.out
+++ b/testdata/language-features/pragma/pragma02.out
@@ -1,2 +1,2 @@
------------- desugared source code
 main is not found
+------------ desugared source code
\ No newline at end of file
diff --git a/testdata/language-features/pragma/pragma03.out b/testdata/language-features/pragma/pragma03.out
index 907bca84..521dcdfe 100644
--- a/testdata/language-features/pragma/pragma03.out
+++ b/testdata/language-features/pragma/pragma03.out
@@ -1,2 +1,2 @@
------------- desugared source code
 main is not found
+------------ desugared source code
\ No newline at end of file
diff --git a/testdata/language-features/pragma/pragma04.out b/testdata/language-features/pragma/pragma04.out
index 907bca84..521dcdfe 100644
--- a/testdata/language-features/pragma/pragma04.out
+++ b/testdata/language-features/pragma/pragma04.out
@@ -1,2 +1,2 @@
------------- desugared source code
 main is not found
+------------ desugared source code
\ No newline at end of file
diff --git a/testdata/language-features/recursion/simplerec01.out b/testdata/language-features/recursion/simplerec01.out
index 89006870..656adc64 100644
--- a/testdata/language-features/recursion/simplerec01.out
+++ b/testdata/language-features/recursion/simplerec01.out
@@ -1,3 +1,4 @@
+main is not found
 ------------ desugared source code
 fun
   = \(a :: _) -> case'Bool
@@ -5,7 +6,6 @@ fun
     (_rhs (fun (fromInt 0)))
     (_rhs 'a')
     (fromInt 0 == a)
-main is not found
 ------------ trace
 fun :: forall a . (Num a, Eq a, Num a) => a -> Char
 ------------ tooltips
diff --git a/testdata/language-features/recursion/simplerec02.out b/testdata/language-features/recursion/simplerec02.out
index 7f24ea1c..c0d26e86 100644
--- a/testdata/language-features/recursion/simplerec02.out
+++ b/testdata/language-features/recursion/simplerec02.out
@@ -1,3 +1,4 @@
+main is not found
 ------------ desugared source code
 value
   = _rhs
@@ -8,7 +9,6 @@ value
           (_rhs (b (fromInt 0)))
           (_rhs 'a')
           (fromInt 0 == c)) -> HNil
-main is not found
 ------------ trace
 value :: ()
 ------------ tooltips
diff --git a/testdata/language-features/recursion/simplerec03.out b/testdata/language-features/recursion/simplerec03.out
index 512baba5..5c4f7185 100644
--- a/testdata/language-features/recursion/simplerec03.out
+++ b/testdata/language-features/recursion/simplerec03.out
@@ -1,3 +1,4 @@
+main is not found
 ------------ desugared source code
 value
   = _rhs
@@ -8,7 +9,6 @@ value
           (_rhs (b (fromInt 0)))
           (_rhs 'a')
           (fromInt 0 == c)) -> HNil
-main is not found
 ------------ trace
 value :: ()
 ------------ tooltips
diff --git a/testdata/language-features/section/section01.out b/testdata/language-features/section/section01.out
index dd5e5093..a502f9f5 100644
--- a/testdata/language-features/section/section01.out
+++ b/testdata/language-features/section/section01.out
@@ -1,8 +1,10 @@
+main is not found
 ------------ desugared source code
 (!@!) = \_ _ -> _rhs HNil
+
 value1 = \(a :: _) -> _rhs \(b :: _) -> a !@! b
+
 value2 = \(a :: _) -> _rhs \(b :: _) -> b !@! a
-main is not found
 ------------ trace
 (!@!) :: forall a b . a -> b -> ()
 value1 :: forall a b . a -> b -> ()
diff --git a/testdata/let.out b/testdata/let.out
index 1789d86f..2f8be352 100644
--- a/testdata/let.out
+++ b/testdata/let.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 f = \(a :: _) -> _rhs \(b := _rhs (id a)) -> b
-main is not found
 ------------ trace
 f :: forall a . a -> a
 ------------ tooltips
diff --git a/testdata/letIndent.out b/testdata/letIndent.out
index c6cf7e43..187a6088 100644
--- a/testdata/letIndent.out
+++ b/testdata/letIndent.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 fun = \(a :: _) -> _rhs \(b := _rhs (fromInt 1)) (c := _rhs (fromInt 2)) -> a
-main is not found
 ------------ trace
 fun :: forall a . a -> a
 ------------ tooltips
diff --git a/testdata/performance/Material.out b/testdata/performance/Material.out
index a9cebf12..ef9a0f94 100644
--- a/testdata/performance/Material.out
+++ b/testdata/performance/Material.out
@@ -1,16 +1,23 @@
+main is not found
 ------------ desugared source code
 identityLight :: Float
 identityLight = _rhs (fromInt 1)
+
 data Entity :: Type where
     Entity
       :: Vec (fromInt 4) Float
         -> Vec (fromInt 4) Float
           -> Vec (fromInt 3) Float -> Vec (fromInt 4) Float -> Entity
+
 eAmbientLight = \(a :: _) -> case'Entity (\_ -> _) (\(b :: _) _ _ _ -> _rhs b) a
+
 eDirectedLight
   = \(a :: _) -> case'Entity (\_ -> _) (\_ (b :: _) _ _ -> _rhs b) a
+
 eLightDir = \(a :: _) -> case'Entity (\_ -> _) (\_ _ (b :: _) _ -> _rhs b) a
+
 eShaderRGBA = \(a :: _) -> case'Entity (\_ -> _) (\_ _ _ (b :: _) -> _rhs b) a
+
 data WaveType :: Type where
     WT_Sin :: WaveType
     WT_Triangle :: WaveType
@@ -18,8 +25,10 @@ data WaveType :: Type where
     WT_Sawtooth :: WaveType
     WT_InverseSawtooth :: WaveType
     WT_Noise :: WaveType
+
 data Wave :: Type where
     Wave :: WaveType -> Float -> Float -> Float -> Float -> Wave
+
 data Deform :: Type where
     D_AutoSprite :: Deform
     D_AutoSprite2 :: Deform
@@ -36,10 +45,12 @@ data Deform :: Type where
     D_Text6 :: Deform
     D_Text7 :: Deform
     D_Wave :: Float -> Wave -> Deform
+
 data CullType :: Type where
     CT_FrontSided :: CullType
     CT_BackSided :: CullType
     CT_TwoSided :: CullType
+
 data Blending' :: Type where
     B_DstAlpha :: Blending'
     B_DstColor :: Blending'
@@ -52,6 +63,7 @@ data Blending' :: Type where
     B_SrcAlphaSaturate :: Blending'
     B_SrcColor :: Blending'
     B_Zero :: Blending'
+
 data RGBGen :: Type where
     RGB_Wave :: Wave -> RGBGen
     RGB_Const :: Float -> Float -> Float -> RGBGen
@@ -64,6 +76,7 @@ data RGBGen :: Type where
     RGB_LightingDiffuse :: RGBGen
     RGB_OneMinusVertex :: RGBGen
     RGB_Undefined :: RGBGen
+
 data AlphaGen :: Type where
     A_Wave :: Wave -> AlphaGen
     A_Const :: Float -> AlphaGen
@@ -74,12 +87,14 @@ data AlphaGen :: Type where
     A_Vertex :: AlphaGen
     A_LightingSpecular :: AlphaGen
     A_OneMinusVertex :: AlphaGen
+
 data TCGen :: Type where
     TG_Base :: TCGen
     TG_Lightmap :: TCGen
     TG_Environment :: TCGen
     TG_Vector :: Vec (fromInt 3) Float -> Vec (fromInt 3) Float -> TCGen
     TG_Undefined :: TCGen
+
 data TCMod :: Type where
     TM_EntityTranslate :: TCMod
     TM_Rotate :: Float -> TCMod
@@ -88,19 +103,23 @@ data TCMod :: Type where
     TM_Stretch :: Wave -> TCMod
     TM_Transform :: Float -> Float -> Float -> Float -> Float -> Float -> TCMod
     TM_Turb :: Float -> Float -> Float -> Float -> TCMod
+
 data StageTexture :: Type where
     ST_Map :: String -> StageTexture
     ST_ClampMap :: String -> StageTexture
     ST_AnimMap :: Float -> [String] -> StageTexture
     ST_Lightmap :: StageTexture
     ST_WhiteImage :: StageTexture
+
 data AlphaFunction :: Type where
     A_Gt0 :: AlphaFunction
     A_Lt128 :: AlphaFunction
     A_Ge128 :: AlphaFunction
+
 data DepthFunction :: Type where
     D_Equal :: DepthFunction
     D_Lequal :: DepthFunction
+
 data StageAttrs :: Type where
     StageAttrs
       :: Maybe (HList (Blending' : Blending' : '[]))
@@ -110,61 +129,73 @@ data StageAttrs :: Type where
               -> [TCMod]
                 -> StageTexture
                   -> Bool -> DepthFunction -> Maybe AlphaFunction -> Bool -> String -> StageAttrs
+
 saBlend
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\(b :: _) _ _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
+
 saRGBGen
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\_ (b :: _) _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
+
 saAlphaGen
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\_ _ (b :: _) _ _ _ _ _ _ _ _ -> _rhs b)
     a
+
 saTCGen
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\_ _ _ (b :: _) _ _ _ _ _ _ _ -> _rhs b)
     a
+
 saTCMod
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\_ _ _ _ (b :: _) _ _ _ _ _ _ -> _rhs b)
     a
+
 saTexture
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\_ _ _ _ _ (b :: _) _ _ _ _ _ -> _rhs b)
     a
+
 saDepthWrite
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ (b :: _) _ _ _ _ -> _rhs b)
     a
+
 saDepthFunc
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ _ (b :: _) _ _ _ -> _rhs b)
     a
+
 saAlphaFunc
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ _ _ (b :: _) _ _ -> _rhs b)
     a
+
 saDepthMaskExplicit
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ _ _ _ (b :: _) _ -> _rhs b)
     a
+
 saTextureUniform
   = \(a :: _) -> case'StageAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ _ _ _ _ (b :: _) -> _rhs b)
     a
+
 defaultStageAttrs :: StageAttrs
 defaultStageAttrs
   = _rhs
@@ -180,6 +211,7 @@ defaultStageAttrs
       Nothing
       False
       "")
+
 data CommonAttrs :: Type where
     CommonAttrs
       :: HList '[]
@@ -189,66 +221,79 @@ data CommonAttrs :: Type where
               -> Bool
                 -> Bool
                   -> CullType -> [Deform] -> Bool -> Bool -> [StageAttrs] -> Bool -> CommonAttrs
+
 caSkyParms
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\(b :: _) _ _ _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
+
 caFogParms
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ (b :: _) _ _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
+
 caPortal
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ _ (b :: _) _ _ _ _ _ _ _ _ _ -> _rhs b)
     a
+
 caSort
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ _ _ (b :: _) _ _ _ _ _ _ _ _ -> _rhs b)
     a
+
 caEntityMergable
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ _ _ _ (b :: _) _ _ _ _ _ _ _ -> _rhs b)
     a
+
 caFogOnly
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ _ _ _ _ (b :: _) _ _ _ _ _ _ -> _rhs b)
     a
+
 caCull
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ (b :: _) _ _ _ _ _ -> _rhs b)
     a
+
 caDeformVertexes
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ _ (b :: _) _ _ _ _ -> _rhs b)
     a
+
 caNoMipMaps
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ _ _ (b :: _) _ _ _ -> _rhs b)
     a
+
 caPolygonOffset
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ _ _ _ (b :: _) _ _ -> _rhs b)
     a
+
 caStages
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ _ _ _ _ (b :: _) _ -> _rhs b)
     a
+
 caIsSky
   = \(a :: _) -> case'CommonAttrs
     (\_ -> _)
     (\_ _ _ _ _ _ _ _ _ _ _ (b :: _) -> _rhs b)
     a
+
 defaultCommonAttrs :: CommonAttrs
 defaultCommonAttrs
   = _rhs
@@ -265,7 +310,6 @@ defaultCommonAttrs
       False
       []
       False)
-main is not found
 ------------ trace
 identityLight :: Float
 'Entity :: Type
diff --git a/testdata/performance/SampleMaterial.out b/testdata/performance/SampleMaterial.out
index 95b4da4a..d48fe86c 100644
--- a/testdata/performance/SampleMaterial.out
+++ b/testdata/performance/SampleMaterial.out
@@ -1,3 +1,4 @@
+main is not found
 ------------ desugared source code
 sampleMaterial
   = _rhs
@@ -2076,7 +2077,6 @@ sampleMaterial
                                                                                                               False)
                                                                                                             HNil)
                                                                                                         : [])
-main is not found
 ------------ trace
 sampleMaterial :: [(String, CommonAttrs)]
 ------------ tooltips
diff --git a/testdata/qualified.out b/testdata/qualified.out
index 907bca84..521dcdfe 100644
--- a/testdata/qualified.out
+++ b/testdata/qualified.out
@@ -1,2 +1,2 @@
------------- desugared source code
 main is not found
+------------ desugared source code
\ No newline at end of file
diff --git a/testdata/traceTest.out b/testdata/traceTest.out
index d796730f..75428209 100644
--- a/testdata/traceTest.out
+++ b/testdata/traceTest.out
@@ -1,10 +1,12 @@
+main is not found
 ------------ desugared source code
 id = \(a :: _) -> _rhs a
+
 data X (_ :: Type) (_ :: _a) :: Type where
     
+
 x :: X \(a :: _) (b :: _) -> HList (a : b : '[])
 x = _rhs undefined
-main is not found
 ------------ trace
 id :: forall a . a -> a
 'X :: forall a . a -> Type
diff --git a/testdata/typeclass.out b/testdata/typeclass.out
index b74a7e31..aecc4686 100644
--- a/testdata/typeclass.out
+++ b/testdata/typeclass.out
@@ -1,12 +1,21 @@
+main is not found
 ------------ desugared source code
 infix 4 ==
+
 infix 4 /=
+
 infix 4 <
+
 infixr 3 &&
+
 infixr 2 ||
+
 not = \(a :: _) -> case'Bool (\_ -> _) (_rhs True) (_rhs False) a
+
 (&&) = \(a :: _) (b :: _) -> case'Bool (\_ -> _) (_rhs False) (_rhs b) a
+
 (||) = \(a :: _) (b :: _) -> case'Bool (\_ -> _) (_rhs b) (_rhs True) a
+
 'Eq :: Type -> Type
 'Eq
   = \(a :: _) -> match'Bool
@@ -14,6 +23,7 @@ not = \(a :: _) -> case'Bool (\_ -> _) (_rhs True) (_rhs False) a
     (_rhs 'Unit)
     a
     (_rhs ('Empty "no instance of 'Eq on ???"))
+
 (==) :: forall a . Eq a => a -> a -> Bool
 (==)
   = \ @a @_ -> match'Bool
@@ -23,8 +33,8 @@ not = \(a :: _) -> case'Bool (\_ -> _) (_rhs True) (_rhs False) a
         := \(c :: _) (d :: _) -> case'Bool (\_ -> _) (_rhs (not d)) (_rhs d) c) -> b)
     a
     (_rhs undefined)
+
 (/=) = \(a :: _) (b :: _) -> _rhs (not (a == b))
-main is not found
 ------------ trace
 not :: Bool -> Bool
 (&&) :: Bool -> Bool -> Bool
diff --git a/testdata/where.out b/testdata/where.out
index 89ee58f1..6ba06bfc 100644
--- a/testdata/where.out
+++ b/testdata/where.out
@@ -1,6 +1,6 @@
+main is not found
 ------------ desugared source code
 f = _rhs \(a := _rhs \(c := _rhs 1.0) -> c) (b := _rhs 1.0) -> b
-main is not found
 ------------ trace
 f :: Float
 ------------ tooltips
diff --git a/testdata/zip01.out b/testdata/zip01.out
index 582866bb..650f67b5 100644
--- a/testdata/zip01.out
+++ b/testdata/zip01.out
@@ -1,3 +1,4 @@
+main is not found
 ------------ desugared source code
 zip2 :: forall (a :: _) (b :: _) . [a] -> [b] -> [HList (a : b : '[])]
 zip2
@@ -10,7 +11,6 @@ zip2
       (\(e :: _) (f :: _) -> _rhs (HCons c (HCons e HNil) : zip2 d f))
       b)
     a
-main is not found
 ------------ trace
 zip2 :: forall a b . [a] -> [b] -> [(a, b)]
 ------------ tooltips