diff --git a/ghc/tests/Makefile b/ghc/tests/Makefile
index 1220e7e9c7aebe8f9d0898609d5608e013455d44..f70286764c0ae1e6613108a535eb7266897f8928 100644
--- a/ghc/tests/Makefile
+++ b/ghc/tests/Makefile
@@ -1,7 +1,7 @@
 TOP = .
 include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS = 
+SUBDIRS = \
 	ccall \
 	codeGen \
 	deSugar \
diff --git a/ghc/tests/deSugar/should_compile/ds014a.hs b/ghc/tests/deSugar/should_compile/ds014a.hs
deleted file mode 100644
index 8ed88c0ea0ab235ab3b187f473c2708cc923a7e8..0000000000000000000000000000000000000000
--- a/ghc/tests/deSugar/should_compile/ds014a.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-module Tests where
-
--- this char is forbidden
-c = '\&'
diff --git a/ghc/tests/deSugar/should_compile/ds014a.stderr b/ghc/tests/deSugar/should_compile/ds014a.stderr
deleted file mode 100644
index e845ab9d71939f7fa2614926c8bd45901f6e2c64..0000000000000000000000000000000000000000
--- a/ghc/tests/deSugar/should_compile/ds014a.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-ds014a.hs:4:7: Illegal character escape: `\&'
-ds014a.hs:4:7:  on input: "&"
diff --git a/ghc/tests/printing/should_compile/Makefile b/ghc/tests/printing/should_compile/Makefile
index fcd30de8ca945b603f0a8819b52cb5a8c6124ab7..4c6d9a7a295277e20134e7ce84c0509c3a731377 100644
--- a/ghc/tests/printing/should_compile/Makefile
+++ b/ghc/tests/printing/should_compile/Makefile
@@ -2,7 +2,7 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/should_compile.mk
 
-HC_OPTS += -noC -dcore-lint -hi
+HC_OPTS += -noC -dcore-lint -hi -ddump-tc
 
 print002_HC_OPTS = -fno-implicit-prelude
 
diff --git a/ghc/tests/printing/should_compile/Print001.stderr b/ghc/tests/printing/should_compile/Print001.stderr
index 6ed7dd4aa705c1b96f45ab4a98ac04024095b29b..89ca0325555e5e27c710f94c733c26f67ea8f275 100644
--- a/ghc/tests/printing/should_compile/Print001.stderr
+++ b/ghc/tests/printing/should_compile/Print001.stderr
@@ -1,7 +1,4 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 BarNil{-r8,x-}{i} = _/\_ a_tr4F -> BarNil{-r8,x-}{i} {_@_ a_tr4F}
 BarCon{-r7,x-}{i} =
     _/\_ a_tr4F -> \ tpl_B1 tpl_B2 ->
@@ -10,35 +7,36 @@ MkFoo{-r4M,x-}{i} =
     _/\_ d_tr4H e_tr4I f_tr4J -> \ tpl_B1 tpl_B2 tpl_B3 ->
 	MkFoo{-r4M,x-}{i}
 	    {_@_ d_tr4H _@_ e_tr4I _@_ f_tr4J tpl_B1 tpl_B2 tpl_B3}
-AbsBinds [taYe, taYf] [] [([taYf, taYe], g{-r4w,x-}, g_aYb)]
-    g_aYb x_r4D = lit_aZr
+AbsBinds [taYm, taYn] [] [([taYn, taYm], g{-r4w,x-}, g_aYj)]
+    g_aYj x_r4D = lit_aZz
 AbsBinds
-[taYt, taYu, taYv]
-[d.Eq_aYx, d.Ord_aYy, d.Ix_aYz]
-[([taYt, taYu, taYv], f2{-r4v,x-}, f2_aYq)]
-    f2_aYq x_r4B = x_r4B
+[taYB, taYC, taYD]
+[d.Eq_aYF, d.Ord_aYG, d.Ix_aYH]
+[([taYB, taYC, taYD], f2{-r4v,x-}, f2_aYy)]
+    f2_aYy x_r4B = x_r4B
 AbsBinds
-[taYK, taYL, taYM]
-[d.Eq_aYO]
-[([taYK, taYL, taYM], f{-r4u,x-}, f_aYH)]
-    f_aYH x_r4z = x_r4z
+[taYS, taYT, taYU]
+[d.Eq_aYW]
+[([taYS, taYT, taYU], f{-r4u,x-}, f_aYP)]
+    f_aYP x_r4z = x_r4z
 AbsBinds
-[taYU, taYW, taYY]
+[taZ2, taZ4, taZ6]
 []
-[([taYU, taYW, taYY], mkFoo{-r4x,x-}, mkFoo_aYQ)]
-    mkFoo_aYQ = MkFoo{-r4M,x-}{i} [taYU, taYW, taYY]
-AbsBinds [taZg] [] [([taZg], $d1{-rZn,x-}, d.Eval_aZ4)]
-    d.Eval_aZ4 = ({-dict-} [] [])
+[([taZ2, taZ4, taZ6], mkFoo{-r4x,x-}, mkFoo_aYY)]
+    mkFoo_aYY = MkFoo{-r4M,x-}{i} [taZ2, taZ4, taZ6]
+AbsBinds [taZo] [] [([taZo], $d1{-rZv,x-}, d.Eval_aZc)]
+    d.Eval_aZc = ({-dict-} [] [])
 AbsBinds
-[taZh, taZi, taZj]
+[taZp, taZq, taZr]
 []
-[([taZh, taZi, taZj], $d2{-rZp,x-}, d.Eval_aZc)]
-    d.Eval_aZc = ({-dict-} [] [])
-d.Fractional_aZf = PrelNum.$d23{-rES,p-}
-fromRational_aZq =
+[([taZp, taZq, taZr], $d2{-rZx,x-}, d.Eval_aZk)]
+    d.Eval_aZk = ({-dict-} [] [])
+d.Fractional_aZn = PrelNum.$d23{-rES,p-}
+fromRational_aZy =
     PrelNum.fromRational{-8T,p-} PrelBase.Float{-3c,W-}
-	d.Fractional_aZf
-lit_aZr = fromRational_aZq 2.0000000000000000
+	d.Fractional_aZn
+lit_aZz = fromRational_aZy 2.0000000000000000
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ Print001 1
 _instance_modules_
diff --git a/ghc/tests/printing/should_compile/Print002.stderr b/ghc/tests/printing/should_compile/Print002.stderr
index 0847ddb349407250d03291e0fabd7227e105b03f..abb6cc410157613f6f3d0de0f79711f3514d5ae5 100644
--- a/ghc/tests/printing/should_compile/Print002.stderr
+++ b/ghc/tests/printing/should_compile/Print002.stderr
@@ -1,7 +1,4 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 MkFoo1{-rk,x-}{i} =
     _/\_ a_tr4k b_tr4l c_tr4m -> \ tpl_B1 tpl_B2 ->
 	MkFoo1{-rk,x-}{i} {_@_ a_tr4k _@_ b_tr4l _@_ c_tr4m tpl_B1 tpl_B2}
@@ -14,243 +11,243 @@ MkFoo3{-rm,x-}{i} =
 :***{-ro,x-}{i} =
     _/\_ a_tr4k b_tr4l c_tr4m -> \ tpl_B1 tpl_B2 ->
 	:***{-ro,x-}{i} {_@_ a_tr4k _@_ b_tr4l _@_ c_tr4m tpl_B1 tpl_B2}
-AbsBinds [taFI] [d.Bar_aFL] [([taFI], f3d{-r4o,x-}, f3d_aFv)]
-    /////_aQY = /////{-r4C,x-} taFI d.Bar_aFL
-    f3d_aFv x_r48 y_r49 = x_r48 /////_aQY y_r49
-AbsBinds [taG0] [d.Bar_aG3] [([taG0], f3c{-r4p,x-}, f3c_aFN)]
-    /////_aR3 = /////{-r4C,x-} taG0 d.Bar_aG3
-    f3c_aFN x_r45 y_r46 = /////_aR3 x_r45 y_r46
-AbsBinds [taGi] [d.Bar_aGl] [([taGi], f3b{-r4q,x-}, f3b_aG5)]
-    meth1_aR4 = meth1{-r4B,x-} taGi d.Bar_aGl
-    f3b_aG5 x_r42 y_r43 = x_r42 meth1_aR4 y_r43
-AbsBinds [taGA] [d.Bar_aGD] [([taGA], f3a{-r4r,x-}, f3a_aGn)]
-    meth1_aR5 = meth1{-r4B,x-} taGA d.Bar_aGD
-    f3a_aGn x_r3Z y_r40 = meth1_aR5 x_r3Z y_r40
+AbsBinds [taFT] [d.Bar_aFW] [([taFT], f3d{-r4o,x-}, f3d_aFD)]
+    /////_aRB = /////{-r4C,x-} taFT d.Bar_aFW
+    f3d_aFD x_r48 y_r49 = x_r48 /////_aRB y_r49
+AbsBinds [taGe] [d.Bar_aGh] [([taGe], f3c{-r4p,x-}, f3c_aFY)]
+    /////_aRG = /////{-r4C,x-} taGe d.Bar_aGh
+    f3c_aFY x_r45 y_r46 = /////_aRG x_r45 y_r46
+AbsBinds [taGz] [d.Bar_aGC] [([taGz], f3b{-r4q,x-}, f3b_aGj)]
+    meth1_aRH = meth1{-r4B,x-} taGz d.Bar_aGC
+    f3b_aGj x_r42 y_r43 = x_r42 meth1_aRH y_r43
+AbsBinds [taGU] [d.Bar_aGX] [([taGU], f3a{-r4r,x-}, f3a_aGE)]
+    meth1_aRI = meth1{-r4B,x-} taGU d.Bar_aGX
+    f3a_aGE x_r3Z y_r40 = meth1_aRI x_r3Z y_r40
 AbsBinds
-[taH3, taH5, taH7]
+[taHp, taHr, taHt]
 []
-[([taH3, taH5, taH7], <<<<{-r4s,x-}, <<<<_aGF)]
-    <<<<_aGF x_r3T y_r3U
-	     = :***{-ro,x-}{i} [taH3, taH5, taH7] x_r3T y_r3U
-    <<<<_aGF x_r3W y_r3X
-	     = :***{-ro,x-}{i} [taH3, taH5, taH7] x_r3W y_r3X
+[([taHp, taHr, taHt], <<<<{-r4s,x-}, <<<<_aGZ)]
+    <<<<_aGZ x_r3T y_r3U
+	     = :***{-ro,x-}{i} [taHp, taHr, taHt] x_r3T y_r3U
+    <<<<_aGZ x_r3W y_r3X
+	     = :***{-ro,x-}{i} [taHp, taHr, taHt] x_r3W y_r3X
 AbsBinds
-[taHn, taHp, taHr]
+[taHL, taHN, taHP]
 []
-[([taHn, taHp, taHr], .....{-r4t,x-}, ....._aH9)]
-    ....._aH9 x_r3Q y_r3R
-	      = MkFoo3{-rm,x-}{i} [taHn, taHp, taHr] x_r3Q y_r3R
+[([taHL, taHN, taHP], .....{-r4t,x-}, ....._aHv)]
+    ....._aHv x_r3Q y_r3R
+	      = MkFoo3{-rm,x-}{i} [taHL, taHN, taHP] x_r3Q y_r3R
 AbsBinds
-[taHH, taHJ, taHL]
+[taI7, taI9, taIb]
 []
-[([taHH, taHJ, taHL], ....{-r4u,x-}, ...._aHt)]
-    ...._aHt x_r3N y_r3O
-	     = MkFoo3{-rm,x-}{i} [taHH, taHJ, taHL] x_r3N y_r3O
+[([taI7, taI9, taIb], ....{-r4u,x-}, ...._aHR)]
+    ...._aHR x_r3N y_r3O
+	     = MkFoo3{-rm,x-}{i} [taI7, taI9, taIb] x_r3N y_r3O
 AbsBinds
-[taI1, taI3, taI5]
+[taIt, taIv, taIx]
 []
-[([taI1, taI3, taI5], f2a{-r4v,x-}, f2a_aHN)]
-    f2a_aHN x_r3K y_r3L = :##{-rj,x-}{i} [taI1, taI3, taI5] x_r3K y_r3L
+[([taIt, taIv, taIx], f2a{-r4v,x-}, f2a_aId)]
+    f2a_aId x_r3K y_r3L = :##{-rj,x-}{i} [taIt, taIv, taIx] x_r3K y_r3L
 AbsBinds
-[taIl, taIn, taIp]
+[taIP, taIR, taIT]
 []
-[([taIl, taIn, taIp], f2{-r4w,x-}, f2_aI7)]
-    f2_aI7 x_r3H y_r3I = :##{-rj,x-}{i} [taIl, taIn, taIp] x_r3H y_r3I
+[([taIP, taIR, taIT], f2{-r4w,x-}, f2_aIz)]
+    f2_aIz x_r3H y_r3I = :##{-rj,x-}{i} [taIP, taIR, taIT] x_r3H y_r3I
 AbsBinds
-[taIF, taIH, taIJ]
+[taJb, taJd, taJf]
 []
-[([taIF, taIH, taIJ], f1a{-r4x,x-}, f1a_aIr)]
-    f1a_aIr x_r3E y_r3F
-	    = MkFoo1{-rk,x-}{i} [taIF, taIH, taIJ] x_r3E y_r3F
+[([taJb, taJd, taJf], f1a{-r4x,x-}, f1a_aIV)]
+    f1a_aIV x_r3E y_r3F
+	    = MkFoo1{-rk,x-}{i} [taJb, taJd, taJf] x_r3E y_r3F
 AbsBinds
-[taIZ, taJ1, taJ3]
+[taJx, taJz, taJB]
 []
-[([taIZ, taJ1, taJ3], f1{-r4y,x-}, f1_aIL)]
-    f1_aIL x_r3B y_r3C
-	   = MkFoo1{-rk,x-}{i} [taIZ, taJ1, taJ3] x_r3B y_r3C
+[([taJx, taJz, taJB], f1{-r4y,x-}, f1_aJh)]
+    f1_aJh x_r3B y_r3C
+	   = MkFoo1{-rk,x-}{i} [taJx, taJz, taJB] x_r3B y_r3C
 AbsBinds
-[taJJ, taJM, taJN]
+[taKj, taKm, taKn]
 []
-[([taJJ, taJM, taJN], con2tag_Foo#_rCX, con2tag_Foo#_aJ5)]
-    con2tag_Foo#_aJ5 (MkFoo1{-rk,x-}{i} _ _) = 0#
-    con2tag_Foo#_aJ5 (:##{-rj,x-}{i} _ _) = 1#
-    con2tag_Foo#_aJ5 (MkFoo3{-rm,x-}{i} _ _) = 2#
-    con2tag_Foo#_aJ5 (:***{-ro,x-}{i} _ _) = 3#
+[([taKj, taKm, taKn], con2tag_Foo#_rD5, con2tag_Foo#_aJD)]
+    con2tag_Foo#_aJD (MkFoo1{-rk,x-}{i} _ _) = 0#
+    con2tag_Foo#_aJD (:##{-rj,x-}{i} _ _) = 1#
+    con2tag_Foo#_aJD (MkFoo3{-rm,x-}{i} _ _) = 2#
+    con2tag_Foo#_aJD (:***{-ro,x-}{i} _ _) = 3#
 AbsBinds
-[taK6, taK9, taKc]
-[d.Eq_aLY, d.Eq_aLZ, d.Eq_aM0]
-[([taK6, taK9, taKc], $d1{-rQZ,x-}, d.Eq_aJV)]
-    d.Eq_aM4 = d.Eq_aLY
-    ==_aR6 = PrelBase.=={-8Y,p-} taK6 d.Eq_aM4
-    d.Eq_aM6 = d.Eq_aLZ
-    ==_aR7 = PrelBase.=={-8Y,p-} taK9 d.Eq_aM6
-    d.Eq_aM8 = d.Eq_aM0
-    ==_aR8 = PrelBase.=={-8Y,p-} taKc d.Eq_aM8
-    ==_aR9 = ==_aRa
-    AbsBinds [] [] [([], ==_aRa, ==_aJZ)]
-	==_aRc = ==_aR6
-	==_aRd = ==_aR7
-	==_aRe = ==_aR7
-	==_aRf = ==_aR8
-	==_aRg = ==_aR8
-	==_aJZ (MkFoo1{-rk,x-}{i} a1_rD6 a2_rD7)
-	       (MkFoo1{-rk,x-}{i} b1_rD8 b2_rD9)
-	       = (a1_rD6 ==_aR6 b1_rD8)
-		 PrelBase.&&{-rgs,p-} (a2_rD7 ==_aRc b2_rD9)
-	==_aJZ (:##{-rj,x-}{i} a1_rDb a2_rDc)
-	       (:##{-rj,x-}{i} b1_rDd b2_rDe)
-	       = (a1_rDb ==_aR7 b1_rDd)
-		 PrelBase.&&{-rgs,p-} (a2_rDc ==_aR8 b2_rDe)
-	==_aJZ (MkFoo3{-rm,x-}{i} a1_rDg a2_rDh)
-	       (MkFoo3{-rm,x-}{i} b1_rDi b2_rDj)
-	       = (a1_rDg ==_aRd b1_rDi)
-		 PrelBase.&&{-rgs,p-} (a2_rDh ==_aRe b2_rDj)
-	==_aJZ (:***{-ro,x-}{i} a1_rDl a2_rDm)
-	       (:***{-ro,x-}{i} b1_rDn b2_rDo)
-	       = (a1_rDl ==_aRf b1_rDn)
-		 PrelBase.&&{-rgs,p-} (a2_rDm ==_aRg b2_rDo)
-	==_aJZ a_rDq b_rDr = PrelBase.False{-58,w-}{i}
-    AbsBinds [] [] [([], /=_aRb, /=_aLR)]
-	/=_aLR a_rDv b_rDw = PrelBase.not{-rhq,p-} ==_aR9 a_rDv b_rDw
-    d.Eq_aJV = ({-dict-} [] [==_aRa, /=_aRb])
+[taKG, taKJ, taKM]
+[d.Eq_aMy, d.Eq_aMz, d.Eq_aMA]
+[([taKG, taKJ, taKM], $d1{-rRC,x-}, d.Eq_aKv)]
+    d.Eq_aME = d.Eq_aMy
+    ==_aRJ = PrelBase.=={-8Y,p-} taKG d.Eq_aME
+    d.Eq_aMG = d.Eq_aMz
+    ==_aRK = PrelBase.=={-8Y,p-} taKJ d.Eq_aMG
+    d.Eq_aMI = d.Eq_aMA
+    ==_aRL = PrelBase.=={-8Y,p-} taKM d.Eq_aMI
+    ==_aRM = ==_aRN
+    AbsBinds [] [] [([], ==_aRN, ==_aKz)]
+	==_aRP = ==_aRJ
+	==_aRQ = ==_aRK
+	==_aRR = ==_aRK
+	==_aRS = ==_aRL
+	==_aRT = ==_aRL
+	==_aKz (MkFoo1{-rk,x-}{i} a1_rDe a2_rDf)
+	       (MkFoo1{-rk,x-}{i} b1_rDg b2_rDh)
+	       = (a1_rDe ==_aRJ b1_rDg)
+		 PrelBase.&&{-rgs,p-} (a2_rDf ==_aRP b2_rDh)
+	==_aKz (:##{-rj,x-}{i} a1_rDj a2_rDk)
+	       (:##{-rj,x-}{i} b1_rDl b2_rDm)
+	       = (a1_rDj ==_aRK b1_rDl)
+		 PrelBase.&&{-rgs,p-} (a2_rDk ==_aRL b2_rDm)
+	==_aKz (MkFoo3{-rm,x-}{i} a1_rDo a2_rDp)
+	       (MkFoo3{-rm,x-}{i} b1_rDq b2_rDr)
+	       = (a1_rDo ==_aRQ b1_rDq)
+		 PrelBase.&&{-rgs,p-} (a2_rDp ==_aRR b2_rDr)
+	==_aKz (:***{-ro,x-}{i} a1_rDt a2_rDu)
+	       (:***{-ro,x-}{i} b1_rDv b2_rDw)
+	       = (a1_rDt ==_aRS b1_rDv)
+		 PrelBase.&&{-rgs,p-} (a2_rDu ==_aRT b2_rDw)
+	==_aKz a_rDy b_rDz = PrelBase.False{-58,w-}{i}
+    AbsBinds [] [] [([], /=_aRO, /=_aMr)]
+	/=_aMr a_rDD b_rDE = PrelBase.not{-rhq,p-} ==_aRM a_rDD b_rDE
+    d.Eq_aKv = ({-dict-} [] [==_aRN, /=_aRO])
 AbsBinds
-[taQT, taQU, taQV]
+[taRw, taRx, taRy]
 []
-[([taQT, taQU, taQV], $d2{-rR0,x-}, d.Eval_aMj)]
-    d.Eval_aMj = ({-dict-} [] [])
+[([taRw, taRx, taRy], $d2{-rRD,x-}, d.Eval_aMT)]
+    d.Eval_aMT = ({-dict-} [] [])
 AbsBinds
-[taMy, taMz, taMA]
-[d.Ord_aQx, d.Ord_aQy, d.Ord_aQz, d.Eq_aQA]
-[([taMy, taMz, taMA], $d3{-rR1,x-}, d.Ord_aMr)]
-    d.Eq_aQw = d.Eq_aQA
-    d.Ord_aPe = d.Ord_aQx
-    d.Ord_aPf = d.Ord_aQy
-    d.Ord_aPg = d.Ord_aQz
-    compare_aRh = compare_aRn
-    compare_aRi = compare_aRn
-    compare_aRj = compare_aRn
-    compare_aRk = compare_aRn
-    compare_aRl = compare_aRn
-    compare_aRm = compare_aRn
-    AbsBinds [] [] [([], compare_aRn, compare_aMv)]
-	compare_aMv a_rEo b_rEp
-		    = case con2tag_Foo#_rCX [taMA, taMy, taMz] a_rEo of
-			a#_rFc
-			-> case con2tag_Foo#_rCX [taMA, taMy, taMz] b_rEp of
-			     b#_rFe
-			     -> if a#_rFc GHC.==#{-79,w-}{I} b#_rFe then
-				    case cmp_eq_aRu a_rEo b_rEp of
+[taN8, taN9, taNa]
+[d.Ord_aRa, d.Ord_aRb, d.Ord_aRc, d.Eq_aRd]
+[([taN8, taN9, taNa], $d3{-rRE,x-}, d.Ord_aN1)]
+    d.Eq_aR9 = d.Eq_aRd
+    d.Ord_aPR = d.Ord_aRa
+    d.Ord_aPS = d.Ord_aRb
+    d.Ord_aPT = d.Ord_aRc
+    compare_aRU = compare_aS0
+    compare_aRV = compare_aS0
+    compare_aRW = compare_aS0
+    compare_aRX = compare_aS0
+    compare_aRY = compare_aS0
+    compare_aRZ = compare_aS0
+    AbsBinds [] [] [([], compare_aS0, compare_aN5)]
+	compare_aN5 a_rEw b_rEx
+		    = case con2tag_Foo#_rD5 [taNa, taN8, taN9] a_rEw of
+			a#_rFk
+			-> case con2tag_Foo#_rD5 [taNa, taN8, taN9] b_rEx of
+			     b#_rFm
+			     -> if a#_rFk GHC.==#{-79,w-}{I} b#_rFm then
+				    case cmp_eq_aS7 a_rEw b_rEx of
 				      PrelBase.LT{-rb5,p-}{i} -> PrelBase.LT{-rb5,p-}{i}
 				      PrelBase.EQ{-r4n,p-}{i} -> PrelBase.EQ{-r4n,p-}{i}
 				      PrelBase.GT{-rb6,p-}{i} -> PrelBase.GT{-rb6,p-}{i}
 				else
-				    if a#_rFc GHC.<#{-7b,w-}{I} b#_rFe then
+				    if a#_rFk GHC.<#{-7b,w-}{I} b#_rFm then
 					PrelBase.LT{-rb5,p-}{i}
 				    else
 					PrelBase.GT{-rb6,p-}{i}
 		    where
 			{- nonrec -}
 			AbsBinds
-			[taOq, taOr, taOy]
-			[d.Ord_aOG, d.Ord_aOI, d.Ord_aOK]
-			[([taOq, taOr, taOy], cmp_eq_rEr, cmp_eq_aME)]
-			    compare_aRv = PrelBase.compare{-rgH,p-} taOq d.Ord_aOG
-			    compare_aRw = compare_aRv
-			    compare_aRx = PrelBase.compare{-rgH,p-} taOr d.Ord_aOI
-			    compare_aRy = PrelBase.compare{-rgH,p-} taOy d.Ord_aOK
-			    compare_aRz = compare_aRx
-			    compare_aRA = compare_aRx
-			    compare_aRB = compare_aRy
-			    compare_aRC = compare_aRy
-			    cmp_eq_aME (MkFoo1{-rk,x-}{i} a1_rEt a2_rEu)
-				       (MkFoo1{-rk,x-}{i} b1_rEv b2_rEw)
-				       = case compare_aRv a1_rEt b1_rEv of
+			[taP3, taP4, taPb]
+			[d.Ord_aPj, d.Ord_aPl, d.Ord_aPn]
+			[([taP3, taP4, taPb], cmp_eq_rEz, cmp_eq_aNe)]
+			    compare_aS8 = PrelBase.compare{-rgH,p-} taP3 d.Ord_aPj
+			    compare_aS9 = compare_aS8
+			    compare_aSa = PrelBase.compare{-rgH,p-} taP4 d.Ord_aPl
+			    compare_aSb = PrelBase.compare{-rgH,p-} taPb d.Ord_aPn
+			    compare_aSc = compare_aSa
+			    compare_aSd = compare_aSa
+			    compare_aSe = compare_aSb
+			    compare_aSf = compare_aSb
+			    cmp_eq_aNe (MkFoo1{-rk,x-}{i} a1_rEB a2_rEC)
+				       (MkFoo1{-rk,x-}{i} b1_rED b2_rEE)
+				       = case compare_aS8 a1_rEB b1_rED of
 					   PrelBase.LT{-rb5,p-}{i} -> PrelBase.LT{-rb5,p-}{i}
 					   PrelBase.EQ{-r4n,p-}{i}
-					   -> case compare_aRw a2_rEu b2_rEw of
+					   -> case compare_aS9 a2_rEC b2_rEE of
 						PrelBase.LT{-rb5,p-}{i} -> PrelBase.LT{-rb5,p-}{i}
 						PrelBase.EQ{-r4n,p-}{i} -> PrelBase.EQ{-r4n,p-}{i}
 						PrelBase.GT{-rb6,p-}{i} -> PrelBase.GT{-rb6,p-}{i}
 					   PrelBase.GT{-rb6,p-}{i} -> PrelBase.GT{-rb6,p-}{i}
-			    cmp_eq_aME (:##{-rj,x-}{i} a1_rEE a2_rEF)
-				       (:##{-rj,x-}{i} b1_rEG b2_rEH)
-				       = case compare_aRx a1_rEE b1_rEG of
+			    cmp_eq_aNe (:##{-rj,x-}{i} a1_rEM a2_rEN)
+				       (:##{-rj,x-}{i} b1_rEO b2_rEP)
+				       = case compare_aSa a1_rEM b1_rEO of
 					   PrelBase.LT{-rb5,p-}{i} -> PrelBase.LT{-rb5,p-}{i}
 					   PrelBase.EQ{-r4n,p-}{i}
-					   -> case compare_aRy a2_rEF b2_rEH of
+					   -> case compare_aSb a2_rEN b2_rEP of
 						PrelBase.LT{-rb5,p-}{i} -> PrelBase.LT{-rb5,p-}{i}
 						PrelBase.EQ{-r4n,p-}{i} -> PrelBase.EQ{-r4n,p-}{i}
 						PrelBase.GT{-rb6,p-}{i} -> PrelBase.GT{-rb6,p-}{i}
 					   PrelBase.GT{-rb6,p-}{i} -> PrelBase.GT{-rb6,p-}{i}
-			    cmp_eq_aME (MkFoo3{-rm,x-}{i} a1_rEP a2_rEQ)
-				       (MkFoo3{-rm,x-}{i} b1_rER b2_rES)
-				       = case compare_aRz a1_rEP b1_rER of
+			    cmp_eq_aNe (MkFoo3{-rm,x-}{i} a1_rEX a2_rEY)
+				       (MkFoo3{-rm,x-}{i} b1_rEZ b2_rF0)
+				       = case compare_aSc a1_rEX b1_rEZ of
 					   PrelBase.LT{-rb5,p-}{i} -> PrelBase.LT{-rb5,p-}{i}
 					   PrelBase.EQ{-r4n,p-}{i}
-					   -> case compare_aRA a2_rEQ b2_rES of
+					   -> case compare_aSd a2_rEY b2_rF0 of
 						PrelBase.LT{-rb5,p-}{i} -> PrelBase.LT{-rb5,p-}{i}
 						PrelBase.EQ{-r4n,p-}{i} -> PrelBase.EQ{-r4n,p-}{i}
 						PrelBase.GT{-rb6,p-}{i} -> PrelBase.GT{-rb6,p-}{i}
 					   PrelBase.GT{-rb6,p-}{i} -> PrelBase.GT{-rb6,p-}{i}
-			    cmp_eq_aME (:***{-ro,x-}{i} a1_rF0 a2_rF1)
-				       (:***{-ro,x-}{i} b1_rF2 b2_rF3)
-				       = case compare_aRB a1_rF0 b1_rF2 of
+			    cmp_eq_aNe (:***{-ro,x-}{i} a1_rF8 a2_rF9)
+				       (:***{-ro,x-}{i} b1_rFa b2_rFb)
+				       = case compare_aSe a1_rF8 b1_rFa of
 					   PrelBase.LT{-rb5,p-}{i} -> PrelBase.LT{-rb5,p-}{i}
 					   PrelBase.EQ{-r4n,p-}{i}
-					   -> case compare_aRC a2_rF1 b2_rF3 of
+					   -> case compare_aSf a2_rF9 b2_rFb of
 						PrelBase.LT{-rb5,p-}{i} -> PrelBase.LT{-rb5,p-}{i}
 						PrelBase.EQ{-r4n,p-}{i} -> PrelBase.EQ{-r4n,p-}{i}
 						PrelBase.GT{-rb6,p-}{i} -> PrelBase.GT{-rb6,p-}{i}
 					   PrelBase.GT{-rb6,p-}{i} -> PrelBase.GT{-rb6,p-}{i}
-			    cmp_eq_aME _ _
+			    cmp_eq_aNe _ _
 				       = IOBase.error{-87,w-}
 					     PrelBase.Ordering{-3o,p-} "Urk! in TcGenDeriv"
 			{- nonrec -}
-			cmp_eq_aRu =
-			    cmp_eq_rEr [taMy, taMz, taMA] [d.Ord_aPe, d.Ord_aPf, d.Ord_aPg]
+			cmp_eq_aS7 =
+			    cmp_eq_rEz [taN8, taN9, taNa] [d.Ord_aPR, d.Ord_aPS, d.Ord_aPT]
 			{- nonrec -}
-    AbsBinds [] [] [([], <_aRo, <_aPl)]
-	<_aPl a_rDC b_rDD
-	      = case compare_aRh a_rDC b_rDD of
+    AbsBinds [] [] [([], <_aS1, <_aPY)]
+	<_aPY a_rDK b_rDL
+	      = case compare_aRU a_rDK b_rDL of
 		  PrelBase.LT{-rb5,p-}{i} -> PrelBase.True{-5E,w-}{i}
 		  PrelBase.EQ{-r4n,p-}{i} -> PrelBase.False{-58,w-}{i}
 		  PrelBase.GT{-rb6,p-}{i} -> PrelBase.False{-58,w-}{i}
-    AbsBinds [] [] [([], <=_aRp, <=_aPy)]
-	<=_aPy a_rDK b_rDL
-	       = case compare_aRi a_rDK b_rDL of
+    AbsBinds [] [] [([], <=_aS2, <=_aQb)]
+	<=_aQb a_rDS b_rDT
+	       = case compare_aRV a_rDS b_rDT of
 		   PrelBase.LT{-rb5,p-}{i} -> PrelBase.True{-5E,w-}{i}
 		   PrelBase.EQ{-r4n,p-}{i} -> PrelBase.True{-5E,w-}{i}
 		   PrelBase.GT{-rb6,p-}{i} -> PrelBase.False{-58,w-}{i}
-    AbsBinds [] [] [([], >=_aRq, >=_aPL)]
-	>=_aPL a_rDS b_rDT
-	       = case compare_aRj a_rDS b_rDT of
+    AbsBinds [] [] [([], >=_aS3, >=_aQo)]
+	>=_aQo a_rE0 b_rE1
+	       = case compare_aRW a_rE0 b_rE1 of
 		   PrelBase.LT{-rb5,p-}{i} -> PrelBase.False{-58,w-}{i}
 		   PrelBase.EQ{-r4n,p-}{i} -> PrelBase.True{-5E,w-}{i}
 		   PrelBase.GT{-rb6,p-}{i} -> PrelBase.True{-5E,w-}{i}
-    AbsBinds [] [] [([], >_aRr, >_aPY)]
-	>_aPY a_rE0 b_rE1
-	      = case compare_aRk a_rE0 b_rE1 of
+    AbsBinds [] [] [([], >_aS4, >_aQB)]
+	>_aQB a_rE8 b_rE9
+	      = case compare_aRX a_rE8 b_rE9 of
 		  PrelBase.LT{-rb5,p-}{i} -> PrelBase.False{-58,w-}{i}
 		  PrelBase.EQ{-r4n,p-}{i} -> PrelBase.False{-58,w-}{i}
 		  PrelBase.GT{-rb6,p-}{i} -> PrelBase.True{-5E,w-}{i}
-    AbsBinds [] [] [([], max_aRs, max_aQb)]
-	max_aQb a_rE8 b_rE9
-		= case compare_aRl a_rE8 b_rE9 of
-		    PrelBase.LT{-rb5,p-}{i} -> b_rE9
-		    PrelBase.EQ{-r4n,p-}{i} -> a_rE8
-		    PrelBase.GT{-rb6,p-}{i} -> a_rE8
-    AbsBinds [] [] [([], min_aRt, min_aQo)]
-	min_aQo a_rEg b_rEh
-		= case compare_aRm a_rEg b_rEh of
-		    PrelBase.LT{-rb5,p-}{i} -> a_rEg
-		    PrelBase.EQ{-r4n,p-}{i} -> b_rEh
-		    PrelBase.GT{-rb6,p-}{i} -> b_rEh
-    d.Ord_aMr =
+    AbsBinds [] [] [([], max_aS5, max_aQO)]
+	max_aQO a_rEg b_rEh
+		= case compare_aRY a_rEg b_rEh of
+		    PrelBase.LT{-rb5,p-}{i} -> b_rEh
+		    PrelBase.EQ{-r4n,p-}{i} -> a_rEg
+		    PrelBase.GT{-rb6,p-}{i} -> a_rEg
+    AbsBinds [] [] [([], min_aS6, min_aR1)]
+	min_aR1 a_rEo b_rEp
+		= case compare_aRZ a_rEo b_rEp of
+		    PrelBase.LT{-rb5,p-}{i} -> a_rEo
+		    PrelBase.EQ{-r4n,p-}{i} -> b_rEp
+		    PrelBase.GT{-rb6,p-}{i} -> b_rEp
+    d.Ord_aN1 =
 	({-dict-}
-	 [d.Eq_aQw]
-	 [compare_aRn, <_aRo, <=_aRp, >=_aRq, >_aRr, max_aRs, min_aRt])
-scsel_Bar2Print002Bar{-aR2,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taQW] [d.Bar2_aQP] []
+	 [d.Eq_aR9]
+	 [compare_aS0, <_aS1, <=_aS2, >=_aS3, >_aS4, max_aS5, min_aS6])
+scsel_Bar2Print002Bar{-aRF,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
+AbsBinds [taRz] [d.Bar2_aRs] []
 meth1{-r4B,x-} =
     _/\_ t12 -> \ tpl_B1 ->
 	case tpl_B1 of { PrelTup.(,,){-63,w-}{i} tpl_B1 tpl_B2 tpl_B3  ->
@@ -263,7 +260,8 @@ meth2{-r4D,x-} =
     _/\_ t12 -> \ tpl_B1 ->
 	case tpl_B1 of { PrelTup.(,,){-63,w-}{i} tpl_B1 tpl_B2 tpl_B3  ->
 	tpl_B3;}
-AbsBinds [taQX] [d.Bar_aQS] []
+AbsBinds [taRA] [d.Bar_aRv] []
+
 Print002.hs:35: 
     Warning: Pattern match(es) completely overlapped
 	in the definition of function `<<<<'
diff --git a/ghc/tests/printing/should_compile/Print003.stderr b/ghc/tests/printing/should_compile/Print003.stderr
index aa767cc59bff2a6c1195daa879c971f40855f7e2..f834031470b18e3adaf47c64b0ab1e091589c18d 100644
--- a/ghc/tests/printing/should_compile/Print003.stderr
+++ b/ghc/tests/printing/should_compile/Print003.stderr
@@ -1,14 +1,12 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 bitRsh{-r3h,x-} =
     _/\_ t12 -> \ tpl_B1 ->
 	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
 bitLsh{-r3i,x-} =
     _/\_ t12 -> \ tpl_B1 ->
 	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [takE] [d.Bits_akD] []
+AbsBinds [takI] [d.Bits_akH] []
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ Word 1
 _instance_modules_
diff --git a/ghc/tests/printing/should_compile/Print004.stderr b/ghc/tests/printing/should_compile/Print004.stderr
index 5eb6c1e6a943bc62e3bfeaaaf4b55fbd63363be9..8a253dd06d40b0c3b4106005bd1acba8c03ead86 100644
--- a/ghc/tests/printing/should_compile/Print004.stderr
+++ b/ghc/tests/printing/should_compile/Print004.stderr
@@ -1,54 +1,52 @@
  
 Print004.hs:18: No explicit method nor default method for `PrelBase.showsPrec'
 		in an instance declaration for `PrelBase.Show'
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 Con{-r6u,l-}{i} =
     _/\_ a_tr6C -> \ tpl_B1 -> Con{-r6u,l-}{i} {_@_ a_tr6C tpl_B1}
 Junk11{-r4,l-}{i} = _/\_ a_tr6A -> Junk11{-r4,l-}{i} {_@_ a_tr6A}
 Junk2{-r3,l-}{i} = _/\_ a_tr6A -> Junk2{-r3,l-}{i} {_@_ a_tr6A}
-AbsBinds [taFM] [] [([taFM], $d2{-rFO,x-}, d.Eval_aEr)]
-    d.Eval_aEr = ({-dict-} [] [])
-AbsBinds [taFN] [] [([taFN], $d3{-rFP,x-}, d.Eval_aEx)]
-    d.Eval_aEx = ({-dict-} [] [])
-AbsBinds [taEN] [d.Ord_aF8] [([taEN], $d4{-rFQ,x-}, d.Show_aED)]
-    d.Ord_aFg = d.Ord_aF8
-    d.Show_aFe = $d1{-rFR,x-} taEN d.Ord_aFg
-    showsPrec_aFU =
-	PrelBase.showsPrec{-r2c,p-} (FunnyInternalType{-r6v,l-} taEN)
-	    d.Show_aFe
-    showsPrec_aFV = showsPrec_aFW
-    AbsBinds [] [] [([], showsPrec_aFW, showsPrec_aEH)]
-	showsPrec_aEH a_rDK (Con{-r6u,l-}{i} b1_rDL)
-		      = PrelBase.showParen{-r16,p-} a_rDK >=_aFS lit_aFT
+AbsBinds [taFU] [] [([taFU], $d2{-rFW,x-}, d.Eval_aEz)]
+    d.Eval_aEz = ({-dict-} [] [])
+AbsBinds [taFV] [] [([taFV], $d3{-rFX,x-}, d.Eval_aEF)]
+    d.Eval_aEF = ({-dict-} [] [])
+AbsBinds [taEV] [d.Ord_aFg] [([taEV], $d4{-rFY,x-}, d.Show_aEL)]
+    d.Ord_aFo = d.Ord_aFg
+    d.Show_aFm = $d1{-rFZ,x-} taEV d.Ord_aFo
+    showsPrec_aG2 =
+	PrelBase.showsPrec{-r2c,p-} (FunnyInternalType{-r6v,l-} taEV)
+	    d.Show_aFm
+    showsPrec_aG3 = showsPrec_aG4
+    AbsBinds [] [] [([], showsPrec_aG4, showsPrec_aEP)]
+	showsPrec_aEP a_rDS (Con{-r6u,l-}{i} b1_rDT)
+		      = PrelBase.showParen{-r16,p-} a_rDS >=_aG0 lit_aG1
 						    PrelBase..{-rI,p-}
 							[PrelBase.String{-r2i,p-}, PrelBase.String{-r2i,p-}, PrelBase.String{-r2i,p-}] PrelBase.showString{-r18,p-} "Con "
-																       showsPrec_aFU PrelBase.I#{-5b,w-}{i} 10#
-																		     b1_rDL
-    AbsBinds [] [] [([], showList_aFX, showList_aF3)]
-	showList_aF3 = PrelBase.showList__{-r6F,p-}
-			   (OpaqueType{-r6,x-} taEN) showsPrec_aFV PrelBase.I#{-5b,w-}{i} 0#
-    d.Show_aED = ({-dict-} [] [showsPrec_aFW, showList_aFX])
-AbsBinds [taFv] [d.Ord_aFE] [([taFv], $d1{-rFR,x-}, d.Show_aFn)]
-    d.Show_aFI = d.Show_aFn
-    $mshowList_aFY =
-	PrelBase.$mshowList{-rif,p-} (FunnyInternalType{-r6v,l-} taFv)
-	    d.Show_aFI
-    AbsBinds [] [] [([], showsPrec_aFZ, showsPrec_aFs)]
-	showsPrec_aFs
+																       showsPrec_aG2 PrelBase.I#{-5b,w-}{i} 10#
+																		     b1_rDT
+    AbsBinds [] [] [([], showList_aG5, showList_aFb)]
+	showList_aFb = PrelBase.showList__{-r6F,p-}
+			   (OpaqueType{-r6,x-} taEV) showsPrec_aG3 PrelBase.I#{-5b,w-}{i} 0#
+    d.Show_aEL = ({-dict-} [] [showsPrec_aG4, showList_aG5])
+AbsBinds [taFD] [d.Ord_aFM] [([taFD], $d1{-rFZ,x-}, d.Show_aFv)]
+    d.Show_aFQ = d.Show_aFv
+    $mshowList_aG6 =
+	PrelBase.$mshowList{-rif,p-} (FunnyInternalType{-r6v,l-} taFD)
+	    d.Show_aFQ
+    AbsBinds [] [] [([], showsPrec_aG7, showsPrec_aFA)]
+	showsPrec_aFA
 	    = GHCerr.noDefaultMethodError{-8k,w-}
 		  (PrelBase.Int{-3g,W-}
-		   -> FunnyInternalType{-r6v,l-} taFv
+		   -> FunnyInternalType{-r6v,l-} taFD
 		   -> PrelBase.String{-r2i,p-}
 		   -> PrelBase.String{-r2i,p-}) "<NoSrcLoc>|PrelBase.showsPrec"
-    AbsBinds [] [] [([], showList_aG0, showList_aFB)]
-	showList_aFB = $mshowList_aFY
-    d.Show_aFn = ({-dict-} [] [showsPrec_aFZ, showList_aG0])
-d.Ord_aFL = PrelBase.$d7{-rdY,p-}
->=_aFS = PrelBase.>={-8Z,p-} PrelBase.Int{-3g,W-} d.Ord_aFL
-lit_aFT = PrelBase.I#{-5b,w-}{i} 10#
+    AbsBinds [] [] [([], showList_aG8, showList_aFJ)]
+	showList_aFJ = $mshowList_aG6
+    d.Show_aFv = ({-dict-} [] [showsPrec_aG7, showList_aG8])
+d.Ord_aFT = PrelBase.$d7{-rdY,p-}
+>=_aG0 = PrelBase.>={-8Z,p-} PrelBase.Int{-3g,W-} d.Ord_aFT
+lit_aG1 = PrelBase.I#{-5b,w-}{i} 10#
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ExportOpaque 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/Makefile b/ghc/tests/typecheck/Makefile
index 6d5951c7de2ffa87aa04604e063fb7d2b5f77110..eb825983f9964527f3f105b5b9d52a91643e4586 100644
--- a/ghc/tests/typecheck/Makefile
+++ b/ghc/tests/typecheck/Makefile
@@ -1,7 +1,7 @@
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS = should_fail should_compile
+SUBDIRS = should_fail should_compile should_run
 
 include $(TOP)/mk/target.mk
 
diff --git a/ghc/tests/typecheck/should_compile/tc001.stderr b/ghc/tests/typecheck/should_compile/tc001.stderr
index e500a32dd501d4b4317f53acfa8e979728c43547..11802c8f259210e72281981ee2fddc6a48e3289a 100644
--- a/ghc/tests/typecheck/should_compile/tc001.stderr
+++ b/ghc/tests/typecheck/should_compile/tc001.stderr
@@ -1,21 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [taCe] [d.Num_aCi] [([taCe], a{-r3h,x-}, a_aBW)]
-    +_aCs = PrelBase.+{-r3g,p-} taCe d.Num_aCi
-    d.Num_aCl = d.Num_aCi
-    fromInt_aCr = PrelBase.fromInt{-8R,p-} taCe d.Num_aCl
-    lit_aCq = fromInt_aCr PrelBase.I#{-5b,w-}{i} 2#
-    +_aCp = +_aCs
-    fromInt_aCo = fromInt_aCr
-    lit_aCm = fromInt_aCo PrelBase.I#{-5b,w-}{i} 3#
-    a_aBW x_r3d
-	  = y_r3f +_aCs lit_aCq
-	  where
-	      {- nonrec -}
-	      AbsBinds [] [] [([], y_r3f, y_aC6)]
-		  y_aC6 = x_r3d +_aCp lit_aCm
-	      {- nonrec -}
-	      {- nonrec -}
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc002.stderr b/ghc/tests/typecheck/should_compile/tc002.stderr
index 0f4a8637620098d17352184520f30a923e44b5a6..1daaf64253595bf659313a1610d4a70b9995eef6 100644
--- a/ghc/tests/typecheck/should_compile/tc002.stderr
+++ b/ghc/tests/typecheck/should_compile/tc002.stderr
@@ -1,9 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [] [] [([], b{-r1,x-}, b_aBS)]
-    b_aBS = if PrelBase.True{-5E,w-}{i} then lit_aC5 else lit_aC4
-lit_aC5 = PrelBase.I#{-5b,w-}{i} 1#
-lit_aC4 = PrelBase.I#{-5b,w-}{i} 2#
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc003.stderr b/ghc/tests/typecheck/should_compile/tc003.stderr
index b77d992e60bfba80832ef8f2fbda52a78f0d8f7d..68f4b9880e0060b238f8cb2ec22a62cbf1694e9a 100644
--- a/ghc/tests/typecheck/should_compile/tc003.stderr
+++ b/ghc/tests/typecheck/should_compile/tc003.stderr
@@ -1,20 +1,3 @@
-==================== Typechecked ====================
-AbsBinds
-[]
-[]
-[([], c{-r5,x-}, c_aRo), ([], d{-r4,x-}, d_aRp), ([],
-						  e{-r3,x-},
-						  e_aRq)]
-    lit_aRS = lit_aRV
-    (c_aRo@(d_aRp, e_aRq))
-	= if PrelBase.True{-5E,w-}{i} then
-	      (lit_aRV, lit_aRU)
-	  else
-	      (lit_aRS, lit_aRT)
-lit_aRV = PrelBase.I#{-5b,w-}{i} 1#
-lit_aRU = PrelBase.I#{-5b,w-}{i} 2#
-lit_aRT = PrelBase.I#{-5b,w-}{i} 3#
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc004.stderr b/ghc/tests/typecheck/should_compile/tc004.stderr
index dc7ff2f4503d87e82acad7495337d0c47e4ca8c2..d102fb9b6c5ef7a5b2876f4c07932fd2d56a8b11 100644
--- a/ghc/tests/typecheck/should_compile/tc004.stderr
+++ b/ghc/tests/typecheck/should_compile/tc004.stderr
@@ -1,10 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [] [] [([], f{-r3e,x-}, f_aky)]
-    f_aky x_r3d
-	  = case x_r3d of
-	      PrelBase.True{-5E,w-}{i} -> PrelBase.True{-5E,w-}{i}
-	      PrelBase.False{-58,w-}{i} -> x_r3d
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc005.stderr b/ghc/tests/typecheck/should_compile/tc005.stderr
index 6e065419f408bf0c7e8acc17f76f64c7569800cb..0937f4b90fd8b5f6b5a9ce83dc0fd89469982879 100644
--- a/ghc/tests/typecheck/should_compile/tc005.stderr
+++ b/ghc/tests/typecheck/should_compile/tc005.stderr
@@ -1,13 +1,3 @@
-==================== Typechecked ====================
-AbsBinds
-[taRC, taRQ]
-[d.Num_aRV]
-[([taRC, taRQ], g{-r3j,x-}, g_aRr)]
-    fromInt_aRX = PrelBase.fromInt{-8R,p-} taRC d.Num_aRV
-    lit_aRW = fromInt_aRX PrelBase.I#{-5b,w-}{i} 2#
-    g_aRr ((x_r3d PrelBase.:{-55,w-}{i} z_r3e), y_r3f) = x_r3d
-    g_aRr (x_r3h, y_r3i) = lit_aRW
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc006.stderr b/ghc/tests/typecheck/should_compile/tc006.stderr
index 966f12f84f1f63d1b1fb8e52d9692b49a32019b9..391fe62c39ae7e7bca6c4e5cbe9cc4d7025ccca0 100644
--- a/ghc/tests/typecheck/should_compile/tc006.stderr
+++ b/ghc/tests/typecheck/should_compile/tc006.stderr
@@ -1,8 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [] [] [([], h{-r1,x-}, h_aBS)]
-    h_aBS = PrelBase.:{-55,w-}{i} PrelBase.Int{-3g,W-} lit_aC4 h_aBS
-lit_aC4 = PrelBase.I#{-5b,w-}{i} 1#
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc007.stderr b/ghc/tests/typecheck/should_compile/tc007.stderr
index 287256cba11a4f07c8003c5e8bf54488a6a3135f..6c3b87eb1976026f3f1e5de3400f084c543a3ff8 100644
--- a/ghc/tests/typecheck/should_compile/tc007.stderr
+++ b/ghc/tests/typecheck/should_compile/tc007.stderr
@@ -1,20 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [] [] [([], j{-rY,x-}, j_aBY)]
-    j_aBY = lit_aCA
-AbsBinds [] [] [([], k{-rX,x-}, k_aC6), ([], l{-rW,x-}, l_aC7)]
-    k_aC6
-	= PrelBase.:{-55,w-}{i} PrelBase.Int{-3g,W-}
-	      lit_aCC
-	      (PrelBase.:{-55,w-}{i} PrelBase.Int{-3g,W-} j{-rY,x-} l_aC7)
-    l_aC7 = PrelBase.:{-55,w-}{i} PrelBase.Int{-3g,W-} lit_aCB k_aC6
-AbsBinds [] [] [([], m{-rV,x-}, m_aCl)]
-    m_aCl = j{-rY,x-} +_aCD j{-rY,x-}
-d.Num_aCz = PrelBase.$d4{-rau,p-}
-+_aCD = PrelBase.+{-rU,p-} PrelBase.Int{-3g,W-} d.Num_aCz
-lit_aCC = PrelBase.I#{-5b,w-}{i} 1#
-lit_aCB = PrelBase.I#{-5b,w-}{i} 0#
-lit_aCA = PrelBase.I#{-5b,w-}{i} 2#
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc008.stderr b/ghc/tests/typecheck/should_compile/tc008.stderr
index 57eaa056577622d33c99281ce052623b21fc7094..67e97e9ed03e68df784831bd7f9c75015f215164 100644
--- a/ghc/tests/typecheck/should_compile/tc008.stderr
+++ b/ghc/tests/typecheck/should_compile/tc008.stderr
@@ -1,12 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [taC4] [d.Num_aC7] [([taC4], n{-r1,x-}, n_aBU)]
-    fromInt_aCc = PrelBase.fromInt{-8R,p-} taC4 d.Num_aC7
-    lit_aCb = fromInt_aCc PrelBase.I#{-5b,w-}{i} 1#
-    fromInt_aCa = fromInt_aCc
-    lit_aC8 = fromInt_aCa PrelBase.I#{-5b,w-}{i} 0#
-    n_aBU PrelBase.True{-5E,w-}{i} = lit_aCb
-    n_aBU PrelBase.False{-58,w-}{i} = lit_aC8
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc009.stderr b/ghc/tests/typecheck/should_compile/tc009.stderr
index ba7b73c92c4b2937aa37634a51838b4f611e773c..f12bd58f60d0423847842706bd16f027abedc14c 100644
--- a/ghc/tests/typecheck/should_compile/tc009.stderr
+++ b/ghc/tests/typecheck/should_compile/tc009.stderr
@@ -1,12 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [taRG] [d.Num_aRK] [([taRG], o{-r3h,x-}, o_aRo)]
-    +_aRQ = PrelBase.+{-r3g,p-} taRG d.Num_aRK
-    d.Num_aRN = d.Num_aRK
-    fromInt_aRP = PrelBase.fromInt{-8R,p-} taRG d.Num_aRN
-    lit_aRO = fromInt_aRP PrelBase.I#{-5b,w-}{i} 1#
-    o_aRo (PrelBase.True{-5E,w-}{i}, x_r3d) = x_r3d
-    o_aRo (PrelBase.False{-58,w-}{i}, y_r3f) = y_r3f +_aRQ lit_aRO
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc010.stderr b/ghc/tests/typecheck/should_compile/tc010.stderr
index f98dcbb06bf1df5962738ece7ceeb1d50741cb3c..cc53509bf3cbf20e6ad77dabba27ebf1b0f421c5 100644
--- a/ghc/tests/typecheck/should_compile/tc010.stderr
+++ b/ghc/tests/typecheck/should_compile/tc010.stderr
@@ -1,19 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [] [] [([], p{-r3e,x-}, p_aS7)]
-    lit_aT9 = lit_aTd
-    p_aS7
-	= [(y_r3d +_aTc lit_aT9, PrelBase.True{-5E,w-}{i}) |
-	       y_r3d <- [lit_aTe, lit_aTd] (PrelBase.Int{-3g,W-})]
-lit_aTe = PrelBase.I#{-5b,w-}{i} 1#
-lit_aTd = PrelBase.I#{-5b,w-}{i} 2#
-d.Num_aSZ = PrelBase.$d4{-raq,p-}
-+_aTc = PrelBase.+{-r9G,p-} PrelBase.Int{-3g,W-} d.Num_aSZ
-d.Monad_aT2 = PrelBase.$d25{-raa,p-}
->>=_aTb = PrelBase.>>={-811,p-} PrelBase.[]{-3j,W-} d.Monad_aT2
-d.Monad_aT5 = d.Monad_aT2
-return_aTa =
-    PrelBase.return{-816,p-} PrelBase.[]{-3j,W-} d.Monad_aT5
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc011.stderr b/ghc/tests/typecheck/should_compile/tc011.stderr
index 8e1921b34d853d3c188eea349c5d8198962d5b93..4d864308e2d6246008baa23b445ab696d9cf698d 100644
--- a/ghc/tests/typecheck/should_compile/tc011.stderr
+++ b/ghc/tests/typecheck/should_compile/tc011.stderr
@@ -1,7 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [takw] [] [([takw], x{-r1,x-}, x_aku)]
-    (x_aku@_) = x_aku
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc012.stderr b/ghc/tests/typecheck/should_compile/tc012.stderr
index 4675553bc995a3dde8d3b9faaf4bf096920b573a..0959c286cd2cf6e615f23be8f488670e22edd486 100644
--- a/ghc/tests/typecheck/should_compile/tc012.stderr
+++ b/ghc/tests/typecheck/should_compile/tc012.stderr
@@ -1,7 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [takG] [] [([takG], q{-r3e,x-}, q_akw)]
-    q_akw = \ y_r3d -> y_r3d
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc013.stderr b/ghc/tests/typecheck/should_compile/tc013.stderr
index b93f3efd5bc73671b342fd2dead95e279a12d9ae..a7dedfc2efef175da8889d10455c1fd7f3cca72d 100644
--- a/ghc/tests/typecheck/should_compile/tc013.stderr
+++ b/ghc/tests/typecheck/should_compile/tc013.stderr
@@ -1,8 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [] [] [([], r{-r3,x-}, r_aRm), ([], s{-r2,x-}, s_aRn)]
-    (r_aRm, s_aRn) = (lit_aRD, 'a')
-lit_aRD = PrelBase.I#{-5b,w-}{i} 1#
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc014.stderr b/ghc/tests/typecheck/should_compile/tc014.stderr
index 1dd383c2411323bb13c8960233acf527257af93c..a099af43bbca4eaa884101d42c8ee97850694d91 100644
--- a/ghc/tests/typecheck/should_compile/tc014.stderr
+++ b/ghc/tests/typecheck/should_compile/tc014.stderr
@@ -1,10 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [] [] [([], t{-rS,x-}, t_aBS)]
-    t_aBS = lit_aCb +_aCc t_aBS
-d.Num_aCa = PrelBase.$d4{-rao,p-}
-+_aCc = PrelBase.+{-rR,p-} PrelBase.Int{-3g,W-} d.Num_aCa
-lit_aCb = PrelBase.I#{-5b,w-}{i} 1#
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc015.stderr b/ghc/tests/typecheck/should_compile/tc015.stderr
index 71cbed2c987244d9ca364f1bd9fd474208b5067f..64fd545063b32694c94082254c17f86fee4e7b99 100644
--- a/ghc/tests/typecheck/should_compile/tc015.stderr
+++ b/ghc/tests/typecheck/should_compile/tc015.stderr
@@ -1,10 +1,3 @@
-==================== Typechecked ====================
-AbsBinds
-[tayS, tayM, tayP]
-[]
-[([tayS, tayM, tayP], u{-r3h,x-}, u_ayw)]
-    u_ayw x_r3d = \ (y_r3f, z_r3g) -> x_r3d
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc016.stderr b/ghc/tests/typecheck/should_compile/tc016.stderr
index 5ec5a44da7213045260c184e637229363845072d..e02f7e9442c6628c56379903d075fbb642b75015 100644
--- a/ghc/tests/typecheck/should_compile/tc016.stderr
+++ b/ghc/tests/typecheck/should_compile/tc016.stderr
@@ -1,7 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [takR, takT] [] [([takR, takT], f{-r3f,x-}, f_akx)]
-    f_akx (x_r3d@_) (y_r3e@_) = x_r3d
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc017.stderr b/ghc/tests/typecheck/should_compile/tc017.stderr
index 4830688548dbf40e38f7e2591febf9244415490c..d11f8178fe98ad68604d8df23b751392599a6fc0 100644
--- a/ghc/tests/typecheck/should_compile/tc017.stderr
+++ b/ghc/tests/typecheck/should_compile/tc017.stderr
@@ -1,12 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [] [] [([], v{-r1,x-}, v_aBS)]
-    v_aBS
-	| PrelBase.True{-5E,w-}{i} = v_aBS +_aCe lit_aCd
-	| PrelBase.False{-58,w-}{i} = v_aBS
-d.Num_aCc = PrelBase.$d4{-rao,p-}
-+_aCe = PrelBase.+{-r9E,p-} PrelBase.Int{-3g,W-} d.Num_aCc
-lit_aCd = PrelBase.I#{-5b,w-}{i} 1#
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc018.stderr b/ghc/tests/typecheck/should_compile/tc018.stderr
index 9e6a8f67e247b279188b30d7e6c3f50376566781..75cf5bc35d8a57c2099764e57ebbd46e4e4ae8d1 100644
--- a/ghc/tests/typecheck/should_compile/tc018.stderr
+++ b/ghc/tests/typecheck/should_compile/tc018.stderr
@@ -1,20 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [] [] [([], w{-r3f,x-}, w_aBY)]
-    w_aBY
-	= a_r3d
-	where
-	    {- nonrec -}
-	    AbsBinds [] [] [([], y_r3e, y_aBX)]
-		y_aBX = lit_aCg
-	    {- nonrec -}
-	    {- nonrec -}
-	    {- nonrec -}
-	    AbsBinds [] [] [([], a_r3d, a_aC7)]
-		a_aC7 = y_r3e
-	    {- nonrec -}
-	    {- nonrec -}
-lit_aCg = PrelBase.I#{-5b,w-}{i} 2#
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc019.stderr b/ghc/tests/typecheck/should_compile/tc019.stderr
index 8a3d5094c60c90b7608003d0d79dc24088745d6e..86dba12ecfab0285b7022394f08ba781e7d23cb4 100644
--- a/ghc/tests/typecheck/should_compile/tc019.stderr
+++ b/ghc/tests/typecheck/should_compile/tc019.stderr
@@ -1,23 +1,3 @@
-==================== Typechecked ====================
-AbsBinds
-[]
-[]
-[([], al{-r3i,x-}, al_aSa), ([], am{-r3h,x-}, am_aSb)]
-    lit_aTs = lit_aTx
-    (al_aSa PrelBase.:{-55,w-}{i} am_aSb)
-	= [y_r3e +_aTv lit_aTs |
-	       (y_r3e, z_r3f) <- [(lit_aTx,
-				   lit_aTw)] ((PrelBase.Int{-3g,W-}, PrelBase.Int{-3g,W-}))]
-lit_aTx = PrelBase.I#{-5b,w-}{i} 1#
-lit_aTw = PrelBase.I#{-5b,w-}{i} 2#
-d.Num_aTi = PrelBase.$d4{-rat,p-}
-+_aTv = PrelBase.+{-r3g,p-} PrelBase.Int{-3g,W-} d.Num_aTi
-d.Monad_aTl = PrelBase.$d25{-rad,p-}
->>=_aTu = PrelBase.>>={-811,p-} PrelBase.[]{-3j,W-} d.Monad_aTl
-d.Monad_aTo = d.Monad_aTl
-return_aTt =
-    PrelBase.return{-816,p-} PrelBase.[]{-3j,W-} d.Monad_aTo
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc020.stderr b/ghc/tests/typecheck/should_compile/tc020.stderr
index ea13f959c1c63b5b9133e826c7c8fd352be72c6a..a5b7f4ad2fb1ea647ecdd79e3ec428ce8ae1014f 100644
--- a/ghc/tests/typecheck/should_compile/tc020.stderr
+++ b/ghc/tests/typecheck/should_compile/tc020.stderr
@@ -1,14 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [takM] [] [([takM], f{-r3g,x-}, f_aky)]
-    f_aky x_r3d
-	  = a_r3f
-	  where
-	      {- rec -}
-	      AbsBinds [] [] [([], a_r3f, a_akI)]
-		  a_akI = PrelBase.:{-55,w-}{i} takM x_r3d a_akI
-	      {- nonrec -}
-	      {- nonrec -}
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc021.stderr b/ghc/tests/typecheck/should_compile/tc021.stderr
index 61109c1e0de9f757d09b3bd9d65b9337f85244af..e1c6ce19db13c05153c4231064a1fe45d999b3a8 100644
--- a/ghc/tests/typecheck/should_compile/tc021.stderr
+++ b/ghc/tests/typecheck/should_compile/tc021.stderr
@@ -1,14 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [tayz] [] [([tayz], x{-r3g,x-}, x_ayx)]
-    x_ayx = x_ayx
-AbsBinds [tayF, tayH] [] [([tayF, tayH], a{-r3h,x-}, a_ayB)]
-    a_ayB = (x{-r3g,x-} tayF, x{-r3g,x-} tayH)
-AbsBinds
-[taz1, tayX, tayZ]
-[]
-[([taz1, tayX, tayZ], f{-r3i,x-}, f_ayN)]
-    f_ayN x_r3f = a{-r3h,x-} [tayX, tayZ]
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc022.stderr b/ghc/tests/typecheck/should_compile/tc022.stderr
index 15036cb9f73b201bc114eb947e14385af2da9ea2..b1e947db6df8e7ac3c02803e26ea2d10c1c331ae 100644
--- a/ghc/tests/typecheck/should_compile/tc022.stderr
+++ b/ghc/tests/typecheck/should_compile/tc022.stderr
@@ -1,9 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [takI] [] [([takI], iD{-r3f,x-}, iD_aky)]
-    iD_aky x_r3e = x_r3e
-AbsBinds [takQ] [] [([takQ], main{-r3g,x-}, main_akK)]
-    main_akK = iD{-r3f,x-} (takQ -> takQ) iD{-r3f,x-} takQ
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc023.stderr b/ghc/tests/typecheck/should_compile/tc023.stderr
index db51c993fa6bfabd430c64074ead97d700879c61..05f57cc8f04e24f3b89f70723866becf2019030b 100644
--- a/ghc/tests/typecheck/should_compile/tc023.stderr
+++ b/ghc/tests/typecheck/should_compile/tc023.stderr
@@ -1,17 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [takV, takX] [] [([takV, takX], k{-r3l,x-}, k_akF)]
-    k_akF x_r3j y_r3k = x_r3j
-AbsBinds
-[talx, talz, talB]
-[]
-[([talx, talz, talB], s{-r3m,x-}, s_akZ)]
-    s_akZ f_r3f g_r3g x_r3h = f_r3f x_r3h g_r3g x_r3h
-AbsBinds [talJ] [] [([talJ], main{-r3n,x-}, main_alD)]
-    main_alD
-	= s{-r3m,x-} [talJ, talJ, GHC.Void{-3T,W-} -> talJ] k{-r3l,x-}
-								[GHC.Void{-3T,W-} -> talJ, talJ]
-							    k{-r3l,x-} [GHC.Void{-3T,W-}, talJ]
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc024.stderr b/ghc/tests/typecheck/should_compile/tc024.stderr
index 862268bce4c86f84a61fbdf994dc1b9348ec9984..05f57cc8f04e24f3b89f70723866becf2019030b 100644
--- a/ghc/tests/typecheck/should_compile/tc024.stderr
+++ b/ghc/tests/typecheck/should_compile/tc024.stderr
@@ -1,19 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [takX, takZ] [] [([takX, takZ], k{-r3n,x-}, k_akH)]
-    k_akH x_r3l y_r3m = x_r3l
-AbsBinds
-[talz, talB, talD]
-[]
-[([talz, talB, talD], s{-r3o,x-}, s_al1)]
-    s_al1 f_r3h g_r3i x_r3j = f_r3h x_r3j g_r3i x_r3j
-AbsBinds [talP] [] [([talP], main{-r3p,x-}, main_alF)]
-    main_alF x_r3f
-	     = s{-r3o,x-} [talP, talP, GHC.Void{-3T,W-} -> talP] k{-r3n,x-}
-								     [GHC.Void{-3T,W-}
-								      -> talP, talP]
-								 k{-r3n,x-} [GHC.Void{-3T,W-}, talP]
-								 x_r3f
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc025.stderr b/ghc/tests/typecheck/should_compile/tc025.stderr
index bcb089025431d3ef831944b3ec9fd4e9ab41ce72..1b2392fd668563e327d7b71c7fa64df656607fbb 100644
--- a/ghc/tests/typecheck/should_compile/tc025.stderr
+++ b/ghc/tests/typecheck/should_compile/tc025.stderr
@@ -1,16 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [] [] [([], g{-r3j,x-}, g_akB)]
-    g_akB x_r3d
-	  = f_r3f PrelBase.Bool{-34,W-} f_r3f
-					    PrelBase.Bool{-34,W-} PrelBase.True{-5E,w-}{i} x_r3d
-					x_r3d
-	  where
-	      {- rec -}
-	      AbsBinds [tal1] [] [([tal1], f_r3f, f_akL)]
-		  f_akL x_r3h y_r3i = if x_r3h then y_r3i else f_akL x_r3h y_r3i
-	      {- nonrec -}
-	      {- nonrec -}
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc026.stderr b/ghc/tests/typecheck/should_compile/tc026.stderr
index de883f5b2e0ec22084ce18e927fd96e27dcf9331..05b41403ef62d51104458bd04c7d71a788eb4d5b 100644
--- a/ghc/tests/typecheck/should_compile/tc026.stderr
+++ b/ghc/tests/typecheck/should_compile/tc026.stderr
@@ -1,13 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [takR] [] [([takR], f{-r3i,x-}, f_akB)]
-    f_akB x_r3g y_r3h = if x_r3g then y_r3h else f_akB x_r3g y_r3h
-AbsBinds [] [] [([], g{-r3j,x-}, g_akT)]
-    g_akT x_r3e
-	  = f{-r3i,x-} PrelBase.Bool{-34,W-} f{-r3i,x-}
-						 PrelBase.Bool{-34,W-} PrelBase.True{-5E,w-}{i}
-								       x_r3e
-					     x_r3e
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc027.stderr b/ghc/tests/typecheck/should_compile/tc027.stderr
index 3e2ee5f224dee637735ac11c3cc53c2caf4b57ec..130b5c2dcebb2772dbf65892d8807ff653a08707 100644
--- a/ghc/tests/typecheck/should_compile/tc027.stderr
+++ b/ghc/tests/typecheck/should_compile/tc027.stderr
@@ -1,17 +1,3 @@
-==================== Typechecked ====================
-AbsBinds
-[tala]
-[]
-[([tala], f{-r3n,x-}, f_akG), ([tala], g{-r3m,x-}, g_akH)]
-    f_akG x_r3h y_r3i = if x_r3h then y_r3i else g_akH y_r3i x_r3h
-    g_akH y_r3k x_r3l = if x_r3l then y_r3k else f_akG x_r3l y_r3k
-AbsBinds [] [] [([], h{-r3o,x-}, h_alc)]
-    h_alc x_r3f
-	  = f{-r3n,x-} PrelBase.Bool{-34,W-} f{-r3n,x-}
-						 PrelBase.Bool{-34,W-} PrelBase.True{-5E,w-}{i}
-								       x_r3f
-					     x_r3f
-
 
 NOTE: Simplifier still going after 4 iterations; bailing out.
 ghc: module version changed to 1; reason: no old .hi file
diff --git a/ghc/tests/typecheck/should_compile/tc028.stderr b/ghc/tests/typecheck/should_compile/tc028.stderr
index 2bd79ef0ad9988bf77583a75e31e9af4bc3404ed..8f522a4f695b1221c6ecc0ff594df14b5498033b 100644
--- a/ghc/tests/typecheck/should_compile/tc028.stderr
+++ b/ghc/tests/typecheck/should_compile/tc028.stderr
@@ -1,5 +1,3 @@
-==================== Typechecked ====================
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc029.stderr b/ghc/tests/typecheck/should_compile/tc029.stderr
index 7fe721e8f0fa9331345a786f407fa778a7d35e8a..7b6b0b45db6aeea45021f8612623865a9c5a35ec 100644
--- a/ghc/tests/typecheck/should_compile/tc029.stderr
+++ b/ghc/tests/typecheck/should_compile/tc029.stderr
@@ -1,9 +1,3 @@
-==================== Typechecked ====================
-H{-r4,x-}{i} = \ tpl_B1 -> H{-r4,x-}{i} {tpl_B1}
-M{-r3,x-}{i} = \ tpl_B1 -> M{-r3,x-}{i} {tpl_B1}
-AbsBinds [] [] [([], $d1{-rBd,x-}, d.Eval_aBa)]
-    d.Eval_aBa = ({-dict-} [] [])
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc030.stderr b/ghc/tests/typecheck/should_compile/tc030.stderr
index af1d13fc0dd0f982917d59ba24d33b1d0ccf17f5..5f93c0bf42b5015d773160e2030cdf39af61135b 100644
--- a/ghc/tests/typecheck/should_compile/tc030.stderr
+++ b/ghc/tests/typecheck/should_compile/tc030.stderr
@@ -1,5 +1,3 @@
-==================== Typechecked ====================
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc031.stderr b/ghc/tests/typecheck/should_compile/tc031.stderr
index b1f30e730dc9d041ceb35632a26c0d3264cec31a..666d47bdb5d36ff19194c06735f8c393200cad87 100644
--- a/ghc/tests/typecheck/should_compile/tc031.stderr
+++ b/ghc/tests/typecheck/should_compile/tc031.stderr
@@ -1,9 +1,3 @@
-==================== Typechecked ====================
-Node{-r2,x-}{i} =
-    \ tpl_B1 tpl_B2 -> Node{-r2,x-}{i} {tpl_B1 tpl_B2}
-AbsBinds [] [] [([], $d1{-rB1,x-}, d.Eval_aAY)]
-    d.Eval_aAY = ({-dict-} [] [])
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc032.stderr b/ghc/tests/typecheck/should_compile/tc032.stderr
index 173553fd0f31400d5dfe7297dc015096e6634116..b835b4c8b7caf934e18bb0d3a49f6c7ace09a795 100644
--- a/ghc/tests/typecheck/should_compile/tc032.stderr
+++ b/ghc/tests/typecheck/should_compile/tc032.stderr
@@ -1,12 +1,3 @@
-==================== Typechecked ====================
-Node{-r4,x-}{i} =
-    _/\_ b_tr3h -> \ tpl_B1 tpl_B2 ->
-	Node{-r4,x-}{i} {_@_ b_tr3h tpl_B1 tpl_B2}
-Other{-r3,x-}{i} =
-    _/\_ b_tr3h -> \ tpl_B1 -> Other{-r3,x-}{i} {_@_ b_tr3h tpl_B1}
-AbsBinds [taQi] [] [([taQi], $d1{-rQl,x-}, d.Eval_aQh)]
-    d.Eval_aQh = ({-dict-} [] [])
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc033.stderr b/ghc/tests/typecheck/should_compile/tc033.stderr
index 5995e2383314273c7f28088304b13ddedc8e36e6..a4f61e0fb1ecfbae7d8d438f91f70f32cae3047e 100644
--- a/ghc/tests/typecheck/should_compile/tc033.stderr
+++ b/ghc/tests/typecheck/should_compile/tc033.stderr
@@ -1,11 +1,3 @@
-==================== Typechecked ====================
-Twist2{-r4,x-}{i} = \ tpl_B1 -> Twist2{-r4,x-}{i} {tpl_B1}
-Twine2{-r8,x-}{i} = \ tpl_B1 -> Twine2{-r8,x-}{i} {tpl_B1}
-AbsBinds [] [] [([], $d1{-rBi,x-}, d.Eval_aBa)]
-    d.Eval_aBa = ({-dict-} [] [])
-AbsBinds [] [] [([], $d2{-rBk,x-}, d.Eval_aBf)]
-    d.Eval_aBf = ({-dict-} [] [])
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc034.stderr b/ghc/tests/typecheck/should_compile/tc034.stderr
index 2cb8a7cc5bdc66e970bb4ed0f9093fca682f72ce..57e4b08b6b249a19bbdc4aa60f2d1721068c55ff 100644
--- a/ghc/tests/typecheck/should_compile/tc034.stderr
+++ b/ghc/tests/typecheck/should_compile/tc034.stderr
@@ -1,22 +1,3 @@
-==================== Typechecked ====================
-ANull{-r6,x-}{i} = _/\_ a_tr3p -> ANull{-r6,x-}{i} {_@_ a_tr3p}
-ANode{-r5,x-}{i} =
-    _/\_ a_tr3p -> \ tpl_B1 tpl_B2 ->
-	ANode{-r5,x-}{i} {_@_ a_tr3p tpl_B1 tpl_B2}
-AbsBinds [taCG] [d.Num_aCJ] [([taCG], g{-r3q,x-}, g_aCh)]
-    fromInt_aCY = PrelBase.fromInt{-8R,p-} taCG d.Num_aCJ
-    lit_aCX = fromInt_aCY PrelBase.I#{-5b,w-}{i} 2#
-    fromInt_aCW = fromInt_aCY
-    lit_aCV = fromInt_aCW PrelBase.I#{-5b,w-}{i} 3#
-    fromInt_aCU = fromInt_aCY
-    lit_aCT = fromInt_aCU PrelBase.I#{-5b,w-}{i} 4#
-    g_aCh ANull{-r6,x-}{i} = lit_aCX
-    g_aCh (ANode{-r5,x-}{i} b_r3k (ANode{-r5,x-}{i} c_r3l d_r3m))
-	  | b_r3k = lit_aCV
-	  | PrelBase.True{-5E,w-}{i} = lit_aCT
-AbsBinds [taCS] [] [([taCS], $d1{-rD1,x-}, d.Eval_aCR)]
-    d.Eval_aCR = ({-dict-} [] [])
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc035.stderr b/ghc/tests/typecheck/should_compile/tc035.stderr
index fe1892c58a2ea29fbbcc613d4e37d7aeb3b9f673..df81df5d5f43873f5e8d2c4802ea26dc9e5b7088 100644
--- a/ghc/tests/typecheck/should_compile/tc035.stderr
+++ b/ghc/tests/typecheck/should_compile/tc035.stderr
@@ -1,19 +1,3 @@
-==================== Typechecked ====================
-Var{-r5,x-}{i} =
-    _/\_ a_tr3q -> \ tpl_B1 -> Var{-r5,x-}{i} {_@_ a_tr3q tpl_B1}
-App{-r4,x-}{i} =
-    _/\_ a_tr3q -> \ tpl_B1 tpl_B2 ->
-	App{-r4,x-}{i} {_@_ a_tr3q tpl_B1 tpl_B2}
-AbsBinds [taRR] [] [([taRR], g{-r3t,x-}, g_aRu)]
-    g_aRu (a_r3j, (Var{-r5,x-}{i} name_r3k))
-	  = [name_r3k] ([PrelBase.Char{-38,W-}])
-    g_aRu (a_r3m, (App{-r4,x-}{i} e1_r3n e2_r3o))
-	  = ++_aSf [PrelBase.Char{-38,W-}] (g_aRu e1_r3n) (g_aRu e2_r3o)
-AbsBinds [taSe] [] [([taSe], $d1{-rSi,x-}, d.Eval_aSb)]
-    d.Eval_aSb = ({-dict-} [] [])
-d.MonadPlus_aSd = PrelBase.$d23{-rpi,p-}
-++_aSf = PrelBase.++{-ruo,p-} PrelBase.[]{-3j,W-} d.MonadPlus_aSd
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc036.stderr b/ghc/tests/typecheck/should_compile/tc036.stderr
index 2d369ecb639d87a1e173cd093c19c31443c05b71..53dc074527438052981e0b3fa047ef8992947436 100644
--- a/ghc/tests/typecheck/should_compile/tc036.stderr
+++ b/ghc/tests/typecheck/should_compile/tc036.stderr
@@ -1,12 +1,3 @@
-==================== Typechecked ====================
-scsel_APrelBaseEq{-aAX,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-op1{-r3f,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [taAW] [d.A_aAV] []
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc037.stderr b/ghc/tests/typecheck/should_compile/tc037.stderr
index a20bafb13e549bee4c07b904abac052e791e7564..3aad75ee06117980ccdedd00b0b3d16c16815225 100644
--- a/ghc/tests/typecheck/should_compile/tc037.stderr
+++ b/ghc/tests/typecheck/should_compile/tc037.stderr
@@ -1,22 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [tal3] [d.Eq'_als] [([tal3], $d1{-rlB,x-}, d.Eq'_akW)]
-    d.Eq'_alv = d.Eq'_als
-    deq_alE = deq{-r3u,x-} tal3 d.Eq'_alv
-    deq_alD = deq_alC
-    AbsBinds [] [] [([], deq_alC, deq_al0)]
-	deq_al0 PrelBase.[]{-5i,w-}{i} PrelBase.[]{-5i,w-}{i}
-		= PrelBase.True{-5E,w-}{i}
-	deq_al0 (x_r3k PrelBase.:{-55,w-}{i} xs_r3l)
-		(y_r3m PrelBase.:{-55,w-}{i} ys_r3n)
-		= if x_r3k deq_alE y_r3m then
-		      deq_alD xs_r3l ys_r3n
-		  else
-		      PrelBase.False{-58,w-}{i}
-	deq_al0 other1_r3p other2_r3q = PrelBase.False{-58,w-}{i}
-    d.Eq'_akW = ({-dict-} [] [deq_alC])
-deq{-r3u,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [talA] [d.Eq'_alz] []
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc038.stderr b/ghc/tests/typecheck/should_compile/tc038.stderr
index 137ab70864c6ef51e5fd1516c3b80307db868ad7..a1268ff5b1546f25000666bade19b95c22544b6f 100644
--- a/ghc/tests/typecheck/should_compile/tc038.stderr
+++ b/ghc/tests/typecheck/should_compile/tc038.stderr
@@ -1,14 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [taCf] [d.Num_aCj] [([taCf], f{-r3f,x-}, f_aBV)]
-    d.Eq_aCh = PrelBase.scsel_NumPrelBaseEq{-aCm,p-} taCf d.Num_aCj
-    ==_aCl = PrelBase.=={-8Y,p-} taCf d.Eq_aCh
-    fromInteger_aCk = PrelBase.fromInteger{-8S,p-} taCf d.Num_aCj
-    f_aBV (x_r3d PrelBase.:{-55,w-}{i} xs_r3e)
-	  = if x_r3d ==_aCl (fromInteger_aCk 2) then
-		xs_r3e
-	    else
-		PrelBase.[]{-5i,w-}{i} taCf
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc039.stderr b/ghc/tests/typecheck/should_compile/tc039.stderr
index 2d369ecb639d87a1e173cd093c19c31443c05b71..53dc074527438052981e0b3fa047ef8992947436 100644
--- a/ghc/tests/typecheck/should_compile/tc039.stderr
+++ b/ghc/tests/typecheck/should_compile/tc039.stderr
@@ -1,12 +1,3 @@
-==================== Typechecked ====================
-scsel_APrelBaseEq{-aAX,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-op1{-r3f,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [taAW] [d.A_aAV] []
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc040.stderr b/ghc/tests/typecheck/should_compile/tc040.stderr
index ac9b2c943609a8e914f4eee5986ef368a78baa16..9d372f60ece0509b792cdc58cc766526d4e1360e 100644
--- a/ghc/tests/typecheck/should_compile/tc040.stderr
+++ b/ghc/tests/typecheck/should_compile/tc040.stderr
@@ -1,20 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [taB3] [d.Eq_aBk] [([taB3], f{-r3e,x-}, f_aB0)]
-    d.Eq_aBm = d.Eq_aBk
-    ==_aBn = PrelBase.=={-8Y,p-} taB3 d.Eq_aBm
-    f_aB0 x_r3g
-	  = g_r3i x_r3g
-	  where
-	      {- nonrec -}
-	      AbsBinds [] [] [([], g_r3i, g_aB5)]
-		  g_aB5 y_r3k
-			= if y_r3k ==_aBn x_r3g then
-			      PrelBase.[]{-5i,w-}{i} taB3
-			  else
-			      [y_r3k] (taB3)
-	      {- nonrec -}
-	      {- nonrec -}
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc041.stderr b/ghc/tests/typecheck/should_compile/tc041.stderr
index d5fdc9effdcb47f258dcc7fe55929c05ae498008..2e602324231aec86615b98b64137a0c7c4250fda 100644
--- a/ghc/tests/typecheck/should_compile/tc041.stderr
+++ b/ghc/tests/typecheck/should_compile/tc041.stderr
@@ -1,15 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [] [] [([], f{-r1,x-}, f_akQ)]
-    f_akQ x_r3h y_r3i = op1_alg x_r3h x_r3h
-AbsBinds [] [] [([], $d1{-rlh,x-}, d.H_al2)]
-    AbsBinds [] [] [([], op1_ali, op1_al6)]
-	op1_al6 x_r3n y_r3o = y_r3o
-    d.H_al2 = ({-dict-} [] [op1_ali])
-op1{-r3s,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [talf] [d.H_alc] []
-d.H_ale = $d1{-rlh,x-}
-op1_alg = op1{-r3s,x-} PrelBase.Bool{-34,W-} d.H_ale
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc042.stderr b/ghc/tests/typecheck/should_compile/tc042.stderr
index 088d0e24ec1db0726c5a02657ed451b5fbb6e2aa..8f47de17780a45ae790b013653875a1f4a3a31df 100644
--- a/ghc/tests/typecheck/should_compile/tc042.stderr
+++ b/ghc/tests/typecheck/should_compile/tc042.stderr
@@ -1,101 +1,3 @@
-==================== Typechecked ====================
-Leaf{-rx,x-}{i} =
-    _/\_ t_tr5p -> \ tpl_B1 -> Leaf{-rx,x-}{i} {_@_ t_tr5p tpl_B1}
-Node{-rw,x-}{i} =
-    _/\_ t_tr5p -> \ tpl_B1 tpl_B2 ->
-	Node{-rw,x-}{i} {_@_ t_tr5p tpl_B1 tpl_B2}
-Zero{-rv,x-}{i} = Zero{-rv,x-}{i} {}
-Succ{-ru,x-}{i} = \ tpl_B1 -> Succ{-ru,x-}{i} {tpl_B1}
-Nil{-rt,x-}{i} = _/\_ alpha_tr5s -> Nil{-rt,x-}{i} {_@_ alpha_tr5s}
-Cons{-rs,x-}{i} =
-    _/\_ alpha_tr5s -> \ tpl_B1 tpl_B2 ->
-	Cons{-rs,x-}{i} {_@_ alpha_tr5s tpl_B1 tpl_B2}
-Mkpair{-r5z,x-}{i} =
-    _/\_ a_tr5u b_tr5v -> \ tpl_B1 tpl_B2 ->
-	Mkpair{-r5z,x-}{i} {_@_ a_tr5u _@_ b_tr5v tpl_B1 tpl_B2}
-FF{-rr,x-}{i} = FF{-rr,x-}{i} {}
-TT{-rq,x-}{i} = TT{-rq,x-}{i} {}
-AbsBinds [] [] [([], before{-r4a,x-}, before_aDC)]
-    before_aDC xs_r4W
-	       = case xs_r4W of
-		   Nil{-rt,x-}{i} -> Nil{-rt,x-}{i} Nat{-r5x,x-}
-		   (Cons{-rs,x-}{i} y_r4Z ys_r50)
-		   -> case y_r4Z of
-			Zero{-rv,x-}{i} -> Nil{-rt,x-}{i} Nat{-r5x,x-}
-			(Succ{-ru,x-}{i} n_r53)
-			-> Cons{-rs,x-}{i} Nat{-r5x,x-} y_r4Z before{-r4a,x-} ys_r50
-AbsBinds [taDZ] [] [([taDZ], lEngth{-r49,x-}, lEngth_aDW)]
-    lEngth_aDW xs_r4Q
-	       = case xs_r4Q of
-		   Nil{-rt,x-}{i} -> Zero{-rv,x-}{i}
-		   (Cons{-rs,x-}{i} y_r4T ys_r4U)
-		   -> Succ{-ru,x-}{i} lEngth{-r49,x-} taDZ ys_r4U
-AbsBinds [taEm] [] [([taEm], app{-r48,x-}, app_aEj)]
-    app_aEj xs_r4J zs_r4K
-	    = case xs_r4J of
-		Nil{-rt,x-}{i} -> zs_r4K
-		(Cons{-rs,x-}{i} y_r4N ys_r4O)
-		-> Cons{-rs,x-}{i} taEm y_r4N app{-r48,x-} taEm ys_r4O zs_r4K
-AbsBinds [taEM] [] [([taEM], rEverse{-r4b,x-}, rEverse_aEJ)]
-    rEverse_aEJ rs_r55
-		= case rs_r55 of
-		    Nil{-rt,x-}{i} -> Nil{-rt,x-}{i} taEM
-		    (Cons{-rs,x-}{i} y_r58 ys_r59)
-		    -> app{-r48,x-} taEM rEverse{-r4b,x-} taEM ys_r59
-					 Cons{-rs,x-}{i} taEM y_r58 Nil{-rt,x-}{i} taEM
-AbsBinds [taFg] [] [([taFg], flatten{-r4c,x-}, flatten_aFd)]
-    flatten_aFd t_r5b
-		= case t_r5b of
-		    (Leaf{-rx,x-}{i} x_r5d)
-		    -> Cons{-rs,x-}{i} taFg x_r5d Nil{-rt,x-}{i} taFg
-		    (Node{-rw,x-}{i} l_r5f r_r5g)
-		    -> app{-r48,x-} taFg flatten{-r4c,x-} taFg l_r5f
-					 flatten{-r4c,x-} taFg r_r5g
-AbsBinds [] [] [([], add{-r47,x-}, add_aFF)]
-    add_aFF a_r4D b_r4E
-	    = case a_r4D of
-		Zero{-rv,x-}{i} -> b_r4E
-		(Succ{-ru,x-}{i} c_r4H) -> Succ{-ru,x-}{i} add{-r47,x-} c_r4H b_r4E
-AbsBinds [] [] [([], sUm{-r4d,x-}, sUm_aFN)]
-    sUm_aFN t_r5i
-	    = case t_r5i of
-		(Leaf{-rx,x-}{i} t_r5k) -> t_r5k
-		(Node{-rw,x-}{i} l_r5m r_r5n)
-		-> add{-r47,x-} sUm{-r4d,x-} l_r5m sUm{-r4d,x-} r_r5n
-AbsBinds [taG9] [] [([taG9], idl{-r46,x-}, idl_aG6)]
-    idl_aG6 xs_r4x
-	    = case xs_r4x of
-		Nil{-rt,x-}{i} -> Nil{-rt,x-}{i} taG9
-		(Cons{-rs,x-}{i} y_r4A ys_r4B)
-		-> Cons{-rs,x-}{i} taG9 y_r4A idl{-r46,x-} taG9 ys_r4B
-AbsBinds [taGy] [] [([taGy], nUll{-r45,x-}, nUll_aGv)]
-    nUll_aGv l_r4r
-	     = case l_r4r of
-		 Nil{-rt,x-}{i} -> TT{-rq,x-}{i}
-		 (Cons{-rs,x-}{i} y_r4u ys_r4v) -> FF{-rr,x-}{i}
-AbsBinds [] [] [([], neg{-r44,x-}, neg_aGL)]
-    neg_aGL b_r4n
-	    = case b_r4n of
-		FF{-rr,x-}{i} -> TT{-rq,x-}{i}
-		TT{-rq,x-}{i} -> FF{-rr,x-}{i}
-AbsBinds [taGZ, taH0] [] [([taH0, taGZ], swap{-r43,x-}, swap_aGW)]
-    swap_aGW t_r4i
-	     = case t_r4i of
-		 (Mkpair{-r5z,x-}{i} x_r4k y_r4l)
-		 -> Mkpair{-r5z,x-}{i} [taH0, taGZ] y_r4l x_r4k
-AbsBinds [] [] [([], idb{-r42,x-}, idb_aHh)]
-    idb_aHh x_r4g = x_r4g
-AbsBinds [taHN] [] [([taHN], $d1{-rI1,x-}, d.Eval_aHp)]
-    d.Eval_aHp = ({-dict-} [] [])
-AbsBinds [] [] [([], $d2{-rI0,x-}, d.Eval_aHu)]
-    d.Eval_aHu = ({-dict-} [] [])
-AbsBinds [taHO] [] [([taHO], $d3{-rHZ,x-}, d.Eval_aHA)]
-    d.Eval_aHA = ({-dict-} [] [])
-AbsBinds [taHP, taHQ] [] [([taHP, taHQ], $d4{-rHY,x-}, d.Eval_aHH)]
-    d.Eval_aHH = ({-dict-} [] [])
-AbsBinds [] [] [([], $d5{-rHX,x-}, d.Eval_aHM)]
-    d.Eval_aHM = ({-dict-} [] [])
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc043.stderr b/ghc/tests/typecheck/should_compile/tc043.stderr
index f325ad451ca46014ce206e9dffb4f3b2f2027758..44993e3804946a925478616f04344d5b3a6352b7 100644
--- a/ghc/tests/typecheck/should_compile/tc043.stderr
+++ b/ghc/tests/typecheck/should_compile/tc043.stderr
@@ -1,26 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [taCH, taCE] [d.A_aCJ] [([taCH, taCE], f{-r3B,x-}, f_aCu)]
-    op1_aDA = op1{-r3D,x-} taCE d.A_aCJ
-    f_aCu x_r3h = op1_aDA
-AbsBinds [taCW] [d.B_aDc] [([taCW], $d1{-rDE,x-}, d.B_aCP)]
-    op2_aDG = op2_aDF
-    AbsBinds [] [] [([], op2_aDF, op2_aCT)]
-	op2_aCT PrelBase.[]{-5i,w-}{i} = PrelBase.I#{-5b,w-}{i} 0#
-	op2_aCT (x_r3p PrelBase.:{-55,w-}{i} xs_r3q)
-		= lit_aDB +_aDC (op2_aDG xs_r3q)
-    d.B_aCP = ({-dict-} [] [op2_aDF])
-AbsBinds [] [] [([], $d2{-rDD,x-}, d.A_aDk)]
-    AbsBinds [] [] [([], op1_aDH, op1_aDo)]
-	op1_aDo = PrelBase.I#{-5b,w-}{i} 2#
-    d.A_aDk = ({-dict-} [] [op1_aDH])
-op2{-r3C,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taDy] [d.B_aDs] []
-op1{-r3D,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taDz] [d.A_aDv] []
-d.Num_aDx = PrelBase.$d4{-raQ,p-}
-+_aDC = PrelBase.+{-rfF,p-} PrelBase.Int{-3g,W-} d.Num_aDx
-lit_aDB = PrelBase.I#{-5b,w-}{i} 1#
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc044.stderr b/ghc/tests/typecheck/should_compile/tc044.stderr
index 3761871537b263f5b30cfb8b4d55b1553bdfc2be..8b16f120b1a6915b2998050b3d0ea2f22951584c 100644
--- a/ghc/tests/typecheck/should_compile/tc044.stderr
+++ b/ghc/tests/typecheck/should_compile/tc044.stderr
@@ -1,7 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [tarc] [] [([tarc], f{-r1,x-}, f_ar1)]
-    f_ar1 _ | PrelBase.otherwise{-818,p-} = PrelBase.(){-60,w-}{i}
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc045.stderr b/ghc/tests/typecheck/should_compile/tc045.stderr
index e8f277011ef6c613978682d33941da798b384ca4..af259656a00a75a4ae0705971927070d3a3cbc2f 100644
--- a/ghc/tests/typecheck/should_compile/tc045.stderr
+++ b/ghc/tests/typecheck/should_compile/tc045.stderr
@@ -1,26 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [talh] [] [([talh], $d1{-rlM,x-}, d.C_ala)]
-    AbsBinds [] [] [([], op1_alN, op1_ale)]
-	op1_ale xs_r3k = xs_r3k
-    d.C_ala = ({-dict-} [] [op1_alN])
-AbsBinds
-[talv]
-[d.B_aly, d.C_alz]
-[([talv], $d2{-rlP,x-}, d.B_alo)]
-    d.C_alA = d.C_alz
-    AbsBinds [] [] [([], op2_alQ, op2_als)]
-	op2_als xs_r3s ys_r3t = xs_r3s
-    d.B_alo = ({-dict-} [d.C_alA] [op2_alQ])
-scsel_BShouldSucceedC{-alO,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-op2{-r3B,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [talK] [d.B_alG] []
-op1{-r3C,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [talL] [d.C_alJ] []
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc046.stderr b/ghc/tests/typecheck/should_compile/tc046.stderr
index 2896bd850e97c444ce4c8e54c3ced9aa90355008..f62216ded07ec401cba857f248bcc935f2393a45 100644
--- a/ghc/tests/typecheck/should_compile/tc046.stderr
+++ b/ghc/tests/typecheck/should_compile/tc046.stderr
@@ -1,14 +1,3 @@
-==================== Typechecked ====================
-scsel_BShouldSucceedC{-akW,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-op2{-r3l,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [takU] [d.B_akQ] []
-op1{-r3n,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [takV] [d.C_akT] []
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc047.stderr b/ghc/tests/typecheck/should_compile/tc047.stderr
index 90a65d8be2283205ca4bfa0c770dd6c3ea4c0d9f..f1c1a173fd1414b3a88e946a4435e8e527e4840f 100644
--- a/ghc/tests/typecheck/should_compile/tc047.stderr
+++ b/ghc/tests/typecheck/should_compile/tc047.stderr
@@ -1,24 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [taz2, taz5] [] [([taz2, taz5], sd{-r3w,x-}, sd_ayS)]
-    sd_ayS (f_r3s, s_r3t) = s_r3t
-AbsBinds [tazu, tazy] [] [([tazu, tazy], mp{-r3x,x-}, mp_az8)]
-    mp_az8 f_r3m PrelBase.[]{-5i,w-}{i} = PrelBase.[]{-5i,w-}{i} tazy
-    mp_az8 f_r3o (x_r3p PrelBase.:{-55,w-}{i} xs_r3q)
-	   = PrelBase.:{-55,w-}{i} tazy (f_r3o x_r3p) (mp_az8 f_r3o xs_r3q)
-AbsBinds
-[taAa, taA7, taA8]
-[]
-[([taAa, taA7, taA8], f{-r3y,x-}, f_azE)]
-    f_azE x_r3g
-	  = ranOAL_r3i [taA8, taA7]
-	  where
-	      {- nonrec -}
-	      AbsBinds [tazZ, taA2] [] [([tazZ, taA2], ranOAL_r3i, ranOAL_azO)]
-		  ranOAL_azO xs_r3k
-			     = mp{-r3x,x-} [(taA2, tazZ), tazZ] sd{-r3w,x-} [taA2, tazZ] xs_r3k
-	      {- nonrec -}
-	      {- nonrec -}
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc048.stderr b/ghc/tests/typecheck/should_compile/tc048.stderr
index f217093a03d64c1113a53164c789a96f265f8d97..2807b7370eb3c01026c6587cf3a4cae53447c2bd 100644
--- a/ghc/tests/typecheck/should_compile/tc048.stderr
+++ b/ghc/tests/typecheck/should_compile/tc048.stderr
@@ -1,41 +1,3 @@
-==================== Typechecked ====================
-MkAFE{-r3S,x-}{i} =
-    _/\_ n_tr3K a_tr3L b_tr3M -> \ tpl_B1 ->
-	MkAFE{-r3S,x-}{i} {_@_ n_tr3K _@_ a_tr3L _@_ b_tr3M tpl_B1}
-MkFG{-r3U,x-}{i} =
-    _/\_ a_tr3O b_tr3P -> \ tpl_B1 ->
-	MkFG{-r3U,x-}{i} {_@_ a_tr3O _@_ b_tr3P tpl_B1}
-MkOL{-r3W,x-}{i} =
-    _/\_ a_tr3R -> \ tpl_B1 -> MkOL{-r3W,x-}{i} {_@_ a_tr3R tpl_B1}
-AbsBinds [taRj, taRm] [] [([taRj, taRm], sNd{-r3u,x-}, sNd_aR9)]
-    sNd_aR9 (f_r3F, s_r3G) = s_r3G
-AbsBinds [taRL, taRP] [] [([taRL, taRP], mAp{-r3v,x-}, mAp_aRp)]
-    mAp_aRp f_r3z PrelBase.[]{-5i,w-}{i} = PrelBase.[]{-5i,w-}{i} taRP
-    mAp_aRp f_r3B (x_r3C PrelBase.:{-55,w-}{i} xs_r3D)
-	    = PrelBase.:{-55,w-}{i} taRP (f_r3B x_r3C) (mAp_aRp f_r3B xs_r3D)
-AbsBinds
-[taS5, taS6]
-[]
-[([taS5, taS6], ranOAL{-r3s,x-}, ranOAL_aS0)]
-    ranOAL_aS0 (MkOL{-r3W,x-}{i} xs_r3x)
-	       = mAp{-r3v,x-} [(taS5, taS6), taS6] sNd{-r3u,x-} [taS5, taS6]
-						   xs_r3x
-AbsBinds
-[taSy, taSz, taSA]
-[]
-[([taSy, taSz, taSA], ranAFE{-r3t,x-}, ranAFE_aSp)]
-    ranAFE_aSp (MkAFE{-r3S,x-}{i} nfs_r3I)
-	       = ranOAL{-r3s,x-} [taSy, FG{-r3V,x-} taSz taSA] nfs_r3I
-AbsBinds
-[taT1, taT3, taT2]
-[]
-[([taT1, taT3, taT2], $d1{-rTd,x-}, d.Eval_aSN)]
-    d.Eval_aSN = ({-dict-} [] [])
-AbsBinds [taT4, taT5] [] [([taT4, taT5], $d2{-rTc,x-}, d.Eval_aSU)]
-    d.Eval_aSU = ({-dict-} [] [])
-AbsBinds [taT6] [] [([taT6], $d3{-rTb,x-}, d.Eval_aT0)]
-    d.Eval_aT0 = ({-dict-} [] [])
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc049.stderr b/ghc/tests/typecheck/should_compile/tc049.stderr
index ee105fedb9dfcf28346e34d11c36fa0a4501a608..2b3ffb38309482d95dfeaa47c12467fa252b3b0f 100644
--- a/ghc/tests/typecheck/should_compile/tc049.stderr
+++ b/ghc/tests/typecheck/should_compile/tc049.stderr
@@ -1,108 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [] [] [([], main3{-r3W,x-}, main3_aT0)]
-    main3_aT0
-	= [[lit_aXN] (PrelBase.Int{-3g,W-}),
-	   [lit_aXM] (PrelBase.Int{-3g,W-})] ([PrelBase.Int{-3g,W-}])
-	  ==_aXO [[lit_aXL] (PrelBase.Int{-3g,W-})] ([PrelBase.Int{-3g,W-}])
-AbsBinds [] [] [([], main2{-r3X,x-}, main2_aTs)]
-    main2_aTs = "Hello" ==_aXP "Goodbye"
-AbsBinds [] [] [([], main1{-r3Y,x-}, main1_aTB)]
-    main1_aTB
-	= [[(lit_aXR,
-	     PrelBase.True{-5E,w-}{i})] ((PrelBase.Int{-3g,W-}, PrelBase.Bool{-34,W-}))] ([(PrelBase.Int{-3g,W-}, PrelBase.Bool{-34,W-})])
-	  ==_aXS [[(lit_aXQ,
-		    PrelBase.False{-58,w-}{i})] ((PrelBase.Int{-3g,W-}, PrelBase.Bool{-34,W-}))] ([(PrelBase.Int{-3g,W-}, PrelBase.Bool{-34,W-})])
-AbsBinds
-[taUC]
-[d.Eq_aUX]
-[([taUC], mem3{-r40,x-}, mem3_aU9), ([taUC],
-				     mem4{-r3Z,x-},
-				     mem4_aUa)]
-    d.Eq_aUV = PrelBase.$d28{-rb4,p-} taUC d.Eq_aUX
-    ==_aXT = PrelBase.=={-8Y,p-} [taUC] d.Eq_aUV
-    mem3_aU9 x_r3N PrelBase.[]{-5i,w-}{i} = PrelBase.False{-58,w-}{i}
-    mem3_aU9 x_r3P (y_r3Q PrelBase.:{-55,w-}{i} ys_r3R)
-	     = if [x_r3P] (taUC) ==_aXT [y_r3Q] (taUC) then
-		   mem4_aUa x_r3P ys_r3R
-	       else
-		   PrelBase.False{-58,w-}{i}
-    mem4_aUa y_r3T (x_r3U PrelBase.:{-55,w-}{i} xs_r3V)
-	     = mem3_aU9 y_r3T xs_r3V
-AbsBinds [] [] [([], oR1{-r42,x-}, oR1_aUZ)]
-    oR1_aUZ a_r3E b_r3F
-	    = if a_r3E then PrelBase.True{-5E,w-}{i} else b_r3F
-AbsBinds [] [] [([], oR{-r44,x-}, oR_aVf)]
-    oR_aVf a_r3v b_r3w
-	   = if a_r3v then PrelBase.True{-5E,w-}{i} else b_r3w
-AbsBinds
-[taWj]
-[d.Eq_aWm]
-[([taWj], mem2{-r41,x-}, mem2_aVv), ([taWj],
-				     mem1{-r43,x-},
-				     mem1_aVw)]
-    ==_aXV = PrelBase.=={-8Y,p-} taWj d.Eq_aWm
-    ==_aXU = ==_aXV
-    mem2_aVv x_r3H PrelBase.[]{-5i,w-}{i} = PrelBase.False{-58,w-}{i}
-    mem2_aVv x_r3J (y_r3K PrelBase.:{-55,w-}{i} ys_r3L)
-	     = (x_r3J ==_aXV y_r3K) oR{-r44,x-} (mem1_aVw x_r3J ys_r3L)
-    mem1_aVw x_r3y PrelBase.[]{-5i,w-}{i} = PrelBase.False{-58,w-}{i}
-    mem1_aVw x_r3A (y_r3B PrelBase.:{-55,w-}{i} ys_r3C)
-	     = (x_r3A ==_aXU y_r3B) oR1{-r42,x-} (mem2_aVv x_r3A ys_r3C)
-AbsBinds [taWM] [d.Eq_aWP] [([taWM], mem{-r45,x-}, mem_aWo)]
-    ==_aXW = PrelBase.=={-8Y,p-} taWM d.Eq_aWP
-    mem_aWo x_r3p PrelBase.[]{-5i,w-}{i} = PrelBase.False{-58,w-}{i}
-    mem_aWo x_r3r (y_r3s PrelBase.:{-55,w-}{i} ys_r3t)
-	    = (x_r3r ==_aXW y_r3s) oR{-r44,x-} (mem_aWo x_r3r ys_r3t)
-AbsBinds
-[taXc]
-[d.Ord_aXg, d.Num_aXj]
-[([taXc], fib{-r46,x-}, fib_aWR)]
-    <=_aY5 = PrelBase.<={-rgd,p-} taXc d.Ord_aXg
-    fromInt_aY4 = PrelBase.fromInt{-8R,p-} taXc d.Num_aXj
-    lit_aY3 = fromInt_aY4 PrelBase.I#{-5b,w-}{i} 2#
-    d.Num_aXl = d.Num_aXj
-    +_aY2 = PrelBase.+{-rg6,p-} taXc d.Num_aXl
-    d.Num_aXn = d.Num_aXj
-    -_aY1 = PrelBase.-{-817,p-} taXc d.Num_aXn
-    fromInt_aY0 = fromInt_aY4
-    lit_aXZ = fromInt_aY0 PrelBase.I#{-5b,w-}{i} 1#
-    -_aXY = -_aY1
-    lit_aXX = lit_aY3
-    fib_aWR n_r3n
-	    = if n_r3n <=_aY5 lit_aY3 then
-		  n_r3n
-	      else
-		  (fib_aWR n_r3n -_aY1 lit_aXZ) +_aY2 (fib_aWR n_r3n -_aXY lit_aXX)
-d.Eq_aXw = PrelBase.$d8{-rbE,p-}
-d.Eq_aXx = PrelBase.$d33{-rba,p-}
-d.Eq_aXu =
-    PrelTup.$d9{-rwm,p-} [PrelBase.Int{-3g,W-}, PrelBase.Bool{-34,W-}]
-	[d.Eq_aXw, d.Eq_aXx]
-d.Eq_aXs =
-    PrelBase.$d28{-rb4,p-}
-	(PrelBase.Int{-3g,W-}, PrelBase.Bool{-34,W-})
-	d.Eq_aXu
-d.Eq_aXq =
-    PrelBase.$d28{-rb4,p-}
-	[(PrelBase.Int{-3g,W-}, PrelBase.Bool{-34,W-})]
-	d.Eq_aXs
-==_aXS =
-    PrelBase.=={-8Y,p-}
-	[[(PrelBase.Int{-3g,W-}, PrelBase.Bool{-34,W-})]]
-	d.Eq_aXq
-lit_aXR = PrelBase.I#{-5b,w-}{i} 1#
-lit_aXQ = PrelBase.I#{-5b,w-}{i} 2#
-d.Eq_aXD = PrelBase.$d34{-rbb,p-}
-d.Eq_aXB = PrelBase.$d28{-rb4,p-} PrelBase.Char{-38,W-} d.Eq_aXD
-==_aXP = PrelBase.=={-8Y,p-} [PrelBase.Char{-38,W-}] d.Eq_aXB
-d.Eq_aXK = d.Eq_aXw
-d.Eq_aXI = PrelBase.$d28{-rb4,p-} PrelBase.Int{-3g,W-} d.Eq_aXK
-d.Eq_aXG = PrelBase.$d28{-rb4,p-} [PrelBase.Int{-3g,W-}] d.Eq_aXI
-==_aXO = PrelBase.=={-8Y,p-} [[PrelBase.Int{-3g,W-}]] d.Eq_aXG
-lit_aXN = lit_aXR
-lit_aXM = lit_aXQ
-lit_aXL = PrelBase.I#{-5b,w-}{i} 3#
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc050.stderr b/ghc/tests/typecheck/should_compile/tc050.stderr
index 91a6bd6b8a56e463adff720893ebe99c9d17820a..0f747a52770a2621b0a1f0ceace11abe53bd22f3 100644
--- a/ghc/tests/typecheck/should_compile/tc050.stderr
+++ b/ghc/tests/typecheck/should_compile/tc050.stderr
@@ -1,43 +1,3 @@
-==================== Typechecked ====================
-AbsBinds
-[taCN, taCJ]
-[d.Foo_aCP, d.Num_aCS]
-[([taCN, taCJ], g{-r3F,x-}, g_aCt)]
-    o_and_aE5 = o_and{-r3H,x-} taCJ d.Foo_aCP
-    fromInt_aE4 = PrelBase.fromInt{-8R,p-} taCJ d.Num_aCS
-    lit_aE3 = fromInt_aE4 PrelBase.I#{-5b,w-}{i} 1#
-    g_aCt x_r3j y_r3k = o_and_aE5 x_r3j lit_aE3
-AbsBinds [taDd] [] [([taDd], f{-r3G,x-}, f_aCU)]
-    f_aCU x_r3g y_r3h = o_and_aE9 x_r3g PrelBase.False{-58,w-}{i}
-AbsBinds [] [] [([], $d1{-rEb,x-}, d.Foo_aDk)]
-    AbsBinds [] [] [([], o_and_aEc, o_and_aDo)]
-	lit_aEh = lit_aE8
-	==_aEg = ==_aE7
-	==_aEf = ==_aE7
-	lit_aEe = lit_aE6
-	==_aEd = ==_aE7
-	o_and_aDo x_r3p 0 = PrelBase.I#{-5b,w-}{i} 0#
-	o_and_aDo 0 x_r3r = PrelBase.I#{-5b,w-}{i} 0#
-	o_and_aDo 1 1 = PrelBase.I#{-5b,w-}{i} 1#
-    d.Foo_aDk = ({-dict-} [] [o_and_aEc])
-AbsBinds [] [] [([], $d2{-rEa,x-}, d.Foo_aDM)]
-    AbsBinds [] [] [([], o_and_aEi, o_and_aDQ)]
-	o_and_aDQ PrelBase.False{-58,w-}{i} x_r3y
-		  = PrelBase.False{-58,w-}{i}
-	o_and_aDQ x_r3A PrelBase.False{-58,w-}{i}
-		  = PrelBase.False{-58,w-}{i}
-	o_and_aDQ PrelBase.True{-5E,w-}{i} PrelBase.True{-5E,w-}{i}
-		  = PrelBase.True{-5E,w-}{i}
-    d.Foo_aDM = ({-dict-} [] [o_and_aEi])
-o_and{-r3H,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taE2] [d.Foo_aDW] []
-d.Foo_aDY = $d2{-rEa,x-}
-o_and_aE9 = o_and{-r3H,x-} PrelBase.Bool{-34,W-} d.Foo_aDY
-lit_aE8 = PrelBase.I#{-5b,w-}{i} 0#
-d.Eq_aE1 = PrelBase.$d8{-rbh,p-}
-==_aE7 = PrelBase.=={-8Y,p-} PrelBase.Int{-3g,W-} d.Eq_aE1
-lit_aE6 = PrelBase.I#{-5b,w-}{i} 1#
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc051.stderr b/ghc/tests/typecheck/should_compile/tc051.stderr
index a28656e0b6cde37b68aa5278ea876f874b15afb7..1e76949041db39fdbff5300b7e14496587d19b71 100644
--- a/ghc/tests/typecheck/should_compile/tc051.stderr
+++ b/ghc/tests/typecheck/should_compile/tc051.stderr
@@ -1,27 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [] [] [([], $d1{-rm2,x-}, d.Ord'_alf)]
-    d.Eq'_alk = $d3{-rm5,x-}
-    AbsBinds [] [] [([], lt_am3, lt_alj)]
-	lt_alj x_r3j y_r3k = PrelBase.True{-5E,w-}{i}
-    d.Ord'_alf = ({-dict-} [d.Eq'_alk] [lt_am3])
-AbsBinds [talC] [d.Eq'_alF] [([talC], $d2{-rm6,x-}, d.Eq'_alv)]
-    AbsBinds [] [] [([], doubleeq_am7, doubleeq_alz)]
-	doubleeq_alz x_r3s y_r3t = PrelBase.True{-5E,w-}{i}
-    d.Eq'_alv = ({-dict-} [] [doubleeq_am7])
-AbsBinds [] [] [([], $d3{-rm5,x-}, d.Eq'_alM)]
-    AbsBinds [] [] [([], doubleeq_am8, doubleeq_alQ)]
-	doubleeq_alQ x_r3z y_r3A = PrelBase.True{-5E,w-}{i}
-    d.Eq'_alM = ({-dict-} [] [doubleeq_am8])
-scsel_Ord'ShouldSucceedEq'{-am4,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-lt{-r3H,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [tam0] [d.Ord'_alW] []
-doubleeq{-r3J,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [tam1] [d.Eq'_alZ] []
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc052.stderr b/ghc/tests/typecheck/should_compile/tc052.stderr
index 2d76e129ed698c9838a3399413b0a4f2d80f1d3e..f0d4613698cee1e58509eae217e4263f2a6a2aef 100644
--- a/ghc/tests/typecheck/should_compile/tc052.stderr
+++ b/ghc/tests/typecheck/should_compile/tc052.stderr
@@ -1,5 +1,3 @@
-==================== Typechecked ====================
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc053.stderr b/ghc/tests/typecheck/should_compile/tc053.stderr
index 016dc08fa8b08bd1ff4ef1a601258ece4780f6d8..971239f2932f1fbbbb9570884faa68606a30aca7 100644
--- a/ghc/tests/typecheck/should_compile/tc053.stderr
+++ b/ghc/tests/typecheck/should_compile/tc053.stderr
@@ -1,32 +1,3 @@
-==================== Typechecked ====================
-AbsBinds
-[taCA]
-[d.Eq'_aCF, d.Num_aCI]
-[([taCA], f{-r3A,x-}, f_aCn)]
-    d.Eq'_aCD = $d1{-rDB,x-} taCA d.Eq'_aCF
-    deq_aDz = deq{-r3B,x-} [taCA] d.Eq'_aCD
-    fromInt_aDy = PrelBase.fromInt{-8R,p-} taCA d.Num_aCI
-    lit_aDx = fromInt_aDy PrelBase.I#{-5b,w-}{i} 1#
-    f_aCn x_r3f = deq_aDz x_r3f [lit_aDx] (taCA)
-AbsBinds [taCZ] [d.Eq'_aDb] [([taCZ], $d1{-rDB,x-}, d.Eq'_aCO)]
-    d.Eq'_aDf = d.Eq'_aDb
-    deq_aDE = deq{-r3B,x-} taCZ d.Eq'_aDf
-    deq_aDD = deq_aDC
-    AbsBinds [] [] [([], deq_aDC, deq_aCS)]
-	deq_aCS (a_r3m PrelBase.:{-55,w-}{i} as_r3n)
-		(b_r3o PrelBase.:{-55,w-}{i} bs_r3p)
-		= if deq_aDE a_r3m b_r3o then
-		      deq_aDD as_r3n bs_r3p
-		  else
-		      PrelBase.False{-58,w-}{i}
-    d.Eq'_aCO = ({-dict-} [] [deq_aDC])
-AbsBinds [] [] [([], $d2{-rDA,x-}, d.Eq'_aDl)]
-    AbsBinds [] [] [([], deq_aDF, deq_aDp)]
-	deq_aDp x_r3v y_r3w = PrelBase.True{-5E,w-}{i}
-    d.Eq'_aDl = ({-dict-} [] [deq_aDF])
-deq{-r3B,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taDw] [d.Eq'_aDv] []
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc054.stderr b/ghc/tests/typecheck/should_compile/tc054.stderr
index 956d6c36996338b7db42a70edb04273dcdd0e7bb..59dfc9362f379f7a93705ad9fcbc390496deafe5 100644
--- a/ghc/tests/typecheck/should_compile/tc054.stderr
+++ b/ghc/tests/typecheck/should_compile/tc054.stderr
@@ -1,33 +1,3 @@
-==================== Typechecked ====================
-AbsBinds
-[taCS, taCN]
-[d.Ord'_aCU, d.Num_aCX]
-[([taCS, taCN], f{-r3D,x-}, f_aCw)]
-    lt_aDz = lt{-r3E,x-} taCN d.Ord'_aCU
-    fromInt_aDy = PrelBase.fromInt{-8R,p-} taCN d.Num_aCX
-    lit_aDx = fromInt_aDy PrelBase.I#{-5b,w-}{i} 1#
-    f_aCw x_r3h y_r3i
-	  | lt_aDz x_r3h lit_aDx = PrelBase.True{-5E,w-}{i}
-	  | PrelBase.otherwise{-818,p-} = PrelBase.False{-58,w-}{i}
-AbsBinds [] [] [([], $d1{-rDC,x-}, d.Ord'_aD2)]
-    d.Eq'_aD7 = $d2{-rDB,x-}
-    AbsBinds [] [] [([], lt_aDD, lt_aD6)]
-	lt_aD6 x_r3n y_r3o = PrelBase.True{-5E,w-}{i}
-    d.Ord'_aD2 = ({-dict-} [d.Eq'_aD7] [lt_aDD])
-AbsBinds [] [] [([], $d2{-rDB,x-}, d.Eq'_aDh)]
-    AbsBinds [] [] [([], doubleeq_aDE, doubleeq_aDl)]
-	doubleeq_aDl x_r3u y_r3v = PrelBase.True{-5E,w-}{i}
-    d.Eq'_aDh = ({-dict-} [] [doubleeq_aDE])
-scsel_Ord'ShouldSucceedEq'{-aDA,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-lt{-r3E,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [taDv] [d.Ord'_aDr] []
-doubleeq{-r3G,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taDw] [d.Eq'_aDu] []
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc055.stderr b/ghc/tests/typecheck/should_compile/tc055.stderr
index e1ed7a6803cdd7f19116d6580a95b8a7595df5f8..31d508c0c128ba8236ab9bd4e890e88e06537b7e 100644
--- a/ghc/tests/typecheck/should_compile/tc055.stderr
+++ b/ghc/tests/typecheck/should_compile/tc055.stderr
@@ -1,12 +1,3 @@
-==================== Typechecked ====================
-AbsBinds
-[tayU, tayW]
-[]
-[([tayU, tayW], x{-r3i,x-}, x_ayx), ([tayU, tayW],
-				     y{-r3h,x-},
-				     y_ayy)]
-    (x_ayx, y_ayy) = (\ p_r3e -> p_r3e, \ q_r3g -> q_r3g)
-
 
 NOTE: Simplifier still going after 4 iterations; bailing out.
 ghc: module version changed to 1; reason: no old .hi file
diff --git a/ghc/tests/typecheck/should_compile/tc056.stderr b/ghc/tests/typecheck/should_compile/tc056.stderr
index 7166906d2ec66d660d8938538d35392ee1d2ab50..8306e236df921f3286f2fbc6245e9f7812dae205 100644
--- a/ghc/tests/typecheck/should_compile/tc056.stderr
+++ b/ghc/tests/typecheck/should_compile/tc056.stderr
@@ -1,38 +1,6 @@
  
 tc056.hs:15:warning:
     Duplicated class assertion `Eq' a' in context: `(Eq' a, Eq' a)'
-==================== Typechecked ====================
-AbsBinds
-[taCU, taCR]
-[d.Eq'_aCY, d.Num_aD2]
-[([taCU, taCR], f{-r3E,x-}, f_aCy)]
-    d.Eq'_aCZ = d.Eq'_aCY
-    d.Eq'_aCW = $d1{-rDM,x-} taCR [d.Eq'_aCY, d.Eq'_aCZ]
-    doubleeq_aDJ = doubleeq{-r3H,x-} [taCR] d.Eq'_aCW
-    fromInt_aDI = PrelBase.fromInt{-8R,p-} taCR d.Num_aD2
-    lit_aDH = fromInt_aDI PrelBase.I#{-5b,w-}{i} 1#
-    f_aCy x_r3h y_r3i = doubleeq_aDJ x_r3h [lit_aDH] (taCR)
-AbsBinds
-[taDf]
-[d.Eq'_aDi, d.Eq'_aDj]
-[([taDf], $d1{-rDM,x-}, d.Eq'_aD8)]
-    AbsBinds [] [] [([], doubleeq_aDN, doubleeq_aDc)]
-	doubleeq_aDc x_r3p y_r3q = PrelBase.True{-5E,w-}{i}
-    d.Eq'_aD8 = ({-dict-} [] [doubleeq_aDN])
-AbsBinds [] [] [([], $d2{-rDL,x-}, d.Eq'_aDr)]
-    AbsBinds [] [] [([], doubleeq_aDO, doubleeq_aDv)]
-	doubleeq_aDv x_r3w y_r3x = PrelBase.True{-5E,w-}{i}
-    d.Eq'_aDr = ({-dict-} [] [doubleeq_aDO])
-scsel_Ord'ShouldSucceedEq'{-aDK,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-lt{-r3F,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [taDF] [d.Ord'_aDB] []
-doubleeq{-r3H,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taDG] [d.Eq'_aDE] []
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc057.stderr b/ghc/tests/typecheck/should_compile/tc057.stderr
index a8c8f4b54badf810a76590468247c12f4da3e15b..db733208f5284010a2ff9ed1ece9a2faa6a3fc8b 100644
--- a/ghc/tests/typecheck/should_compile/tc057.stderr
+++ b/ghc/tests/typecheck/should_compile/tc057.stderr
@@ -1,35 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [] [] [([], dand{-r3j,x-}, dand_aCy)]
-    dand_aCy PrelBase.True{-5E,w-}{i} PrelBase.True{-5E,w-}{i}
-	     = PrelBase.True{-5E,w-}{i}
-    dand_aCy x_r3m y_r3n = PrelBase.False{-58,w-}{i}
-AbsBinds [taCT] [d.Eq'_aD7] [([taCT], f{-r3i,x-}, f_aCQ)]
-    d.Eq'_aD9 = d.Eq'_aD7
-    deq_aE9 = deq{-r3M,x-} taCT d.Eq'_aD9
-    f_aCQ p_r3p q_r3q
-	  = dand{-r3j,x-} deq_aE9 p_r3p q_r3q
-			  deq_aE6 [PrelBase.I#{-5b,w-}{i} 1#] (PrelBase.Int{-3g,W-})
-				  [PrelBase.I#{-5b,w-}{i} 2#] (PrelBase.Int{-3g,W-})
-AbsBinds [taDs] [d.Eq'_aDE] [([taDs], $d1{-rE8,x-}, d.Eq'_aDh)]
-    d.Eq'_aDI = d.Eq'_aDE
-    f_aEc = f{-r3i,x-} taDs d.Eq'_aDI
-    d.Eq'_aDK = d.Eq'_aDh
-    f_aEb = f{-r3i,x-} [taDs] d.Eq'_aDK
-    AbsBinds [] [] [([], deq_aEa, deq_aDl)]
-	deq_aDl (a_r3y PrelBase.:{-55,w-}{i} as_r3z)
-		(b_r3A PrelBase.:{-55,w-}{i} bs_r3B)
-		= dand{-r3j,x-} f_aEc a_r3y b_r3A f_aEb as_r3z bs_r3B
-    d.Eq'_aDh = ({-dict-} [] [deq_aEa])
-AbsBinds [] [] [([], $d2{-rE7,x-}, d.Eq'_aDQ)]
-    AbsBinds [] [] [([], deq_aEd, deq_aDU)]
-	deq_aDU x_r3H y_r3I = PrelBase.True{-5E,w-}{i}
-    d.Eq'_aDQ = ({-dict-} [] [deq_aEd])
-deq{-r3M,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taE5] [d.Eq'_aE0] []
-d.Eq'_aE4 = $d2{-rE7,x-}
-d.Eq'_aE2 = $d1{-rE8,x-} PrelBase.Int{-3g,W-} d.Eq'_aE4
-deq_aE6 = deq{-r3M,x-} [PrelBase.Int{-3g,W-}] d.Eq'_aE2
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc058.stderr b/ghc/tests/typecheck/should_compile/tc058.stderr
index 78de2c02cc54b2a143a28fe3d8ac476f7bdb863d..0c771c3db01ea9972710a7e66bbfa2b2a4e9a77d 100644
--- a/ghc/tests/typecheck/should_compile/tc058.stderr
+++ b/ghc/tests/typecheck/should_compile/tc058.stderr
@@ -1,40 +1,3 @@
-==================== Typechecked ====================
-AbsBinds
-[taD1, taCY]
-[d.Ord2_aD6, d.Num_aD9]
-[([taD1, taCY], f{-r3M,x-}, f_aCF)]
-    d.Eq2_aD5 = scsel_Ord2ShouldSucceedEq2{-aE7,x-} taCY d.Ord2_aD6
-    d.Eq2_aD3 = $d1{-rEa,x-} taCY [d.Eq2_aD5, d.Ord2_aD6]
-    doubleeq_aE6 = doubleeq{-r3O,x-} [taCY] d.Eq2_aD3
-    fromInt_aE5 = PrelBase.fromInt{-8R,p-} taCY d.Num_aD9
-    lit_aE4 = fromInt_aE5 PrelBase.I#{-5b,w-}{i} 1#
-    f_aCF x_r3h y_r3i = doubleeq_aE6 x_r3h [lit_aE4] (taCY)
-AbsBinds
-[taDn]
-[d.Eq2_aDq, d.Ord2_aDr]
-[([taDn], $d1{-rEa,x-}, d.Eq2_aDg)]
-    AbsBinds [] [] [([], doubleeq_aEb, doubleeq_aDk)]
-	doubleeq_aDk xs_r3q ys_r3r = PrelBase.True{-5E,w-}{i}
-    d.Eq2_aDg = ({-dict-} [] [doubleeq_aEb])
-AbsBinds [] [] [([], $d2{-rE9,x-}, d.Ord2_aDz)]
-    d.Eq2_aDE = $d3{-rE8,x-}
-    AbsBinds [] [] [([], lt_aEc, lt_aDD)]
-	lt_aDD x_r3x y_r3y = PrelBase.True{-5E,w-}{i}
-    d.Ord2_aDz = ({-dict-} [d.Eq2_aDE] [lt_aEc])
-AbsBinds [] [] [([], $d3{-rE8,x-}, d.Eq2_aDO)]
-    AbsBinds [] [] [([], doubleeq_aEd, doubleeq_aDS)]
-	doubleeq_aDS x_r3E y_r3F = PrelBase.True{-5E,w-}{i}
-    d.Eq2_aDO = ({-dict-} [] [doubleeq_aEd])
-scsel_Ord2ShouldSucceedEq2{-aE7,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-lt{-r3N,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [taE2] [d.Ord2_aDY] []
-doubleeq{-r3O,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taE3] [d.Eq2_aE1] []
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc059.stderr b/ghc/tests/typecheck/should_compile/tc059.stderr
index 6bfbcf3525ba699bb87baf8576f0976f6ec6b02a..3167850478b4ab962d8537cc92a242154a1da812 100644
--- a/ghc/tests/typecheck/should_compile/tc059.stderr
+++ b/ghc/tests/typecheck/should_compile/tc059.stderr
@@ -1,44 +1,3 @@
-==================== Typechecked ====================
-AbsBinds
-[taCL]
-[d.Eq2_aCQ, d.Num_aCT]
-[([taCL], f{-r3J,x-}, f_aCy)]
-    d.Eq2_aCO = $d1{-rE7,x-} taCL d.Eq2_aCQ
-    deq_aE5 = deq{-r3L,x-} [taCL] d.Eq2_aCO
-    fromInt_aE4 = PrelBase.fromInt{-8R,p-} taCL d.Num_aCT
-    lit_aE3 = fromInt_aE4 PrelBase.I#{-5b,w-}{i} 1#
-    f_aCy x_r3g = deq_aE5 x_r3g [lit_aE3] (taCL)
-AbsBinds [taDa] [d.Eq2_aDA] [([taDa], $d1{-rE7,x-}, d.Eq2_aCZ)]
-    d.Eq2_aDD = d.Eq2_aDA
-    deq_aEd = deq{-r3L,x-} taDa d.Eq2_aDD
-    d.Eq2_aDF = d.Eq2_aDA
-    foo_aEc = foo{-r3K,x-} taDa d.Eq2_aDF
-    deq_aEb = deq_aE9
-    foo_aEa = foo_aE8
-    AbsBinds [] [] [([], deq_aE9, deq_aD3)]
-	deq_aD3 (a_r3n PrelBase.:{-55,w-}{i} as_r3o)
-		(b_r3p PrelBase.:{-55,w-}{i} bs_r3q)
-		= if deq_aEd a_r3n foo_aEc b_r3p then
-		      deq_aEb as_r3o foo_aEa bs_r3q
-		  else
-		      PrelBase.False{-58,w-}{i}
-    AbsBinds [] [] [([], foo_aE8, foo_aDx)]
-	foo_aDx x_r3u = x_r3u
-    d.Eq2_aCZ = ({-dict-} [] [deq_aE9, foo_aE8])
-AbsBinds [] [] [([], $d2{-rE6,x-}, d.Eq2_aDL)]
-    AbsBinds [] [] [([], deq_aEf, deq_aDP)]
-	deq_aDP x_r3A y_r3B = PrelBase.True{-5E,w-}{i}
-    AbsBinds [] [] [([], foo_aEe, foo_aDW)]
-	foo_aDW x_r3F = x_r3F
-    d.Eq2_aDL = ({-dict-} [] [deq_aEf, foo_aEe])
-deq{-r3L,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-foo{-r3K,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [taE2] [d.Eq2_aE1] []
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc060.stderr b/ghc/tests/typecheck/should_compile/tc060.stderr
index f1278b233f0eedcb85f66673f79f81bbc13f21f1..540303277c4980166103a65ae34d0c8652518974 100644
--- a/ghc/tests/typecheck/should_compile/tc060.stderr
+++ b/ghc/tests/typecheck/should_compile/tc060.stderr
@@ -1,23 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [] [] [([], $d1{-rlI,x-}, d.Eq2_akY)]
-    AbsBinds [] [] [([], deq_alJ, deq_al2)]
-	deq_al2 x_r3h y_r3i = PrelBase.True{-5E,w-}{i}
-    d.Eq2_akY = ({-dict-} [] [deq_alJ])
-AbsBinds [talm] [d.Eq2_aly] [([talm], $d2{-rlK,x-}, d.Eq2_alb)]
-    d.Eq2_alC = d.Eq2_aly
-    deq_alN = deq{-r3x,x-} talm d.Eq2_alC
-    deq_alM = deq_alL
-    AbsBinds [] [] [([], deq_alL, deq_alf)]
-	deq_alf (a_r3q PrelBase.:{-55,w-}{i} as_r3r)
-		(b_r3s PrelBase.:{-55,w-}{i} bs_r3t)
-		= if deq_alN a_r3q b_r3s then
-		      deq_alM as_r3r bs_r3t
-		  else
-		      PrelBase.False{-58,w-}{i}
-    d.Eq2_alb = ({-dict-} [] [deq_alL])
-deq{-r3x,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [talH] [d.Eq2_alG] []
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc061.stderr b/ghc/tests/typecheck/should_compile/tc061.stderr
index cc07cecdd3bbe1b7f030d73c840c86c449bad333..7d96c35a27577e8944b678440517925f83c29635 100644
--- a/ghc/tests/typecheck/should_compile/tc061.stderr
+++ b/ghc/tests/typecheck/should_compile/tc061.stderr
@@ -1,19 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [] [] [([], $d1{-rlF,x-}, d.Eq1_akY)]
-    AbsBinds [] [] [([], deq_alG, deq_al2)]
-	deq_al2 x_r3h y_r3i = PrelBase.True{-5E,w-}{i}
-    d.Eq1_akY = ({-dict-} [] [deq_alG])
-AbsBinds [talm] [d.Eq1_alv] [([talm], $d2{-rlH,x-}, d.Eq1_alb)]
-    d.Eq1_alz = d.Eq1_alv
-    deq_alJ = deq{-r3x,x-} talm d.Eq1_alz
-    AbsBinds [] [] [([], deq_alI, deq_alf)]
-	deq_alf (a_r3q PrelBase.:{-55,w-}{i} as_r3r)
-		(b_r3s PrelBase.:{-55,w-}{i} bs_r3t)
-		= deq_alJ a_r3q b_r3s
-    d.Eq1_alb = ({-dict-} [] [deq_alI])
-deq{-r3x,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [talE] [d.Eq1_alD] []
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc062.stderr b/ghc/tests/typecheck/should_compile/tc062.stderr
index f8dd8361da3db7ee62825644de61f106ba93672a..b515b6a36355dd7eede25f4840515e0abaab0b06 100644
--- a/ghc/tests/typecheck/should_compile/tc062.stderr
+++ b/ghc/tests/typecheck/should_compile/tc062.stderr
@@ -1,28 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [talh] [d.Eq1_alq] [([talh], f{-r3C,x-}, f_al1)]
-    d.Eq1_alo = $d1{-rmh,x-} talh d.Eq1_alq
-    deq_amf = deq{-r3D,x-} [talh] d.Eq1_alo
-    f_al1 x_r3f (y_r3g PrelBase.:{-55,w-}{i} ys_r3h)
-	  = deq_amf x_r3f ys_r3h
-AbsBinds [talH] [d.Eq1_alT] [([talH], $d1{-rmh,x-}, d.Eq1_alw)]
-    d.Eq1_alX = d.Eq1_alT
-    deq_amk = deq{-r3D,x-} talH d.Eq1_alX
-    deq_amj = deq_ami
-    AbsBinds [] [] [([], deq_ami, deq_alA)]
-	deq_alA (a_r3o PrelBase.:{-55,w-}{i} as_r3p)
-		(b_r3q PrelBase.:{-55,w-}{i} bs_r3r)
-		= if deq_amk a_r3o b_r3q then
-		      deq_amj as_r3p bs_r3r
-		  else
-		      PrelBase.False{-58,w-}{i}
-    d.Eq1_alw = ({-dict-} [] [deq_ami])
-AbsBinds [] [] [([], $d2{-rmg,x-}, d.Eq1_am3)]
-    AbsBinds [] [] [([], deq_aml, deq_am7)]
-	deq_am7 x_r3x y_r3y = PrelBase.True{-5E,w-}{i}
-    d.Eq1_am3 = ({-dict-} [] [deq_aml])
-deq{-r3D,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [tame] [d.Eq1_amd] []
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc063.stderr b/ghc/tests/typecheck/should_compile/tc063.stderr
index 37148af5b5f356deff80ccadd2fe4a3d38628dd5..e74ac448a0a4f3e2d583f6f9bbf4182fdfad5aa1 100644
--- a/ghc/tests/typecheck/should_compile/tc063.stderr
+++ b/ghc/tests/typecheck/should_compile/tc063.stderr
@@ -1,24 +1,3 @@
-==================== Typechecked ====================
-Tag{-r3G,x-}{i} =
-    _/\_ a_tr3C -> \ tpl_B1 -> Tag{-r3G,x-}{i} {_@_ a_tr3C tpl_B1}
-AbsBinds [taBG] [d.Reps_aBJ] [([taBG], g{-r3D,x-}, g_aBw)]
-    f_aCn = f{-r3E,x-} taBG d.Reps_aBJ
-    g_aBw x_r3h = f_aCn x_r3h x_r3h
-AbsBinds [taCl] [] [([taCl], $d3{-rCs,x-}, d.Eval_aBP)]
-    d.Eval_aBP = ({-dict-} [] [])
-AbsBinds [] [] [([], $d1{-rCp,x-}, d.Reps_aBU)]
-    AbsBinds [] [] [([], f_aCt, f_aBY)]
-	f_aBY PrelBase.True{-5E,w-}{i} PrelBase.True{-5E,w-}{i}
-	      = PrelBase.True{-5E,w-}{i}
-	f_aBY x_r3n y_r3o = PrelBase.False{-58,w-}{i}
-    d.Reps_aBU = ({-dict-} [] [f_aCt])
-AbsBinds [taCe] [] [([taCe], $d2{-rCo,x-}, d.Reps_aC7)]
-    AbsBinds [] [] [([], f_aCu, f_aCb)]
-	f_aCb x_r3v y_r3w = y_r3w
-    d.Reps_aC7 = ({-dict-} [] [f_aCu])
-f{-r3E,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taCm] [d.Reps_aCk] []
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc064.stderr b/ghc/tests/typecheck/should_compile/tc064.stderr
index 553a999532f810b0961c0fbd530354a8f0812775..dd1d098a095e104c8b4bc3cf566e15bf2283c700 100644
--- a/ghc/tests/typecheck/should_compile/tc064.stderr
+++ b/ghc/tests/typecheck/should_compile/tc064.stderr
@@ -1,11 +1,3 @@
-==================== Typechecked ====================
-FF{-r5,x-}{i} = FF{-r5,x-}{i} {}
-TT{-r4,x-}{i} = TT{-r4,x-}{i} {}
-AbsBinds [] [] [([], idb{-r6,x-}, idb_aB2)]
-    idb_aB2 x_r3k = x_r3k
-AbsBinds [] [] [([], $d1{-rBc,x-}, d.Eval_aB9)]
-    d.Eval_aB9 = ({-dict-} [] [])
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc065.stderr b/ghc/tests/typecheck/should_compile/tc065.stderr
index f3a32e0cb857a0d0021eea53f9487b7b36781f4f..b4d5dc3f12e4185383d4b27481d498a83cac6dd0 100644
--- a/ghc/tests/typecheck/should_compile/tc065.stderr
+++ b/ghc/tests/typecheck/should_compile/tc065.stderr
@@ -1,278 +1,3 @@
-==================== Typechecked ====================
-Succeeded{-rd,x-}{i} =
-    _/\_ a_tr8i b_tr8j -> \ tpl_B1 ->
-	Succeeded{-rd,x-}{i} {_@_ a_tr8i _@_ b_tr8j tpl_B1}
-Failed{-rc,x-}{i} =
-    _/\_ a_tr8i b_tr8j -> \ tpl_B1 ->
-	Failed{-rc,x-}{i} {_@_ a_tr8i _@_ b_tr8j tpl_B1}
-MkDigraph{-r8y,x-}{i} =
-    _/\_ vertex_tr8t -> \ tpl_B1 ->
-	MkDigraph{-r8y,x-}{i} {_@_ vertex_tr8t tpl_B1}
-AbsBinds
-[ta14k]
-[d.Eq_a14z]
-[([ta14k], isRecursiveCycle{-r6D,x-}, isRecursiveCycle_a14f)]
-    d.Eq_a14D = d.Eq_a14z
-    d.Eq_a14E = d.Eq_a14z
-    d.Eq_a14B =
-	PrelTup.$d9{-rDa,p-} [ta14k, ta14k] [d.Eq_a14D, d.Eq_a14E]
-    elem_a1fZ = PrelList.elem{-rDi,p-} (ta14k, ta14k) d.Eq_a14B
-    isRecursiveCycle_a14f [vertex_r8c] edges_r8d
-			  = (vertex_r8c, vertex_r8c) elem_a1fZ edges_r8d
-    isRecursiveCycle_a14f cycle_r8f edges_r8g
-			  = PrelBase.True{-5E,w-}{i}
-AbsBinds
-[ta14Q, ta14R, ta14S]
-[d.Eq_a15J, d.Ord_a15K]
-[([ta14R, ta14Q, ta14S], lookupVertex{-r6C,x-}, lookupVertex_a14N)]
-    d.Eq_a15M = d.Eq_a15J
-    ==_a1gh = PrelBase.=={-8Y,p-} ta14Q d.Eq_a15M
-    lookupVertex_a14N flat_info_r84 vertex_r85
-		      = PrelList.head{-rEs,p-} ta14S code_list_r87
-		      where
-			  {- nonrec -}
-			  AbsBinds [] [] [([], code_list_r87, code_list_a14W)]
-			      code_list_a14W
-				  = [code_r8a |
-					 (vertex'_r89, _, _, code_r8a) <- flat_info_r84, vertex_r85
-											 ==_a1gh vertex'_r89]
-			  {- nonrec -}
-			  {- nonrec -}
-AbsBinds
-[ta165, ta168, ta169]
-[d.Eq_a17S, d.Ord_a17T]
-[([ta168, ta169, ta165], mkEdges{-r6B,x-}, mkEdges_a162)]
-    d.Ord_a17P = d.Ord_a17T
-    d.MonadZero_a17Q = PrelBase.$d24{-ri3,p-}
-    mkEdges_a162 vertices_r7M flat_info_r7N
-		 = [(source_vertex_r7X, target_vertex_r82) |
-			(source_vertex_r7X, _, used_names_r7Y, _) <- flat_info_r7N, target_name_r80 <- Set.setToList{-rge,p-}
-													   ta168 used_names_r7Y, target_vertex_r82 <- vertices_defining_a1gi target_name_r80
-																					     flat_info_r7N]
-		 where
-		     {- nonrec -}
-		     AbsBinds
-		     [ta16x, ta16C, ta16F, aa16H, ta16K]
-		     [d.Ord_a16W, d.MonadZero_a172]
-		     [([ta16x, ta16C, ta16F, aa16H, ta16K],
-		       vertices_defining_r7P,
-		       vertices_defining_a16b)]
-			 d.Monad_a16Y =
-			     PrelBase.scsel_MonadZeroPrelBaseMonad{-a1gn,p-} aa16H
-				 d.MonadZero_a172
-			 elementOf_a1gm = Set.elementOf{-rg7,p-} ta16K d.Ord_a16W
-			 >>=_a1gl = PrelBase.>>={-811,p-} aa16H d.Monad_a16Y
-			 d.Monad_a170 = d.Monad_a16Y
-			 return_a1gk = PrelBase.return{-816,p-} aa16H d.Monad_a170
-			 zero_a1gj = PrelBase.zero{-810,p-} aa16H d.MonadZero_a172
-			 vertices_defining_a16b name_r7R flat_info_r7S
-						= [vertex_r7U |
-						       (vertex_r7U, names_defined_r7V, _, _) <- flat_info_r7S, name_r7R
-													       elementOf_a1gm names_defined_r7V]
-		     {- nonrec -}
-		     vertices_defining_a1gi =
-			 vertices_defining_r7P
-			     [ta165, Set.Set{-rg4,p-} ta168, ta169, PrelBase.[]{-3j,W-}, ta168]
-			     [d.Ord_a17P, d.MonadZero_a17Q]
-		     {- nonrec -}
-AbsBinds
-[ta18a, ta18b, ta18c]
-[]
-[([ta18b, ta18c, ta18a], mkVertices{-r6A,x-}, mkVertices_a187)]
-    mkVertices_a187 info_r7I
-		    = [vertex_r7K | (vertex_r7K, _, _, _) <- info_r7I]
-AbsBinds
-[ta18P]
-[d.Eq_a196]
-[([ta18P], isCyclic{-r6y,x-}, isCyclic_a18M)]
-    d.Eq_a19a = d.Eq_a196
-    d.Eq_a19b = d.Eq_a196
-    d.Eq_a198 =
-	PrelTup.$d9{-rDa,p-} [ta18P, ta18P] [d.Eq_a19a, d.Eq_a19b]
-    elem_a1go = PrelList.elem{-rDi,p-} (ta18P, ta18P) d.Eq_a198
-    isCyclic_a18M edges_r7r [v_r7s]
-		  = (v_r7s, v_r7s) elem_a1go edges_r7r
-    isCyclic_a18M edges_r7u vs_r7v = PrelBase.True{-5E,w-}{i}
-AbsBinds [ta1au] [d.Eq_a1aw] [([ta1au], dfs{-r6E,x-}, dfs_a19d)]
-    elem_a1gp = PrelList.elem{-rDi,p-} ta1au d.Eq_a1aw
-    dfs_a19d r_r7e (vs_r7f, ns_r7g) PrelBase.[]{-5i,w-}{i}
-	     = (vs_r7f, ns_r7g)
-    dfs_a19d r_r7i
-	     (vs_r7j, ns_r7k)
-	     (x_r7l PrelBase.:{-55,w-}{i} xs_r7m)
-	     | x_r7l elem_a1gp vs_r7j = dfs_a19d r_r7i (vs_r7j, ns_r7k) xs_r7m
-	     | PrelBase.otherwise{-818,p-}
-	     = dfs_a19d r_r7i
-			(vs'_r7o,
-			 ++_a1g7 ta1au (PrelBase.:{-55,w-}{i} ta1au x_r7l ns'_r7p) ns_r7k)
-			xs_r7m
-	     where
-		 {- nonrec -}
-		 AbsBinds [] [] [([], vs'_r7o, vs'_a19Z), ([], ns'_r7p, ns'_a1a0)]
-		     (vs'_a19Z, ns'_a1a0)
-			 = dfs_a19d r_r7i
-				    (PrelBase.:{-55,w-}{i} ta1au x_r7l vs_r7j,
-				     PrelBase.[]{-5i,w-}{i} ta1au)
-				    r_r7i x_r7l
-		 {- nonrec -}
-		 {- nonrec -}
-AbsBinds
-[ta1aG]
-[d.Eq_a1dR]
-[([ta1aG], stronglyConnComp{-r6x,x-}, stronglyConnComp_a1aD)]
-    d.Eq_a1dP = d.Eq_a1dR
-    d.Eq_a1dM = d.Eq_a1dR
-    d.Eq_a1dT = d.Eq_a1dR
-    dfs_a1gq = dfs{-r6E,x-} ta1aG d.Eq_a1dT
-    d.Eq_a1dN = d.Eq_a1dR
-    stronglyConnComp_a1aD es_r6H vs_r6I
-			  = PrelTup.snd{-rDg,p-}
-				[[ta1aG], [[ta1aG]]] span_tree_a1gr new_range_a1gt reversed_edges_r6K
-								    (PrelBase.[]{-5i,w-}{i} ta1aG,
-								     PrelBase.[]{-5i,w-}{i} [ta1aG])
-								    PrelTup.snd{-rDg,p-}
-									[[ta1aG], [ta1aG]] dfs_a1gq new_range_a1gs es_r6H
-												    (PrelBase.[]{-5i,w-}{i}
-													 ta1aG,
-												     PrelBase.[]{-5i,w-}{i}
-													 ta1aG)
-												    vs_r6I
-			  where
-			      {- rec -}
-			      AbsBinds
-			      [ta1bV]
-			      [d.Eq_a1bX]
-			      [([ta1bV], span_tree_r6N, span_tree_a1aK)]
-				  elem_a1gv = PrelList.elem{-rDi,p-} ta1bV d.Eq_a1bX
-				  d.Eq_a1bZ = d.Eq_a1bX
-				  dfs_a1gu = dfs{-r6E,x-} ta1bV d.Eq_a1bZ
-				  span_tree_a1aK r_r71 (vs_r72, ns_r73) PrelBase.[]{-5i,w-}{i}
-						 = (vs_r72, ns_r73)
-				  span_tree_a1aK r_r75
-						 (vs_r76, ns_r77)
-						 (x_r78 PrelBase.:{-55,w-}{i} xs_r79)
-						 | x_r78 elem_a1gv vs_r76
-						 = span_tree_a1aK r_r75 (vs_r76, ns_r77) xs_r79
-						 | PrelBase.otherwise{-818,p-}
-						 = span_tree_a1aK r_r75
-								  (vs'_r7b,
-								   PrelBase.:{-55,w-}{i} [ta1bV]
-								       (PrelBase.:{-55,w-}{i} ta1bV
-									    x_r78 ns'_r7c)
-								       ns_r77)
-								  xs_r79
-						 where
-						     {- nonrec -}
-						     AbsBinds
-						     []
-						     []
-						     [([], vs'_r7b, vs'_a1bw), ([],
-										ns'_r7c,
-										ns'_a1bx)]
-							 (vs'_a1bw, ns'_a1bx)
-							     = dfs_a1gu r_r75
-									(PrelBase.:{-55,w-}{i} ta1bV
-									     x_r78 vs_r76,
-									 PrelBase.[]{-5i,w-}{i}
-									     ta1bV)
-									r_r75 x_r78
-						     {- nonrec -}
-						     {- nonrec -}
-			      {- nonrec -}
-			      span_tree_a1gr = span_tree_r6N ta1aG d.Eq_a1dP
-			      {- nonrec -}
-			      {- rec -}
-			      AbsBinds
-			      [ta1cx, ta1cA]
-			      [d.Eq_a1cC]
-			      [([ta1cx, ta1cA], new_range_r6M, new_range_a1c1)]
-				  ==_a1gw = PrelBase.=={-8Y,p-} ta1cx d.Eq_a1cC
-				  new_range_a1c1 PrelBase.[]{-5i,w-}{i} w_r6U
-						 = PrelBase.[]{-5i,w-}{i} ta1cA
-				  new_range_a1c1 ((x_r6W, y_r6X) PrelBase.:{-55,w-}{i} xys_r6Y)
-						 w_r6Z
-						 = if x_r6W ==_a1gw w_r6Z then
-						       PrelBase.:{-55,w-}{i} ta1cA
-							   y_r6X (new_range_a1c1 xys_r6Y w_r6Z)
-						   else
-						       new_range_a1c1 xys_r6Y w_r6Z
-			      {- nonrec -}
-			      new_range_a1gt = new_range_r6M [ta1aG, ta1aG] d.Eq_a1dM
-			      new_range_a1gs = new_range_r6M [ta1aG, ta1aG] d.Eq_a1dN
-			      {- nonrec -}
-			      {- nonrec -}
-			      AbsBinds [ta1cR] [] [([ta1cR], swap_r6L, swap_a1cI)]
-				  swap_a1cI (x_r6R, y_r6S) = (y_r6S, x_r6R)
-			      {- nonrec -}
-			      {- nonrec -}
-			      {- nonrec -}
-			      AbsBinds [] [] [([], reversed_edges_r6K, reversed_edges_a1cU)]
-				  reversed_edges_a1cU
-				      = map_a1g8 [Edge{-r8x,x-} ta1aG, Edge{-r8x,x-} ta1aG] swap_r6L
-												ta1aG
-											    es_r6H
-			      {- nonrec -}
-			      {- nonrec -}
-AbsBinds
-[ta1e4]
-[d.Eq_a1eX]
-[([ta1e4], topSort{-r6z,x-}, topSort_a1e1)]
-    d.Eq_a1f5 = d.Eq_a1eX
-    isCyclic_a1gy = isCyclic{-r6y,x-} ta1e4 d.Eq_a1f5
-    d.Eq_a1f7 = d.Eq_a1eX
-    stronglyConnComp_a1gx = stronglyConnComp{-r6x,x-} ta1e4 d.Eq_a1f7
-    topSort_a1e1 edges_r7x vertices_r7y
-		 = case cycles_r7B of
-		     PrelBase.[]{-5i,w-}{i}
-		     -> Succeeded{-rd,x-}{i} [[ta1e4], [[ta1e4]]] [v_r7F |
-								       [v_r7F] <- singletons_r7C]
-		     _ -> Failed{-rc,x-}{i} [[ta1e4], [[ta1e4]]] cycles_r7B
-		 where
-		     {- nonrec -}
-		     AbsBinds [] [] [([], sccs_r7A, sccs_a1e8)]
-			 sccs_a1e8 = stronglyConnComp_a1gx edges_r7x vertices_r7y
-		     {- nonrec -}
-		     {- nonrec -}
-		     {- nonrec -}
-		     AbsBinds
-		     []
-		     []
-		     [([], cycles_r7B, cycles_a1ef), ([],
-						      singletons_r7C,
-						      singletons_a1eg)]
-			 (cycles_a1ef, singletons_a1eg)
-			     = List.partition{-rhs,p-} [ta1e4] isCyclic_a1gy edges_r7x sccs_r7A
-		     {- nonrec -}
-		     {- nonrec -}
-AbsBinds [ta1fd] [] [([ta1fd], mkDigraph{-r6F,x-}, mkDigraph_a1f9)]
-    mkDigraph_a1f9 = MkDigraph{-r8y,x-}{i} ta1fd
-AbsBinds
-[ta1fI, ta1fJ]
-[]
-[([ta1fI, ta1fJ], $d1{-r1gg,x-}, d.Eval_a1fk)]
-    d.Eval_a1fk = ({-dict-} [] [])
-AbsBinds [ta1fK] [] [([ta1fK], $d2{-r1gf,x-}, d.Eval_a1fq)]
-    d.Eval_a1fq = ({-dict-} [] [])
-d.Monad_a1fs = PrelBase.$d25{-ri4,p-}
->>=_a1gb = PrelBase.>>={-811,p-} PrelBase.[]{-3j,W-} d.Monad_a1fs
-d.Monad_a1fv = d.Monad_a1fs
-return_a1ga =
-    PrelBase.return{-816,p-} PrelBase.[]{-3j,W-} d.Monad_a1fv
-d.MonadZero_a1fx = PrelBase.$d24{-ri3,p-}
-zero_a1g9 =
-    PrelBase.zero{-810,p-} PrelBase.[]{-3j,W-} d.MonadZero_a1fx
-d.Functor_a1fA = PrelBase.$d26{-ri5,p-}
-map_a1g8 = PrelBase.map{-rn5,p-} PrelBase.[]{-3j,W-} d.Functor_a1fA
-d.MonadPlus_a1fD = PrelBase.$d23{-ri2,p-}
-++_a1g7 = PrelBase.++{-rn8,p-} PrelBase.[]{-3j,W-} d.MonadPlus_a1fD
->>=_a1g6 = >>=_a1gb
-return_a1g5 = return_a1ga
->>=_a1g4 = >>=_a1gb
-return_a1g3 = return_a1ga
->>=_a1g2 = >>=_a1gb
-return_a1g1 = return_a1ga
-zero_a1g0 = zero_a1g9
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc066.stderr b/ghc/tests/typecheck/should_compile/tc066.stderr
index de6ee30c6f1fe004da276cc1270ca24315c5bc43..e5a0b63e6f4f36425c7deb9578e87afa7e958dcf 100644
--- a/ghc/tests/typecheck/should_compile/tc066.stderr
+++ b/ghc/tests/typecheck/should_compile/tc066.stderr
@@ -1,18 +1,3 @@
-==================== Typechecked ====================
-MkPair{-r3n,x-}{i} =
-    _/\_ a_tr3k b_tr3l -> \ tpl_B1 tpl_B2 ->
-	MkPair{-r3n,x-}{i} {_@_ a_tr3k _@_ b_tr3l tpl_B1 tpl_B2}
-AbsBinds
-[taC8, taCb, aaCc]
-[d.Monad_aCn]
-[([taC8, taCb, aaCc], f{-r3m,x-}, f_aBU)]
-    >>=_aCD = PrelBase.>>={-811,p-} aaCc d.Monad_aCn
-    d.Monad_aCp = d.Monad_aCn
-    return_aCC = PrelBase.return{-816,p-} aaCc d.Monad_aCp
-    f_aBU x_r3f = [a_r3i | (MkPair{-r3n,x-}{i} c_r3h a_r3i) <- x_r3f]
-AbsBinds [taCA, taCB] [] [([taCA, taCB], $d1{-rCG,x-}, d.Eval_aCw)]
-    d.Eval_aCw = ({-dict-} [] [])
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc067.stderr b/ghc/tests/typecheck/should_compile/tc067.stderr
index 5cd3904561ff449dfd09b4745dd0aea7ba9a1ef0..173dc29de818a768f5598d3882388c0a16b1b02c 100644
--- a/ghc/tests/typecheck/should_compile/tc067.stderr
+++ b/ghc/tests/typecheck/should_compile/tc067.stderr
@@ -1,9 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [takQ] [] [([takQ], f{-r3g,x-}, f_aky)]
-    f_aky PrelBase.[]{-5i,w-}{i} = PrelBase.[]{-5i,w-}{i} takQ
-    f_aky (x_r3e PrelBase.:{-55,w-}{i} xs_r3f)
-	  = PrelBase.:{-55,w-}{i} takQ x_r3e (f_aky xs_r3f)
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc068.stderr b/ghc/tests/typecheck/should_compile/tc068.stderr
index 3119bd8be1bf1587095ac49d671e85407d6fd141..9ef579963c6aa58d345f8821c8370a9e5dba2e7f 100644
--- a/ghc/tests/typecheck/should_compile/tc068.stderr
+++ b/ghc/tests/typecheck/should_compile/tc068.stderr
@@ -1,40 +1,3 @@
-==================== Typechecked ====================
-X{-r9,x-}{i} = _/\_ b_tr3U -> X{-r9,x-}{i} {_@_ b_tr3U}
-Y{-r8,x-}{i} =
-    _/\_ b_tr3U -> \ tpl_B1 -> Y{-r8,x-}{i} {_@_ b_tr3U tpl_B1}
-D{-r7,x-}{i} =
-    _/\_ a_tr3W -> \ tpl_B1 -> D{-r7,x-}{i} {_@_ a_tr3W tpl_B1}
-C{-r6,x-}{i} = _/\_ a_tr3W -> C{-r6,x-}{i} {_@_ a_tr3W}
-AbsBinds [taDI] [] [([taDI], $d3{-rDM,x-}, d.Eval_aC3)]
-    d.Eval_aC3 = ({-dict-} [] [])
-AbsBinds [taDJ] [] [([taDJ], $d4{-rDQ,x-}, d.Eval_aC9)]
-    d.Eval_aC9 = ({-dict-} [] [])
-AbsBinds [taCm] [d.Eq_aCP] [([taCm], $d1{-rDO,x-}, d.Eq_aCf)]
-    d.Eq_aCT = d.Eq_aCP
-    ==_aDU = PrelBase.=={-8Y,p-} taCm d.Eq_aCT
-    ==_aDT = ==_aDS
-    AbsBinds [] [] [([], ==_aDS, ==_aCj)]
-	==_aCj X{-r9,x-}{i} X{-r9,x-}{i} = PrelBase.True{-5E,w-}{i}
-	==_aCj (Y{-r8,x-}{i} a_r3r) (Y{-r8,x-}{i} b_r3s)
-	       = a_r3r ==_aDU b_r3s
-	==_aCj a_r3u b_r3v = PrelBase.False{-58,w-}{i}
-    AbsBinds [] [] [([], /=_aDR, /=_aCI)]
-	/=_aCI a_r3z b_r3A = PrelBase.not{-rgM,p-} a_r3z ==_aDT b_r3A
-    d.Eq_aCf = ({-dict-} [] [==_aDS, /=_aDR])
-AbsBinds [taD9] [d.Eq_aDA] [([taD9], $d2{-rDN,x-}, d.Eq_aD0)]
-    d.Eq_aDG = d.Eq_aDA
-    d.Eq_aDE = $d1{-rDO,x-} taD9 d.Eq_aDG
-    ==_aDY = PrelBase.=={-8Y,p-} (B{-r3X,x-} taD9) d.Eq_aDE
-    ==_aDX = ==_aDW
-    AbsBinds [] [] [([], ==_aDW, ==_aD4)]
-	==_aD4 (D{-r7,x-}{i} x_r3H) (D{-r7,x-}{i} y_r3I)
-	       = x_r3H ==_aDY y_r3I
-	==_aD4 C{-r6,x-}{i} C{-r6,x-}{i} = PrelBase.True{-5E,w-}{i}
-	==_aD4 a_r3L b_r3M = PrelBase.False{-58,w-}{i}
-    AbsBinds [] [] [([], /=_aDV, /=_aDt)]
-	/=_aDt a_r3Q b_r3R = PrelBase.not{-rgM,p-} a_r3Q ==_aDX b_r3R
-    d.Eq_aD0 = ({-dict-} [] [==_aDW, /=_aDV])
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc069.stderr b/ghc/tests/typecheck/should_compile/tc069.stderr
index 76d6a58f73c9c52ce52c92d8135e359d0b46c733..a02c45dee52693fbdb2ecf4523a7fd5625d1176f 100644
--- a/ghc/tests/typecheck/should_compile/tc069.stderr
+++ b/ghc/tests/typecheck/should_compile/tc069.stderr
@@ -1,16 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [] [] [([], x{-r3i,x-}, x_akA)]
-    x_akA = 'a'
-AbsBinds [] [] [([], y{-r3h,x-}, y_akD), ([], ys{-r3g,x-}, ys_akE)]
-    (y_akD PrelBase.:{-55,w-}{i} ys_akE)
-	= ['a', 'b', 'c'] (PrelBase.Char{-38,W-})
-	where
-	    {- nonrec -}
-	    AbsBinds [] [] [([], p_r3f, p_akM)]
-		p_akM = x{-r3i,x-}
-	    {- nonrec -}
-	    {- nonrec -}
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc070.stderr b/ghc/tests/typecheck/should_compile/tc070.stderr
index 553a999532f810b0961c0fbd530354a8f0812775..dd1d098a095e104c8b4bc3cf566e15bf2283c700 100644
--- a/ghc/tests/typecheck/should_compile/tc070.stderr
+++ b/ghc/tests/typecheck/should_compile/tc070.stderr
@@ -1,11 +1,3 @@
-==================== Typechecked ====================
-FF{-r5,x-}{i} = FF{-r5,x-}{i} {}
-TT{-r4,x-}{i} = TT{-r4,x-}{i} {}
-AbsBinds [] [] [([], idb{-r6,x-}, idb_aB2)]
-    idb_aB2 x_r3k = x_r3k
-AbsBinds [] [] [([], $d1{-rBc,x-}, d.Eval_aB9)]
-    d.Eval_aB9 = ({-dict-} [] [])
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc073.stderr b/ghc/tests/typecheck/should_compile/tc073.stderr
index 5cd3904561ff449dfd09b4745dd0aea7ba9a1ef0..173dc29de818a768f5598d3882388c0a16b1b02c 100644
--- a/ghc/tests/typecheck/should_compile/tc073.stderr
+++ b/ghc/tests/typecheck/should_compile/tc073.stderr
@@ -1,9 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [takQ] [] [([takQ], f{-r3g,x-}, f_aky)]
-    f_aky PrelBase.[]{-5i,w-}{i} = PrelBase.[]{-5i,w-}{i} takQ
-    f_aky (x_r3e PrelBase.:{-55,w-}{i} xs_r3f)
-	  = PrelBase.:{-55,w-}{i} takQ x_r3e (f_aky xs_r3f)
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc074.stderr b/ghc/tests/typecheck/should_compile/tc074.stderr
index 3119bd8be1bf1587095ac49d671e85407d6fd141..9ef579963c6aa58d345f8821c8370a9e5dba2e7f 100644
--- a/ghc/tests/typecheck/should_compile/tc074.stderr
+++ b/ghc/tests/typecheck/should_compile/tc074.stderr
@@ -1,40 +1,3 @@
-==================== Typechecked ====================
-X{-r9,x-}{i} = _/\_ b_tr3U -> X{-r9,x-}{i} {_@_ b_tr3U}
-Y{-r8,x-}{i} =
-    _/\_ b_tr3U -> \ tpl_B1 -> Y{-r8,x-}{i} {_@_ b_tr3U tpl_B1}
-D{-r7,x-}{i} =
-    _/\_ a_tr3W -> \ tpl_B1 -> D{-r7,x-}{i} {_@_ a_tr3W tpl_B1}
-C{-r6,x-}{i} = _/\_ a_tr3W -> C{-r6,x-}{i} {_@_ a_tr3W}
-AbsBinds [taDI] [] [([taDI], $d3{-rDM,x-}, d.Eval_aC3)]
-    d.Eval_aC3 = ({-dict-} [] [])
-AbsBinds [taDJ] [] [([taDJ], $d4{-rDQ,x-}, d.Eval_aC9)]
-    d.Eval_aC9 = ({-dict-} [] [])
-AbsBinds [taCm] [d.Eq_aCP] [([taCm], $d1{-rDO,x-}, d.Eq_aCf)]
-    d.Eq_aCT = d.Eq_aCP
-    ==_aDU = PrelBase.=={-8Y,p-} taCm d.Eq_aCT
-    ==_aDT = ==_aDS
-    AbsBinds [] [] [([], ==_aDS, ==_aCj)]
-	==_aCj X{-r9,x-}{i} X{-r9,x-}{i} = PrelBase.True{-5E,w-}{i}
-	==_aCj (Y{-r8,x-}{i} a_r3r) (Y{-r8,x-}{i} b_r3s)
-	       = a_r3r ==_aDU b_r3s
-	==_aCj a_r3u b_r3v = PrelBase.False{-58,w-}{i}
-    AbsBinds [] [] [([], /=_aDR, /=_aCI)]
-	/=_aCI a_r3z b_r3A = PrelBase.not{-rgM,p-} a_r3z ==_aDT b_r3A
-    d.Eq_aCf = ({-dict-} [] [==_aDS, /=_aDR])
-AbsBinds [taD9] [d.Eq_aDA] [([taD9], $d2{-rDN,x-}, d.Eq_aD0)]
-    d.Eq_aDG = d.Eq_aDA
-    d.Eq_aDE = $d1{-rDO,x-} taD9 d.Eq_aDG
-    ==_aDY = PrelBase.=={-8Y,p-} (B{-r3X,x-} taD9) d.Eq_aDE
-    ==_aDX = ==_aDW
-    AbsBinds [] [] [([], ==_aDW, ==_aD4)]
-	==_aD4 (D{-r7,x-}{i} x_r3H) (D{-r7,x-}{i} y_r3I)
-	       = x_r3H ==_aDY y_r3I
-	==_aD4 C{-r6,x-}{i} C{-r6,x-}{i} = PrelBase.True{-5E,w-}{i}
-	==_aD4 a_r3L b_r3M = PrelBase.False{-58,w-}{i}
-    AbsBinds [] [] [([], /=_aDV, /=_aDt)]
-	/=_aDt a_r3Q b_r3R = PrelBase.not{-rgM,p-} a_r3Q ==_aDX b_r3R
-    d.Eq_aD0 = ({-dict-} [] [==_aDW, /=_aDV])
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc076.stderr b/ghc/tests/typecheck/should_compile/tc076.stderr
index c7b80eb3860ca72cc226239b50c4818af5d06221..2ac809c494cca774f43477801388b706c15f9914 100644
--- a/ghc/tests/typecheck/should_compile/tc076.stderr
+++ b/ghc/tests/typecheck/should_compile/tc076.stderr
@@ -1,15 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [] [] [([], x{-r3,x-}, x_aBt)]
-    x_aBt
-	= [[PrelBase.True{-5E,w-}{i}] (PrelBase.Bool{-34,W-})] ([PrelBase.Bool{-34,W-}])
-AbsBinds [] [] [([], xs{-r2,x-}, xs_aBB)]
-    xs_aBB = [x_r3j | x_r3h <- x{-r3,x-}, x_r3j <- x_r3h]
-d.Monad_aBT = PrelBase.$d25{-rae,p-}
->>=_aC1 = PrelBase.>>={-811,p-} PrelBase.[]{-3j,W-} d.Monad_aBT
-d.Monad_aBW = d.Monad_aBT
-return_aC0 =
-    PrelBase.return{-816,p-} PrelBase.[]{-3j,W-} d.Monad_aBW
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc077.stderr b/ghc/tests/typecheck/should_compile/tc077.stderr
index 65ee5622287fe5ceae3e427872fcfce6556f67fc..68caa3a404e95c3b1484ec5ae2116f3dd2479e50 100644
--- a/ghc/tests/typecheck/should_compile/tc077.stderr
+++ b/ghc/tests/typecheck/should_compile/tc077.stderr
@@ -1,24 +1,3 @@
-==================== Typechecked ====================
-ONE{-r7,x-}{i} = ONE{-r7,x-}{i} {}
-TWO{-r6,x-}{i} = TWO{-r6,x-}{i} {}
-AbsBinds [] [] [([], $d1{-rCy,x-}, d.Eval_aCn)]
-    d.Eval_aCn = ({-dict-} [] [])
-scsel_EQShouldSucceedORD{-aCB,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,,){-63,w-}{i} tpl_B1 tpl_B2 tpl_B3  ->
-	tpl_B1;}
-scsel_EQPrelBaseShow{-aCA,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,,){-63,w-}{i} tpl_B1 tpl_B2 tpl_B3  ->
-	tpl_B2;}
-==={-r3p,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,,){-63,w-}{i} tpl_B1 tpl_B2 tpl_B3  ->
-	tpl_B3;}
-AbsBinds [taCu] [d.EQ_aCq] []
-scsel_ORDPrelBaseNum{-aCz,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taCv] [d.ORD_aCt] []
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc078.stderr b/ghc/tests/typecheck/should_compile/tc078.stderr
index 74bf30f48ffcc022551218c8bf4a5d75501ebab5..e6f115fa51c04c9e6bf7b987e4f9d22c4057e959 100644
--- a/ghc/tests/typecheck/should_compile/tc078.stderr
+++ b/ghc/tests/typecheck/should_compile/tc078.stderr
@@ -1,63 +1,6 @@
  
 tc078.hs:7: No explicit method nor default method for `PrelBase.=='
 	    in an instance declaration for `PrelBase.Eq'
-==================== Typechecked ====================
-MkBar{-r3l,x-}{i} =
-    _/\_ a_tr3k -> \ tpl_B1 tpl_B2 ->
-	MkBar{-r3l,x-}{i} {_@_ a_tr3k tpl_B1 tpl_B2}
-AbsBinds [taDL] [] [([taDL], $d3{-rDP,x-}, d.Eval_aBP)]
-    d.Eval_aBP = ({-dict-} [] [])
-AbsBinds
-[taC3]
-[d.Ord_aCW, d.Eq_aCX]
-[([taC3], $d1{-rDR,x-}, d.Ord_aBV)]
-    d.Eq_aCY = d.Eq_aCX
-    d.Ord_aD2 = d.Ord_aBV
-    $mcompare_aE5 =
-	PrelBase.$mcompare{-rf4,p-} (Bar{-r3m,x-} taC3) d.Ord_aD2
-    d.Ord_aD4 = d.Ord_aBV
-    $m<_aE4 = PrelBase.$m<{-reZ,p-} (Bar{-r3m,x-} taC3) d.Ord_aD4
-    d.Ord_aD6 = d.Ord_aBV
-    $m<=_aE3 = PrelBase.$m<={-rf0,p-} (Bar{-r3m,x-} taC3) d.Ord_aD6
-    d.Ord_aD8 = d.Ord_aBV
-    $m>=_aE2 = PrelBase.$m>={-rf2,p-} (Bar{-r3m,x-} taC3) d.Ord_aD8
-    d.Ord_aDa = d.Ord_aBV
-    $m>_aE1 = PrelBase.$m>{-rf1,p-} (Bar{-r3m,x-} taC3) d.Ord_aDa
-    d.Ord_aDc = d.Ord_aBV
-    $mmax_aE0 = PrelBase.$mmax{-rf8,p-} (Bar{-r3m,x-} taC3) d.Ord_aDc
-    d.Ord_aDe = d.Ord_aBV
-    $mmin_aDZ = PrelBase.$mmin{-rf9,p-} (Bar{-r3m,x-} taC3) d.Ord_aDe
-    AbsBinds [] [] [([], compare_aDY, compare_aC0)]
-	compare_aC0 = $mcompare_aE5
-    AbsBinds [] [] [([], <_aDX, <_aCa)]
-	<_aCa = $m<_aE4
-    AbsBinds [] [] [([], <=_aDW, <=_aCj)]
-	<=_aCj = $m<=_aE3
-    AbsBinds [] [] [([], >=_aDV, >=_aCs)]
-	>=_aCs = $m>=_aE2
-    AbsBinds [] [] [([], >_aDU, >_aCB)]
-	>_aCB = $m>_aE1
-    AbsBinds [] [] [([], max_aDT, max_aCK)]
-	max_aCK = $mmax_aE0
-    AbsBinds [] [] [([], min_aDS, min_aCT)]
-	min_aCT = $mmin_aDZ
-    d.Ord_aBV =
-	({-dict-}
-	 [d.Eq_aCY]
-	 [compare_aDY, <_aDX, <=_aDW, >=_aDV, >_aDU, max_aDT, min_aDS])
-AbsBinds [taDw] [d.Eq_aDF] [([taDw], $d2{-rDQ,x-}, d.Eq_aDo)]
-    d.Eq_aDJ = d.Eq_aDo
-    $m/=_aE8 = PrelBase.$m/={-reY,p-} (Bar{-r3m,x-} taDw) d.Eq_aDJ
-    AbsBinds [] [] [([], ==_aE7, ==_aDt)]
-	==_aDt
-	    = GHCerr.noDefaultMethodError{-8k,w-}
-		  (Bar{-r3m,x-} taDw
-		   -> Bar{-r3m,x-} taDw
-		   -> PrelBase.Bool{-34,W-}) "<NoSrcLoc>|PrelBase.=="
-    AbsBinds [] [] [([], /=_aE6, /=_aDC)]
-	/=_aDC = $m/=_aE8
-    d.Eq_aDo = ({-dict-} [] [==_aE7, /=_aE6])
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldFail 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc079.stderr b/ghc/tests/typecheck/should_compile/tc079.stderr
index 8e17caf7484816d199903bcd95be0d61796df7c3..d244cf4cfbc81bf060bb244d10f375d8bcffd3a7 100644
--- a/ghc/tests/typecheck/should_compile/tc079.stderr
+++ b/ghc/tests/typecheck/should_compile/tc079.stderr
@@ -1,53 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [taCa] [d.Foo_aCy] [([taCa], $d1{-rDY,x-}, d.Foo_aC0)]
-    d.Foo_aCA = d.Foo_aC0
-    $mop1_aE2 = $mop1{-rC3,x-} [taCa] d.Foo_aCA
-    d.Foo_aCC = d.Foo_aC0
-    $mop2_aE1 = $mop2{-rC7,x-} [taCa] d.Foo_aCC
-    AbsBinds [] [] [([], op1_aE0, op1_aC6)]
-	op1_aC6 = $mop1_aE2
-    AbsBinds [taCs] [d.Ord_aCv] [([taCs], op2_aDZ, op2_aCj)]
-	d.Ord_aCx = d.Ord_aCv
-	$mop2_aE6 = $mop2_aE1 taCs d.Ord_aCx
-	op2_aCj = $mop2_aE6
-    d.Foo_aC0 = ({-dict-} [] [op1_aE0, op2_aDZ])
-AbsBinds [] [] [([], $d2{-rE5,x-}, d.Foo_aCI)]
-    AbsBinds [] [] [([], op1_aE8, op1_aCN)]
-	op1_aCN = $mop1_aE4
-    AbsBinds [taD8] [d.Ord_aDb] [([taD8], op2_aE7, op2_aCZ)]
-	d.Ord_aDf = d.Ord_aDb
-	$mop2_aE9 = $mop2_aE3 taD8 d.Ord_aDf
-	op2_aCZ = $mop2_aE9
-    d.Foo_aCI = ({-dict-} [] [op1_aE8, op2_aE7])
-op1{-r3D,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-op2{-r3C,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds
-[taDq]
-[d.Foo_aDQ]
-[([taDq], $mop1{-rC3,x-}, op1_aEa), ([taDq],
-				     $mop2{-rC7,x-},
-				     op2_aEb)]
-    d.Foo_aDS = d.Foo_aDQ
-    op1_aEc = op1{-r3D,x-} taDq d.Foo_aDS
-    AbsBinds [] [] [([], op1_aEa, op1_aDn)]
-	op1_aDn x_r3u = PrelBase.True{-5E,w-}{i}
-    AbsBinds [taDC] [d.Ord_aDM] [([taDC], op2_aEb, op2_aDw)]
-	d.Ord_aDO = d.Ord_aDM
-	<_aEd = PrelBase.<{-rfI,p-} taDC d.Ord_aDO
-	op2_aDw x_r3y y_r3z z_r3A
-		= if (op1_aEc x_r3y) PrelBase.&&{-r3B,p-} (y_r3z <_aEd z_r3A) then
-		      y_r3z
-		  else
-		      z_r3A
-d.Foo_aDU = $d2{-rE5,x-}
-$mop1_aE4 = $mop1{-rC3,x-} PrelBase.Int{-3g,W-} d.Foo_aDU
-d.Foo_aDX = d.Foo_aDU
-$mop2_aE3 = $mop2{-rC7,x-} PrelBase.Int{-3g,W-} d.Foo_aDX
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc080.stderr b/ghc/tests/typecheck/should_compile/tc080.stderr
index d42fdbb95ba1e0510bfac27a1dbb4cc0b6e4d98d..cf70ed48460e7cafa099987ad8c091307bdf57c1 100644
--- a/ghc/tests/typecheck/should_compile/tc080.stderr
+++ b/ghc/tests/typecheck/should_compile/tc080.stderr
@@ -1,305 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [] [] [([], charToInt{-r3R,x-}, charToInt_aZI)]
-    charToInt_aZI x_r4E
-		  = (PrelBase.ord{-riq,p-} x_r4E) -_a1a9 (PrelBase.ord{-riq,p-} '0')
-AbsBinds [] [] [([], strToInt{-r3Q,x-}, strToInt_aZQ)]
-    d.Integral_a10U = PrelNum.$d36{-rI6,p-}
-    strToInt_aZQ x_r4v
-		 = strToInt'_a1am (PrelList.length{-rz0,p-}
-				       PrelBase.Char{-38,W-} x_r4v)
-				  -_a1af lit_a1ae
-				  x_r4v
-		 where
-		     {- rec -}
-		     AbsBinds
-		     [ta10t]
-		     [d.Integral_a10D]
-		     [([ta10t], strToInt'_r4x, strToInt'_aZT)]
-			 d.Real_a19W =
-			     PrelNum.scsel_IntegralPrelNumReal{-a1ar,p-} ta10t d.Integral_a10D
-			 d.Num_a10G =
-			     PrelNum.scsel_RealPrelBaseNum{-a1as,p-} ta10t d.Real_a19W
-			 d.Num_a10C = PrelBase.$d4{-rcO,p-}
-			 ^_a1aq =
-			     PrelNum.^{-rAz,p-} [ta10t, PrelBase.Int{-3g,W-}]
-				 [d.Num_a10C, d.Integral_a10D]
-			 -_a1ap = PrelBase.-{-817,p-} ta10t d.Num_a10G
-			 d.Num_a10J = d.Num_a10G
-			 fromInt_a1ao = PrelBase.fromInt{-8R,p-} ta10t d.Num_a10J
-			 lit_a1an = fromInt_a1ao PrelBase.I#{-5b,w-}{i} 1#
-			 strToInt'_aZT _ PrelBase.[]{-5i,w-}{i} = lit_a1ad
-			 strToInt'_aZT x_r4A (a_r4B PrelBase.:{-55,w-}{i} l_r4C)
-				       = ((charToInt{-r3R,x-} a_r4B) *_a1ab (lit_a1aa ^_a1aq x_r4A))
-					 +_a1ac (strToInt'_aZT x_r4A -_a1ap lit_a1an l_r4C)
-		     {- nonrec -}
-		     strToInt'_a1am = strToInt'_r4x PrelBase.Int{-3g,W-} d.Integral_a10U
-		     {- nonrec -}
-AbsBinds [ta119] [] [([ta119], span'{-r3O,x-}, span'_a116)]
-    span'_a116 p_r49 PrelBase.[]{-5i,w-}{i}
-	       = (PrelBase.[]{-5i,w-}{i} ta119, PrelBase.[]{-5i,w-}{i} ta119)
-    span'_a116 p_r4b (x_r4c PrelBase.:{-55,w-}{i} xs'_r4d)
-	       | p_r4b x_r4c
-	       = fixLeak_r4f [[ta119], ta119] x_r4c
-					      span'{-r3O,x-} ta119 p_r4b xs'_r4d
-	       where
-		   {- nonrec -}
-		   AbsBinds
-		   [ta11N, ta11P]
-		   []
-		   [([ta11N, ta11P], fixLeak_r4f, fixLeak_a11p)]
-		       fixLeak_a11p x_r4h (xs_r4i, ys_r4j)
-				    = (PrelBase.:{-55,w-}{i} ta11P x_r4h xs_r4i, ys_r4j)
-		   {- nonrec -}
-		   {- nonrec -}
-    span'_a116 _ xs_r4l = (PrelBase.[]{-5i,w-}{i} ta119, xs_r4l)
-AbsBinds [] [] [([], lines'{-r3P,x-}, lines'_a125)]
-    lines'_a125 "" = PrelBase.[]{-5i,w-}{i} [PrelBase.Char{-38,W-}]
-    lines'_a125 s_r4o
-		= plumb_r4q span'{-r3O,x-} PrelBase.Char{-38,W-} /=_a1ag '\n' s_r4o
-		where
-		    {- nonrec -}
-		    AbsBinds [] [] [([], plumb_r4q, plumb_a12a)]
-			plumb_a12a (l_r4s, s'_r4t)
-				   = PrelBase.:{-55,w-}{i} [PrelBase.Char{-38,W-}]
-					 l_r4s
-					 (if PrelList.null{-rz6,p-}
-						 PrelBase.Char{-38,W-} s'_r4t then
-					      PrelBase.[]{-5i,w-}{i} [PrelBase.Char{-38,W-}]
-					  else
-					      lines'{-r3P,x-} PrelList.tail{-rzj,p-}
-								  PrelBase.Char{-38,W-} s'_r4t)
-		    {- nonrec -}
-		    {- nonrec -}
-AbsBinds [] [] [([], whiteSpace{-r3N,x-}, whiteSpace_a12H)]
-    whiteSpace_a12H
-	= PrelBase.dropWhile{-rhV,p-}
-	      PrelBase.Char{-38,W-} PrelBase.isSpace{-rig,p-}
-AbsBinds [] [] [([], seperatedBy{-r3M,x-}, seperatedBy_a12L)]
-    seperatedBy_a12L ch_r3W PrelBase.[]{-5i,w-}{i}
-		     = PrelBase.[]{-5i,w-}{i} PrelBase.String{-r5n,p-}
-    seperatedBy_a12L ch_r3Y xs_r3Z
-		     = twaddle_r41 ch_r3Y
-				   span'{-r3O,x-} PrelBase.Char{-38,W-} \ x_r47
-									  -> x_r47 /=_a1ai ch_r3Y
-									xs_r3Z
-		     where
-			 {- nonrec -}
-			 AbsBinds [] [] [([], twaddle_r41, twaddle_a12S)]
-			     twaddle_a12S ch_r43 (l_r44, (_ PrelBase.:{-55,w-}{i} r_r45))
-					  = PrelBase.:{-55,w-}{i} PrelBase.String{-r5n,p-}
-						l_r44 (seperatedBy{-r3M,x-} ch_r43 r_r45)
-			 {- nonrec -}
-			 {- nonrec -}
-AbsBinds
-[ta13L]
-[d.Parse_a158]
-[([ta13L], $d1{-r1al,x-}, d.Parse_a13z)]
-    d.Parse_a15c = d.Parse_a13z
-    $mparseFile_a1aC = $mparseFile{-r13C,x-} [ta13L] d.Parse_a15c
-    d.Parse_a15e = d.Parse_a13z
-    $mparseLine_a1aB = $mparseLine{-r13I,x-} [ta13L] d.Parse_a15e
-    d.Parse_a15i = d.Parse_a158
-    parseLine_a1aA = parseLine{-r4R,x-} ta13L d.Parse_a15i
-    d.Parse_a15o = d.Parse_a13z
-    $mparse_a1az = $mparse{-r13H,x-} [ta13L] d.Parse_a15o
-    d.Parse_a15q = d.Parse_a158
-    forced_a1ay = forced{-r5P,x-} ta13L d.Parse_a15q
-    AbsBinds [] [] [([], parseFile_a1ax, parseFile_a13F)]
-	parseFile_a13F = $mparseFile_a1aC
-    AbsBinds [] [] [([], parseLine_a1aw, parseLine_a13S)]
-	parseLine_a13S = $mparseLine_a1aB
-    AbsBinds [] [] [([], parseType_a1av, parseType_a140)]
-	parseType_a140 more_r4L
-		       = (map_a1a8 [PrelBase.String{-r5n,p-}, ta13L] parseLine_a1aA
-								     seperatedBy{-r3M,x-} ','
-											  ++_a1a7
-											      PrelBase.Char{-38,W-}
-											      l_r4N
-											      ",",
-			  out_r4O)
-		       where
-			   {- nonrec -}
-			   AbsBinds [] [] [([], l_r4N, l_a143), ([], out_r4O, out_a144)]
-			       (l_a143, (']' PrelBase.:{-55,w-}{i} out_a144))
-				   = span'{-r3O,x-} PrelBase.Char{-38,W-} \ x_r4Q
-									    -> x_r4Q /=_a1a6 ']'
-									  PrelList.tail{-rzj,p-}
-									      PrelBase.Char{-38,W-} more_r4L
-			   {- nonrec -}
-			   {- nonrec -}
-    AbsBinds [] [] [([], parse_a1au, parse_a14V)]
-	parse_a14V = $mparse_a1az
-    AbsBinds [] [] [([], forced_a1at, forced_a153)]
-	forced_a153 = PrelList.all{-rwP,p-} ta13L forced_a1ay
-    d.Parse_a13z =
-	({-dict-}
-	 []
-	 [parseFile_a1ax, parseLine_a1aw, parseType_a1av, parse_a1au, forced_a1at])
-AbsBinds [] [] [([], $d2{-r1ak,x-}, d.Parse_a15w)]
-    AbsBinds [] [] [([], parseFile_a1aH, parseFile_a15B)]
-	parseFile_a15B = $mparseFile_a1a5
-    AbsBinds [] [] [([], parseLine_a1aG, parseLine_a15L)]
-	parseLine_a15L = $mparseLine_a1a4
-    AbsBinds [] [] [([], parseType_a1aF, parseType_a15U)]
-	parseType_a15U (ch_r4Z PrelBase.:{-55,w-}{i} str_r50)
-		       = (ch_r4Z, str_r50)
-    AbsBinds [] [] [([], parse_a1aE, parse_a166)]
-	parse_a166 = $mparse_a1a3
-    AbsBinds [] [] [([], forced_a1aD, forced_a16f)]
-	forced_a16f n_r54 = PrelBase.True{-5E,w-}{i}
-    d.Parse_a15w =
-	({-dict-}
-	 []
-	 [parseFile_a1aH, parseLine_a1aG, parseType_a1aF, parse_a1aE, forced_a1aD])
-AbsBinds [] [] [([], $d3{-r1aj,x-}, d.Parse_a16s)]
-    AbsBinds [] [] [([], parseFile_a1aM, parseFile_a16x)]
-	parseFile_a16x = $mparseFile_a1a2
-    AbsBinds [] [] [([], parseLine_a1aL, parseLine_a16H)]
-	parseLine_a16H = $mparseLine_a1a1
-    AbsBinds [] [] [([], parseType_a1aK, parseType_a16Q)]
-	parseType_a16Q str_r5a
-		       = pl_r5c PrelBase.String{-r5n,p-} span'{-r3O,x-}
-							     PrelBase.Char{-38,W-} PrelBase.isDigit{-ria,p-}
-										   str_r5a
-		       where
-			   {- nonrec -}
-			   AbsBinds [ta17b] [] [([ta17b], pl_r5c, pl_a16T)]
-			       pl_a16T (l_r5e, r_r5f) = (strToInt{-r3Q,x-} l_r5e, r_r5f)
-			   {- nonrec -}
-			   {- nonrec -}
-    AbsBinds [] [] [([], parse_a1aJ, parse_a17k)]
-	parse_a17k = $mparse_a1a0
-    AbsBinds [] [] [([], forced_a1aI, forced_a17t)]
-	forced_a17t n_r5j
-		    | n_r5j >=_a19Z lit_a19Y = PrelBase.True{-5E,w-}{i}
-    d.Parse_a16s =
-	({-dict-}
-	 []
-	 [parseFile_a1aM, parseLine_a1aL, parseType_a1aK, parse_a1aJ, forced_a1aI])
-parseFile{-r5S,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case
-	    tpl_B1
-	of {
-	PrelTup.(,,,,){-65,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5  ->
-	tpl_B1;}
-parseLine{-r4R,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case
-	    tpl_B1
-	of {
-	PrelTup.(,,,,){-65,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5  ->
-	tpl_B2;}
-parseType{-r5R,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case
-	    tpl_B1
-	of {
-	PrelTup.(,,,,){-65,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5  ->
-	tpl_B3;}
-parse{-r5Q,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case
-	    tpl_B1
-	of {
-	PrelTup.(,,,,){-65,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5  ->
-	tpl_B4;}
-forced{-r5P,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case
-	    tpl_B1
-	of {
-	PrelTup.(,,,,){-65,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5  ->
-	tpl_B5;}
-AbsBinds
-[ta186]
-[d.Parse_a19b]
-[([ta186], $mparseFile{-r13C,x-}, parseFile_a1aN), ([ta186],
-						    $mparseLine{-r13I,x-},
-						    parseLine_a1aQ), ([ta186],
-								      $mparse{-r13H,x-},
-								      parse_a1aP), ([ta186],
-										    $mforced{-r13G,x-},
-										    forced_a1aO)]
-    d.Parse_a19d = d.Parse_a19b
-    forced_a1aU = forced{-r5P,x-} ta186 d.Parse_a19d
-    d.Parse_a19h = d.Parse_a19b
-    parseLine_a1aT = parseLine{-r4R,x-} ta186 d.Parse_a19h
-    d.Parse_a19j = d.Parse_a19b
-    parse_a1aS = parse{-r5Q,x-} ta186 d.Parse_a19j
-    d.Parse_a19l = d.Parse_a19b
-    parseType_a1aR = parseType{-r5R,x-} ta186 d.Parse_a19l
-    AbsBinds [] [] [([], parseFile_a1aN, parseFile_a17N)]
-	parseFile_a17N string_r5A
-		       | PrelList.all{-rwP,p-} ta186 forced_a1aU x_r5C = x_r5C
-		       where
-			   {- nonrec -}
-			   AbsBinds [] [] [([], x_r5C, x_a17Q)]
-			       x_a17Q
-				   = map_a19X [PrelBase.String{-r5n,p-}, ta186] parseLine_a1aT
-										lines'{-r3P,x-} string_r5A
-			   {- nonrec -}
-			   {- nonrec -}
-    AbsBinds [] [] [([], parseLine_a1aQ, parseLine_a18r)]
-	parseLine_a18r
-	    = PrelBase..{-rc2,p-}
-		  [(ta186, PrelBase.String{-r5n,p-}), PrelBase.String{-r5n,p-}, ta186]
-		  (pl_r5G [ta186, PrelBase.String{-r5n,p-}]) parse_a1aS
-	    where
-		{- nonrec -}
-		AbsBinds [ta18B, ta18E] [] [([ta18B, ta18E], pl_r5G, pl_a18q)]
-		    pl_a18q (a_r5I, _) = a_r5I
-		{- nonrec -}
-		{- nonrec -}
-    AbsBinds [] [] [([], parse_a1aP, parse_a18V)]
-	parse_a18V
-	    = PrelBase..{-rc2,p-}
-		  [PrelBase.String{-r5n,p-}, PrelBase.String{-r5n,p-}, (ta186, PrelBase.String{-r5n,p-})]
-		  parseType_a1aR whiteSpace{-r3N,x-}
-    AbsBinds [] [] [([], forced_a1aO, forced_a196)]
-	forced_a196 x_r5O = PrelBase.True{-5E,w-}{i}
-d.Eq_a19n = PrelBase.$d34{-rcI,p-}
-/=_a1ai = PrelBase./={-rhx,p-} PrelBase.Char{-38,W-} d.Eq_a19n
-d.Eq_a19s = d.Eq_a19n
-d.Eq_a19q = PrelBase.$d28{-rcB,p-} PrelBase.Char{-38,W-} d.Eq_a19s
-==_a1ah = PrelBase.=={-8Y,p-} [PrelBase.Char{-38,W-}] d.Eq_a19q
-/=_a1ag = /=_a1ai
-d.Num_a19u = PrelBase.$d4{-rcO,p-}
--_a1af = PrelBase.-{-817,p-} PrelBase.Int{-3g,W-} d.Num_a19u
-lit_a1ae = PrelBase.I#{-5b,w-}{i} 1#
-lit_a1ad = PrelBase.I#{-5b,w-}{i} 0#
-d.Num_a19x = d.Num_a19u
-+_a1ac = PrelBase.+{-rhC,p-} PrelBase.Int{-3g,W-} d.Num_a19x
-d.Num_a19z = d.Num_a19u
-*_a1ab = PrelBase.*{-rhD,p-} PrelBase.Int{-3g,W-} d.Num_a19z
-lit_a1aa = PrelBase.I#{-5b,w-}{i} 10#
--_a1a9 = -_a1af
-d.Functor_a19B = PrelBase.$d26{-rcz,p-}
-map_a1a8 = PrelBase.map{-rhy,p-} PrelBase.[]{-3j,W-} d.Functor_a19B
-d.MonadPlus_a19E = PrelBase.$d23{-rcw,p-}
-++_a1a7 = PrelBase.++{-rhB,p-} PrelBase.[]{-3j,W-} d.MonadPlus_a19E
-/=_a1a6 = /=_a1ai
-d.Parse_a19H = $d2{-r1ak,x-}
-$mparseFile_a1a5 =
-    $mparseFile{-r13C,x-} PrelBase.Char{-38,W-} d.Parse_a19H
-d.Parse_a19K = d.Parse_a19H
-$mparseLine_a1a4 =
-    $mparseLine{-r13I,x-} PrelBase.Char{-38,W-} d.Parse_a19K
-d.Parse_a19M = d.Parse_a19H
-$mparse_a1a3 = $mparse{-r13H,x-} PrelBase.Char{-38,W-} d.Parse_a19M
-d.Parse_a19O = $d3{-r1aj,x-}
-$mparseFile_a1a2 =
-    $mparseFile{-r13C,x-} PrelBase.Int{-3g,W-} d.Parse_a19O
-d.Parse_a19R = d.Parse_a19O
-$mparseLine_a1a1 =
-    $mparseLine{-r13I,x-} PrelBase.Int{-3g,W-} d.Parse_a19R
-d.Parse_a19T = d.Parse_a19O
-$mparse_a1a0 = $mparse{-r13H,x-} PrelBase.Int{-3g,W-} d.Parse_a19T
-d.Ord_a19V = PrelBase.$d7{-rda,p-}
->=_a19Z = PrelBase.>={-8Z,p-} PrelBase.Int{-3g,W-} d.Ord_a19V
-lit_a19Y = lit_a1ad
-map_a19X = map_a1a8
-
 
 NOTE: Simplifier still going after 4 iterations; bailing out.
 ghc: module version changed to 1; reason: no old .hi file
diff --git a/ghc/tests/typecheck/should_compile/tc081.stderr b/ghc/tests/typecheck/should_compile/tc081.stderr
index c27b315b8f2ba53dd389cebff3621de4be5b1077..49535310bbae1de14e832a167cb21326da670318 100644
--- a/ghc/tests/typecheck/should_compile/tc081.stderr
+++ b/ghc/tests/typecheck/should_compile/tc081.stderr
@@ -1,96 +1,3 @@
-==================== Typechecked ====================
-AbsBinds
-[taTE]
-[d.Num_aTM, d.Ord_aTR]
-[([taTE], f3{-r3A,x-}, f3_aT2)]
-    +_aVR = PrelBase.+{-rfD,p-} taTE d.Num_aTM
-    d.Num_aTP = d.Num_aTM
-    fromInt_aVQ = PrelBase.fromInt{-8R,p-} taTE d.Num_aTP
-    lit_aVP = fromInt_aVQ PrelBase.I#{-5b,w-}{i} 1#
-    <_aVO = PrelBase.<{-ra4,p-} taTE d.Ord_aTR
-    fromInt_aVN = fromInt_aVQ
-    lit_aVM = fromInt_aVN PrelBase.I#{-5b,w-}{i} 3#
-    d.Ord_aTU = d.Ord_aTR
-    >_aVL = PrelBase.>{-rfK,p-} taTE d.Ord_aTU
-    fromInt_aVK = fromInt_aVQ
-    lit_aVJ = fromInt_aVK PrelBase.I#{-5b,w-}{i} 2#
-    f3_aT2 x_r3t
-	   = (x_r3t +_aVR lit_aVP,
-	      x_r3t <_aVO lit_aVM,
-	      g3_r3v PrelBase.Bool{-34,W-} PrelBase.True{-5E,w-}{i},
-	      g3_r3v PrelBase.Char{-38,W-} 'c')
-	   where
-	       {- nonrec -}
-	       AbsBinds [taTi] [] [([taTi], g3_r3v, g3_aTc)]
-		   g3_aTc
-		       = \ y_r3x
-			   -> if x_r3t >_aVL lit_aVJ then
-				  PrelBase.[]{-5i,w-}{i} taTi
-			      else
-				  [y_r3x] (taTi)
-	       {- nonrec -}
-	       {- nonrec -}
-AbsBinds
-[taUx]
-[d.Num_aUF, d.Ord_aUK]
-[([taUx], f2{-r3B,x-}, f2_aTX)]
-    +_aW0 = PrelBase.+{-rfD,p-} taUx d.Num_aUF
-    d.Num_aUI = d.Num_aUF
-    fromInt_aVZ = PrelBase.fromInt{-8R,p-} taUx d.Num_aUI
-    lit_aVY = fromInt_aVZ PrelBase.I#{-5b,w-}{i} 1#
-    <_aVX = PrelBase.<{-ra4,p-} taUx d.Ord_aUK
-    fromInt_aVW = fromInt_aVZ
-    lit_aVV = fromInt_aVW PrelBase.I#{-5b,w-}{i} 3#
-    d.Ord_aUN = d.Ord_aUK
-    >_aVU = PrelBase.>{-rfK,p-} taUx d.Ord_aUN
-    fromInt_aVT = fromInt_aVZ
-    lit_aVS = fromInt_aVT PrelBase.I#{-5b,w-}{i} 2#
-    f2_aTX x_r3l
-	   = (x_r3l +_aW0 lit_aVY,
-	      x_r3l <_aVX lit_aVV,
-	      g2_r3n PrelBase.Bool{-34,W-} PrelBase.True{-5E,w-}{i},
-	      g2_r3n PrelBase.Char{-38,W-} 'c')
-	   where
-	       {- nonrec -}
-	       AbsBinds [taUc] [] [([taUc], g2_r3n, g2_aU9)]
-		   g2_aU9 y_r3r
-			  = if x_r3l >_aVU lit_aVS then
-				PrelBase.[]{-5i,w-}{i} taUc
-			    else
-				[y_r3r] (taUc)
-	       {- nonrec -}
-	       {- nonrec -}
-AbsBinds
-[taVs]
-[d.Num_aVA, d.Ord_aVF]
-[([taVs], f{-r3C,x-}, f_aUQ)]
-    +_aWa = PrelBase.+{-rfD,p-} taVs d.Num_aVA
-    d.Num_aVD = d.Num_aVA
-    fromInt_aW9 = PrelBase.fromInt{-8R,p-} taVs d.Num_aVD
-    lit_aW8 = fromInt_aW9 PrelBase.I#{-5b,w-}{i} 1#
-    <_aW7 = PrelBase.<{-ra4,p-} taVs d.Ord_aVF
-    fromInt_aW6 = fromInt_aW9
-    lit_aW5 = fromInt_aW6 PrelBase.I#{-5b,w-}{i} 3#
-    d.Ord_aVI = d.Ord_aVF
-    >_aW4 = PrelBase.>{-rfK,p-} taVs d.Ord_aVI
-    fromInt_aW3 = fromInt_aW9
-    lit_aW1 = fromInt_aW3 PrelBase.I#{-5b,w-}{i} 2#
-    f_aUQ x_r3f
-	  = (x_r3f +_aWa lit_aW8,
-	     x_r3f <_aW7 lit_aW5,
-	     g_r3h PrelBase.Bool{-34,W-} PrelBase.True{-5E,w-}{i},
-	     g_r3h PrelBase.Char{-38,W-} 'c')
-	  where
-	      {- nonrec -}
-	      AbsBinds [taVe] [] [([taVe], g_r3h, g_aV0)]
-		  g_aV0 y_r3j
-			= if x_r3f >_aW4 lit_aW1 then
-			      PrelBase.[]{-5i,w-}{i} taVe
-			  else
-			      [y_r3j] (taVe)
-	      {- nonrec -}
-	      {- nonrec -}
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc082.stderr b/ghc/tests/typecheck/should_compile/tc082.stderr
index f1046b91ed3f1011216cf344226f6441c8c38f56..0312fb689b7740df4f947f63aa050691d75fabfe 100644
--- a/ghc/tests/typecheck/should_compile/tc082.stderr
+++ b/ghc/tests/typecheck/should_compile/tc082.stderr
@@ -1,19 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [tarE] [] [([tarE], f{-r3p,x-}, f_arp)]
-    d.Normal_arG = $d1{-rs3,x-} [GHC.Void{-3T,W-}, GHC.Void{-3T,W-}]
-    normal_as2 =
-	normal{-r3q,x-} (GHC.Void{-3T,W-} -> GHC.Void{-3T,W-}) d.Normal_arG
-    f_arp x_r3f = normal_as2 PrelBase.id{-r9U,p-} GHC.Void{-3T,W-}
-AbsBinds
-[tarV, tarW]
-[]
-[([tarV, tarW], $d1{-rs3,x-}, d.Normal_arO)]
-    AbsBinds [] [] [([], normal_as4, normal_arS)]
-	normal_arS _ = PrelBase.True{-5E,w-}{i}
-    d.Normal_arO = ({-dict-} [] [normal_as4])
-normal{-r3q,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [tas1] [d.Normal_as0] []
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc084.stderr b/ghc/tests/typecheck/should_compile/tc084.stderr
index d75dc0d7405564d5259cc781ef01397a83a4bc2e..7746d8acfc2a138b8aaf5fe3e9e81f9e8f3ebb55 100644
--- a/ghc/tests/typecheck/should_compile/tc084.stderr
+++ b/ghc/tests/typecheck/should_compile/tc084.stderr
@@ -1,21 +1,3 @@
-==================== Typechecked ====================
-AbsBinds
-[taCf, taCi]
-[d.Num_aCq]
-[([taCi, taCf], g{-r3h,x-}, g_aCb)]
-    d.Num_aCs = d.Num_aCq
-    +_aD1 = PrelBase.+{-rfr,p-} taCf d.Num_aCs
-    d.Num_aCu = d.Num_aCq
-    -_aD0 = PrelBase.-{-817,p-} taCf d.Num_aCu
-    g_aCb b_r3l x_r3m y_r3n
-	  = if b_r3l then x_r3m +_aD1 x_r3m else x_r3m -_aD0 x_r3m
-AbsBinds [taCC] [] [([taCC], f{-r3j,x-}, f_aCw)]
-    g_aD2 = g{-r3h,x-} [taCC, PrelBase.Int{-3g,W-}] d.Num_aCH
-    f_aCw = g_aD2 PrelBase.True{-5E,w-}{i}
-AbsBinds [taCZ] [] [([taCZ], h{-r3i,x-}, h_aCJ)]
-    h_aCJ y_r3p x_r3q = f{-r3j,x-} taCZ x_r3q y_r3p
-d.Num_aCH = PrelBase.$d4{-raC,p-}
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc085.stderr b/ghc/tests/typecheck/should_compile/tc085.stderr
index 7c846d8af9d2440cd98f8b236c7cac1b05705816..9b49fecfe5835c49a6dc64ded813fffadafcb2aa 100644
--- a/ghc/tests/typecheck/should_compile/tc085.stderr
+++ b/ghc/tests/typecheck/should_compile/tc085.stderr
@@ -1,8 +1,3 @@
-==================== Typechecked ====================
-FooData{-r2,l-}{i} = FooData{-r2,l-}{i} {}
-AbsBinds [] [] [([], $d1{-rBz,x-}, d.Eval_aBw)]
-    d.Eval_aBw = ({-dict-} [] [])
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc086.stderr b/ghc/tests/typecheck/should_compile/tc086.stderr
index 6b83360252c91ddad8fcf8c3553a9c44b20cc3ae..116286b45d40966d49a49d1375431f070f140cbf 100644
--- a/ghc/tests/typecheck/should_compile/tc086.stderr
+++ b/ghc/tests/typecheck/should_compile/tc086.stderr
@@ -1,110 +1,3 @@
-==================== Typechecked ====================
-scsel_RingShouldSucceedGroup{-aFR,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-*{-r6w,l-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [taEd] [d.Ring_aFv] [([taEd], $m*{-rFS,x-}, *_aFT)]
-    d.Group_aFs = scsel_RingShouldSucceedGroup{-aFR,x-} taEd d.Ring_aFv
-    AbsBinds [] [] [([], *_aFT, *_aEa)]
-	*_aEa a_r6L b_r6M
-	      = multiply_aFW a_r6L b_r6M
-	      where
-		  {- rec -}
-		  AbsBinds
-		  [taEm]
-		  [d.Group_aFb]
-		  [([taEm], multiply_r6O, multiply_aEj)]
-		      d.Group_aFd = d.Group_aFb
-		      compare_aGa = compare{-r6D,l-} taEm d.Group_aFd
-		      d.Group_aFf = d.Group_aFb
-		      zero_aG9 = zero{-r6z,l-} taEm d.Group_aFf
-		      zero_aG8 = zero_aG9
-		      d.Group_aFh = d.Group_aFb
-		      -_aG7 = -{-r6A,l-} taEm d.Group_aFh
-		      zero_aG6 = zero_aG9
-		      d.Group_aFj = d.Group_aFb
-		      multiply_aG5 = multiply_r6O taEm d.Group_aFj
-		      -_aG4 = -_aG7
-		      zero_aG3 = zero_aG9
-		      compare_aG2 = compare_aGa
-		      d.Group_aFl = d.Group_aFb
-		      one_aG1 = one{-r6y,l-} taEm d.Group_aFl
-		      d.Group_aFn = d.Group_aFb
-		      +_aG0 = +{-r6B,l-} taEm d.Group_aFn
-		      multiply_aFZ = multiply_aG5
-		      -_aFY = -_aG7
-		      one_aFX = one_aG1
-		      multiply_aEj a_r6S b_r6T
-				   = case compare_aGa a_r6S zero_aG9 of
-				       PrelBase.EQ{-r5J,p-}{i} -> zero_aG8
-				       PrelBase.LT{-r5K,p-}{i}
-				       -> zero_aG6 -_aG7 (multiply_aG5 zero_aG3 -_aG4 a_r6S b_r6T)
-				       PrelBase.GT{-r5I,p-}{i}
-				       -> case compare_aG2 a_r6S one_aG1 of
-					    PrelBase.EQ{-r5J,p-}{i} -> b_r6T
-					    _
-					    -> b_r6T +_aG0 (multiply_aFZ a_r6S -_aFY one_aFX b_r6T)
-		  {- nonrec -}
-		  multiply_aFW = multiply_r6O taEd d.Group_aFs
-		  {- nonrec -}
-compare{-r6D,l-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case
-	    tpl_B1
-	of {
-	PrelTup.(,,,,,){-66,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5 tpl_B6  ->
-	tpl_B1;}
-fromInteger{-r6C,l-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case
-	    tpl_B1
-	of {
-	PrelTup.(,,,,,){-66,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5 tpl_B6  ->
-	tpl_B2;}
-+{-r6B,l-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case
-	    tpl_B1
-	of {
-	PrelTup.(,,,,,){-66,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5 tpl_B6  ->
-	tpl_B3;}
--{-r6A,l-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case
-	    tpl_B1
-	of {
-	PrelTup.(,,,,,){-66,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5 tpl_B6  ->
-	tpl_B4;}
-zero{-r6z,l-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case
-	    tpl_B1
-	of {
-	PrelTup.(,,,,,){-66,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5 tpl_B6  ->
-	tpl_B5;}
-one{-r6y,l-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case
-	    tpl_B1
-	of {
-	PrelTup.(,,,,,){-66,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5 tpl_B6  ->
-	tpl_B6;}
-AbsBinds
-[taFB]
-[d.Group_aFO]
-[([taFB], $mzero{-rFV,x-}, zero_aGb), ([taFB],
-				       $mone{-rFU,x-},
-				       one_aGc)]
-    d.Group_aFQ = d.Group_aFO
-    fromInteger_aGe = fromInteger{-r6C,l-} taFB d.Group_aFQ
-    fromInteger_aGd = fromInteger_aGe
-    AbsBinds [] [] [([], zero_aGb, zero_aFA)]
-	zero_aFA = fromInteger_aGe 0
-    AbsBinds [] [] [([], one_aGc, one_aFI)]
-	one_aFI = fromInteger_aGd 1
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc087.stderr b/ghc/tests/typecheck/should_compile/tc087.stderr
index bda588e665ebbed1d6db5d241e55a9482793101f..9fe3538fcc0cc7352198aea776b49c8ca14765d3 100644
--- a/ghc/tests/typecheck/should_compile/tc087.stderr
+++ b/ghc/tests/typecheck/should_compile/tc087.stderr
@@ -1,164 +1,3 @@
-==================== Typechecked ====================
-Null{-rf,x-}{i} =
-    _/\_ t_ar59 a_tr5a -> Null{-rf,x-}{i} {_@_ t_ar59 _@_ a_tr5a}
-Cons{-re,x-}{i} =
-    _/\_ t_ar59 a_tr5a -> \ tpl_B1 tpl_B2 ->
-	Cons{-re,x-}{i} {_@_ t_ar59 _@_ a_tr5a tpl_B1 tpl_B2}
-AbsBinds [ta13Q] [d.Num_a141] [([ta13Q], out{-r4v,x-}, out_a13N)]
-    d.Eq_a143 = PrelBase.scsel_NumPrelBaseEq{-a19j,p-} ta13Q d.Num_a141
-    ==_a18Z = PrelBase.=={-8Y,p-} ta13Q d.Eq_a143
-    d.Num_a145 = d.Num_a141
-    sum_a18Y = PrelList.sum{-ro0,p-} ta13Q d.Num_a145
-    d.Num_a148 = d.Num_a141
-    fromInt_a18X = PrelBase.fromInt{-8R,p-} ta13Q d.Num_a148
-    lit_a18W = fromInt_a18X PrelBase.I#{-5b,w-}{i} 0#
-    out_a13N x_r4O
-	     | (sum_a18Y x_r4O) ==_a18Z lit_a18W = PrelIO.putStr{-riO,p-} "ok\n"
-	     | PrelBase.otherwise{-818,p-} = PrelIO.putStr{-riO,p-} "ok\n"
-out_a19i = out{-r4v,x-} PrelBase.Int{-3g,W-} d.Num_a18w
-out_a19h = out{-r4v,x-} PrelBase.Double{-3a,W-} d.Num_a18x
-AbsBinds
-[ta14z, aa14A]
-[d.PriorityQueue_a14E, d.Ord_a14G]
-[([ta14z, aa14A], insertMany{-r4x,x-}, insertMany_a14b)]
-    insert_a14B = insert{-r5d,x-} aa14A d.PriorityQueue_a14E
-    insert_a19k = insert_a14B ta14z d.Ord_a14G
-    insertMany_a14b x_r4G q_r4H
-		    = PrelBase.foldr{-89,w-} [ta14z, aa14A ta14z] insert_a19k
-								  q_r4H
-								  x_r4G
-AbsBinds
-[aa15e, ta15g]
-[d.PriorityQueue_a15j, d.Ord_a15l]
-[([aa15e, ta15g], toOrderedList{-r4y,x-}, toOrderedList_a14I)]
-    splitMin_a15h = splitMin{-r5b,x-} aa15e d.PriorityQueue_a15j
-    splitMin_a19l = splitMin_a15h ta15g d.Ord_a15l
-    toOrderedList_a14I q_r4A
-		       = case splitMin_a19l q_r4A of
-			   Null{-rf,x-}{i} -> PrelBase.[]{-5i,w-}{i} ta15g
-			   (Cons{-re,x-}{i} a_r4D q_r4E)
-			   -> PrelBase.:{-55,w-}{i} ta15g a_r4D (toOrderedList_a14I q_r4E)
-AbsBinds
-[aa15J, ta15K]
-[d.PriorityQueue_a15N, d.Ord_a15O]
-[([aa15J, ta15K], pqSort{-r4w,x-}, pqSort_a15n)]
-    toOrderedList_a19n =
-	toOrderedList{-r4y,x-} [aa15J, ta15K]
-	    [d.PriorityQueue_a15N, d.Ord_a15O]
-    d.PriorityQueue_a15Q = d.PriorityQueue_a15N
-    d.Ord_a15R = d.Ord_a15O
-    insertMany_a19m =
-	insertMany{-r4x,x-} [ta15K, aa15J]
-	    [d.PriorityQueue_a15Q, d.Ord_a15R]
-    pqSort_a15n q_r4J x_r4K
-		= toOrderedList_a19n insertMany_a19m x_r4K q_r4J
-AbsBinds
-[aa164]
-[d.PriorityQueue_a16P]
-[([aa164], check{-r4u,x-}, check_a160)]
-    d.PriorityQueue_a17m = d.PriorityQueue_a16P
-    d.Ord_a17n = PrelBase.$d7{-rcM,p-}
-    pqSort_a19p =
-	pqSort{-r4w,x-} [aa164, PrelBase.Int{-3g,W-}]
-	    [d.PriorityQueue_a17m, d.Ord_a17n]
-    d.Ord_a16Q = d.Ord_a17n
-    d.PriorityQueue_a17u = d.PriorityQueue_a16P
-    d.Ord_a17v = PrelNum.$d17{-rwV,p-}
-    pqSort_a19o =
-	pqSort{-r4w,x-} [aa164, PrelBase.Double{-3a,W-}]
-	    [d.PriorityQueue_a17u, d.Ord_a17v]
-    d.Ord_a16R = d.Ord_a17v
-    check_a160 empty_r4M
-	       = do
-		   PrelIO.putStr{-riO,p-} "*** sorting\n"
-		   out_a19i pqSort_a19p empty_a19r
-					[(enumFromTo_a199) lit_a19b .. lit_a19a]
-		   out_a19h pqSort_a19o empty_a19q
-					[(enumFromThenTo_a192) lit_a197, lit_a195 .. lit_a193]
-	       where
-		   {- nonrec -}
-		   empty_a19r = empty_r4M PrelBase.Int{-3g,W-} d.Ord_a16Q
-		   empty_a19q = empty_r4M PrelBase.Double{-3a,W-} d.Ord_a16R
-		   {- nonrec -}
-AbsBinds
-[aa18R, ta18S]
-[]
-[([aa18R, ta18S], $d1{-r19g,x-}, d.Eval_a17O)]
-    d.Eval_a17O = ({-dict-} [] [])
-empty{-r5f,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case
-	    tpl_B1
-	of {
-	PrelTup.(,,,,){-65,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5  ->
-	tpl_B1;}
-single{-r5e,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case
-	    tpl_B1
-	of {
-	PrelTup.(,,,,){-65,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5  ->
-	tpl_B2;}
-insert{-r5d,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case
-	    tpl_B1
-	of {
-	PrelTup.(,,,,){-65,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5  ->
-	tpl_B3;}
-meld{-r5c,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case
-	    tpl_B1
-	of {
-	PrelTup.(,,,,){-65,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5  ->
-	tpl_B4;}
-splitMin{-r5b,x-} =
-    _/\_ t12 -> \ tpl_B1 ->
-	case
-	    tpl_B1
-	of {
-	PrelTup.(,,,,){-65,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5  ->
-	tpl_B5;}
-AbsBinds
-[aa17W]
-[d.PriorityQueue_a18r]
-[([aa17W], $minsert{-r19c,x-}, insert_a19s)]
-    d.PriorityQueue_a18t = d.PriorityQueue_a18r
-    meld_a18i = meld{-r5c,x-} aa17W d.PriorityQueue_a18t
-    d.PriorityQueue_a18v = d.PriorityQueue_a18r
-    single_a18h = single{-r5e,x-} aa17W d.PriorityQueue_a18v
-    AbsBinds [ta17Z] [d.Ord_a18l] [([ta17Z], insert_a19s, insert_a17U)]
-	d.Ord_a18n = d.Ord_a18l
-	meld_a19u = meld_a18i ta17Z d.Ord_a18n
-	d.Ord_a18p = d.Ord_a18l
-	single_a19t = single_a18h ta17Z d.Ord_a18p
-	insert_a17U a_r56 q_r57 = (single_a19t a_r56) meld_a19u q_r57
-d.Num_a18w = PrelBase.$d4{-rcq,p-}
-lit_a19b = PrelBase.I#{-5b,w-}{i} 1#
-lit_a19a = PrelBase.I#{-5b,w-}{i} 99#
-d.Enum_a18A = PrelBase.$d6{-rcL,p-}
-enumFromTo_a199 =
-    PrelBase.enumFromTo{-8W,p-} PrelBase.Int{-3g,W-} d.Enum_a18A
-d.Num_a18x = PrelNum.$d16{-rwU,p-}
-d.Fractional_a18F = PrelNum.$d14{-rwS,p-}
-fromRational_a198 =
-    PrelNum.fromRational{-8T,p-} PrelBase.Double{-3a,W-}
-	d.Fractional_a18F
-lit_a197 = fromRational_a198 1.0
-fromRational_a196 = fromRational_a198
-lit_a195 = fromRational_a196 1.1
-fromRational_a194 = fromRational_a198
-lit_a193 = fromRational_a194 99.9
-d.Enum_a18K = PrelNum.$d8{-rxr,p-}
-enumFromThenTo_a192 =
-    PrelBase.enumFromThenTo{-8X,p-} PrelBase.Double{-3a,W-} d.Enum_a18K
-d.Monad_a18N = IOBase.$d3{-rm9,p-}
->>=_a191 = PrelBase.>>={-811,p-} IOBase.IO{-3e,p-} d.Monad_a18N
-d.Monad_a18Q = d.Monad_a18N
-return_a190 =
-    PrelBase.return{-816,p-} IOBase.IO{-3e,p-} d.Monad_a18Q
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc088.stderr b/ghc/tests/typecheck/should_compile/tc088.stderr
index fccf2989df6b4f240cdbb094dde6bb17688e0769..efbb004bb9b3adf10a33d585c26610cfb4e1f783 100644
--- a/ghc/tests/typecheck/should_compile/tc088.stderr
+++ b/ghc/tests/typecheck/should_compile/tc088.stderr
@@ -1,61 +1,3 @@
-==================== Typechecked ====================
-AbsBinds
-[taD8, taD9]
-[d.Num_aEE, d.Eq_aEF, d.Show_aEG, d.Eval_aEH]
-[([taD8, taD9], $d1{-rFF,x-}, d.Num_aD1)]
-    d.Eq_aEI = d.Eq_aEF
-    d.Show_aEJ = d.Show_aEG
-    d.Eval_aEK = d.Eval_aEH
-    d.Num_aEO = d.Num_aEE
-    +_aFV = PrelBase.+{-rgc,p-} taD9 d.Num_aEO
-    d.Num_aEQ = d.Num_aEE
-    -_aFU = PrelBase.-{-817,p-} taD9 d.Num_aEQ
-    d.Num_aES = d.Num_aEE
-    *_aFT = PrelBase.*{-rgd,p-} taD9 d.Num_aES
-    d.Num_aEU = d.Num_aEE
-    negate_aFS = PrelBase.negate{-rge,p-} taD9 d.Num_aEU
-    d.Num_aEW = d.Num_aEE
-    abs_aFR = PrelBase.abs{-rgf,p-} taD9 d.Num_aEW
-    d.Num_aEY = d.Num_aEE
-    signum_aFQ = PrelBase.signum{-rgg,p-} taD9 d.Num_aEY
-    d.Num_aF0 = d.Num_aEE
-    fromInteger_aFP = PrelBase.fromInteger{-8S,p-} taD9 d.Num_aF0
-    d.Num_aF2 = d.Num_aEE
-    fromInt_aFO = PrelBase.fromInt{-8R,p-} taD9 d.Num_aF2
-    AbsBinds [] [] [([], +_aFN, +_aD5)]
-	+_aD5 f_r3h g_r3i = \ a_r3k -> (f_r3h a_r3k) +_aFV (g_r3i a_r3k)
-    AbsBinds [] [] [([], -_aFM, -_aDl)]
-	-_aDl f_r3o g_r3p = \ a_r3r -> (f_r3o a_r3r) -_aFU (g_r3p a_r3r)
-    AbsBinds [] [] [([], *_aFL, *_aDz)]
-	*_aDz f_r3v g_r3w = \ a_r3y -> (f_r3v a_r3y) *_aFT (g_r3w a_r3y)
-    AbsBinds [] [] [([], negate_aFK, negate_aDN)]
-	negate_aDN f_r3C = \ a_r3E -> negate_aFS f_r3C a_r3E
-    AbsBinds [] [] [([], abs_aFJ, abs_aDZ)]
-	abs_aDZ f_r3I = \ a_r3K -> abs_aFR f_r3I a_r3K
-    AbsBinds [] [] [([], signum_aFI, signum_aEb)]
-	signum_aEb f_r3O = \ a_r3Q -> signum_aFQ f_r3O a_r3Q
-    AbsBinds [] [] [([], fromInteger_aFH, fromInteger_aEn)]
-	fromInteger_aEn n_r3U = \ a_r3W -> fromInteger_aFP n_r3U
-    AbsBinds [] [] [([], fromInt_aFG, fromInt_aEy)]
-	fromInt_aEy n_r40 = \ a_r42 -> fromInt_aFO n_r40
-    d.Num_aD1 =
-	({-dict-}
-	 [d.Eq_aEI, d.Show_aEJ, d.Eval_aEK]
-	 [+_aFN, -_aFM, *_aFL, negate_aFK, abs_aFJ, signum_aFI, fromInteger_aFH, fromInt_aFG])
-AbsBinds
-[taFm, taFn]
-[d.Eq_aFz]
-[([taFm, taFn], $d2{-rFW,x-}, d.Eq_aFf)]
-    d.Eq_aFD = d.Eq_aFf
-    $m/=_aFZ = PrelBase.$m/={-rfO,p-} (taFm -> taFn) d.Eq_aFD
-    AbsBinds [] [] [([], ==_aFY, ==_aFj)]
-	==_aFj f_r4a g_r4b
-	       = IOBase.error{-87,w-}
-		     PrelBase.Bool{-34,W-} "attempt to compare functions"
-    AbsBinds [] [] [([], /=_aFX, /=_aFw)]
-	/=_aFw = $m/=_aFZ
-    d.Eq_aFf = ({-dict-} [] [==_aFY, /=_aFX])
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc089.stderr b/ghc/tests/typecheck/should_compile/tc089.stderr
index a250e21508a1bc99fe1f5b25bf70e6d7fd6b3630..8d85aca7c02199f17fa61aec7980ab3869ad6ff4 100644
--- a/ghc/tests/typecheck/should_compile/tc089.stderr
+++ b/ghc/tests/typecheck/should_compile/tc089.stderr
@@ -1,423 +1,3 @@
-==================== Typechecked ====================
-AbsBinds
-[taBC, taBF, taBI]
-[]
-[([taBC, taBF, taBI], s_3_2{-r5Z,x-}, s_3_2_aBr)]
-    s_3_2_aBr (v0_r4o, v1_r4p, v2_r4q) = v2_r4q
-AbsBinds
-[taBW, taBZ, taC2]
-[]
-[([taBW, taBZ, taC2], s_3_1{-r60,x-}, s_3_1_aBL)]
-    s_3_1_aBL (v0_r4k, v1_r4l, v2_r4m) = v1_r4l
-AbsBinds
-[taCg, taCj, taCm]
-[]
-[([taCg, taCj, taCm], s_3_0{-r61,x-}, s_3_0_aC5)]
-    s_3_0_aC5 (v0_r4g, v1_r4h, v2_r4i) = v0_r4g
-AbsBinds [taCz] [] [([taCz], s_1_0{-r62,x-}, s_1_0_aCp)]
-    s_1_0_aCp v0_r4e = v0_r4e
-AbsBinds
-[taCL, taCO]
-[]
-[([taCL, taCO], s_2_1{-r63,x-}, s_2_1_aCB)]
-    s_2_1_aCB (v0_r4b, v1_r4c) = v1_r4c
-AbsBinds
-[taD1, taD4]
-[]
-[([taD1, taD4], s_2_0{-r64,x-}, s_2_0_aCR)]
-    s_2_0_aCR (v0_r48, v1_r49) = v0_r48
-AbsBinds
-[taDt, taDr]
-[]
-[([taDt, taDr], f_rec{-r66,x-}, f_rec_aD7)]
-    f_rec_aD7 f0_r3Y a_r3Z = f0_r3Y s_1_0{-r62,x-} taDr a_r3Z
-AbsBinds
-[taDR, taDT, taDV]
-[]
-[([taDR, taDT, taDV], absIf{-r69,x-}, absIf_aDv)]
-    absIf_aDv a_r3N b_r3O c_r3P = a_r3N
-AbsBinds [taE7] [] [([taE7], head{-r6b,x-}, head_aDX)]
-    head_aDX (x_r3K PrelBase.:{-55,w-}{i} xs_r3L) = x_r3K
-AbsBinds [taEf] [] [([taEf], bottom{-r6a,x-}, bottom_aEb)]
-    bottom_aEb = head{-r6b,x-} taEf
-AbsBinds [taEx] [] [([taEx], fac_rec0{-r5T,x-}, fac_rec0_aEh)]
-    fac_rec0_aEh n_r4H a_r4I
-		 = bottom{-r6a,x-} taEx [n_r4H, a_r4I] (taEx)
-AbsBinds [taEJ] [] [([taEJ], f_rec0{-r5P,x-}, f_rec0_aEz)]
-    f_rec0_aEz a_r4Q = bottom{-r6a,x-} taEJ [a_r4Q] (taEJ)
-AbsBinds [taEV] [] [([taEV], f_rec1{-r5Q,x-}, f_rec1_aEL)]
-    f_rec1_aEL a_r4O
-	       = f_rec{-r66,x-} [taEV, taEV] f_rec0{-r5P,x-} taEV a_r4O
-AbsBinds [taFb] [] [([taFb], f_rec2{-r5R,x-}, f_rec2_aF1)]
-    f_rec2_aF1 a_r4M
-	       = f_rec{-r66,x-} [taFb, taFb] f_rec1{-r5Q,x-} taFb a_r4M
-AbsBinds [taFr] [] [([taFr], f{-r5S,x-}, f_aFh)]
-    f_aFh a_r4K
-	  = f_rec{-r66,x-} [taFr, taFr] f_rec2{-r5R,x-} taFr a_r4K
-AbsBinds [taFZ] [] [([taFZ], g_rec0{-r5F,x-}, g_rec0_aFx)]
-    g_rec0_aFx x_r5B y_r5C z_r5D p_r5E
-	       = bottom{-r6a,x-} taFZ [x_r5B, y_r5C, z_r5D, p_r5E] (taFZ)
-AbsBinds [taGh] [] [([taGh], absAnd{-r68,x-}, absAnd_aG1)]
-    absAnd_aG1 a_r3R b_r3S = head{-r6b,x-} taGh [a_r3R, b_r3S] (taGh)
-AbsBinds [taGl] [] [([taGl], one{-r6c,x-}, one_aGj)]
-    one_aGj = one_aGj
-AbsBinds
-[taH9, taHp, taHr, taHu, taHv]
-[]
-[([taH9, taHp, taHr, taHu, taHv], fac_rec{-r67,x-}, fac_rec_aGn)]
-    fac_rec_aGn fac0_r3U n_r3V a_r3W
-		= absIf{-r69,x-} [taHv, taH9, taHp] absAnd{-r68,x-}
-							taHp s_3_0{-r61,x-} [taHp, taHu, taHr] n_r3V
-							     one{-r6c,x-} taHp
-						    s_2_0{-r64,x-} [taHv, taHu] a_r3W
-						    fac0_r3U absAnd{-r68,x-} taHr s_3_2{-r5Z,x-}
-										      [taHp, taHu, taHr] n_r3V
-										  one{-r6c,x-} taHr
-							     absAnd{-r68,x-} taHu s_3_1{-r60,x-}
-										      [taHp, taHu, taHr] n_r3V
-										  s_2_1{-r63,x-}
-										      [taHv, taHu] a_r3W
-AbsBinds
-[taHO, taHW, taHX]
-[]
-[([taHO, taHW, taHX], fac_rec1{-r5U,x-}, fac_rec1_aHx)]
-    fac_rec1_aHx n_r4E a_r4F
-		 = fac_rec{-r67,x-} [taHW, taHO, taHW, taHW, taHX] fac_rec0{-r5T,x-}
-								       taHW
-								   n_r4E
-								   a_r4F
-AbsBinds
-[taIg, taIo, taIr, taIs, taIt]
-[]
-[([taIg, taIo, taIr, taIs, taIt], fac_rec2{-r5V,x-}, fac_rec2_aHZ)]
-    fac_rec2_aHZ n_r4B a_r4C
-		 = fac_rec{-r67,x-}
-		       [taIs, taIg, (taIs, taIo, taIo), (taIr, taIo), taIt] fac_rec1{-r5U,x-}
-										[taIs, taIo, taIr]
-									    n_r4B
-									    a_r4C
-AbsBinds
-[taIM, taIV, taIW, taIY, taJ1, taJ2, taJ3]
-[]
-[([taIM, taIV, taIW, taIY, taJ1, taJ2, taJ3],
-  fac_rec3{-r5W,x-},
-  fac_rec3_aIv)]
-    fac_rec3_aIv n_r4y a_r4z
-		 = fac_rec{-r67,x-}
-		       [taJ2, taIM, (taJ2, (taIV, taIW), (taIY, taIW, taIW)), (taJ1, (taIV, taIW)), taJ3] fac_rec2{-r5V,x-}
-													      [taJ2, taIW, taIV, taIY, taJ1]
-													  n_r4y
-													  a_r4z
-AbsBinds
-[taJm, taJx, taJy, taJz, taJB, taJC, taJF, taJG, taJH]
-[]
-[([taJm, taJx, taJy, taJz, taJB, taJC, taJF, taJG, taJH],
-  fac_rec4{-r5X,x-},
-  fac_rec4_aJ5)]
-    fac_rec4_aJ5 n_r4v a_r4w
-		 = fac_rec{-r67,x-}
-		       [taJG, taJm, (taJG, (taJx, (taJy, taJz)), (taJB, (taJy, taJz), (taJC, taJz, taJz))), (taJF, (taJx, (taJy, taJz))), taJH] fac_rec3{-r5W,x-}
-																		    [taJG, taJy, taJz, taJC, taJx, taJB, taJF]
-																		n_r4v
-																		a_r4w
-AbsBinds
-[taK0, taKd, taKe, taKf, taKg, taKi, taKj, taKk, taKn, taKo, taKp]
-[]
-[([taK0, taKd, taKe, taKf, taKg, taKi, taKj, taKk, taKn, taKo,
-   taKp],
-  fac{-r5Y,x-},
-  fac_aJJ)]
-    fac_aJJ n_r4s a_r4t
-	    = fac_rec{-r67,x-}
-		  [taKo, taK0, (taKo, (taKd, (taKe, (taKf, taKg))), (taKi, (taKe, (taKf, taKg)), (taKj, (taKf, taKg), (taKk, taKg, taKg)))), (taKn, (taKd, (taKe, (taKf, taKg)))), taKp] fac_rec4{-r5X,x-}
-																							     [taKo, taKe, taKf, taKg, taKj, taKk, taKd, taKi, taKn]
-																							 n_r4s
-																							 a_r4t
-AbsBinds
-[taLv, taLN, taLP, taLR, taMq, taMr, taMt, taMv, taMB, taMC, taMD]
-[]
-[([taLv, taLN, taLP, taLR, taMq, taMr, taMt, taMv, taMB, taMC,
-   taMD],
-  g_rec{-r65,x-},
-  g_rec_aKr)]
-    g_rec_aKr g0_r41 g1_r42 x_r43 y_r44 z_r45 p_r46
-	      = absIf{-r69,x-} [taMr, taLv, taMC] absAnd{-r68,x-}
-						      taMC s_3_0{-r61,x-} [taMC, taMD, taMB] p_r46
-							   one{-r6c,x-} taMC
-						  absAnd{-r68,x-} taMr s_1_0{-r62,x-} taMr x_r43
-								       s_3_0{-r61,x-}
-									   [taMr, taMq, taMt] z_r45
-						  absAnd{-r68,x-} taLv g0_r41 s_1_0{-r62,x-}
-										  taLN y_r44
-									      one{-r6c,x-} taLP
-									      one{-r6c,x-} taLR
-									      absAnd{-r68,x-}
-										  taMD s_3_1{-r60,x-}
-											   [taMC, taMD, taMB] p_r46
-										       one{-r6c,x-}
-											   taMD
-								       g1_r42 s_3_2{-r5Z,x-}
-										  [taMr, taMq, taMt] z_r45
-									      s_3_1{-r60,x-}
-										  [taMr, taMq, taMt] z_r45
-									      one{-r6c,x-} taMv
-									      absAnd{-r68,x-}
-										  taMB s_3_2{-r5Z,x-}
-											   [taMC, taMD, taMB] p_r46
-										       one{-r6c,x-}
-											   taMB
-AbsBinds
-[taNi, taNq, taNx]
-[]
-[([taNi, taNq, taNx], g_rec1{-r5G,x-}, g_rec1_aMH)]
-    g_rec1_aMH x_r5w y_r5x z_r5y p_r5z
-	       = g_rec{-r65,x-}
-		     [taNq, taNq, taNq, taNq, taNq, taNx, taNq, taNq, taNq, taNi, taNq] g_rec0{-r5F,x-}
-											    taNq
-											g_rec0{-r5F,x-}
-											    taNq
-											x_r5w
-											y_r5x
-											z_r5y
-											p_r5z
-AbsBinds
-[taOa, taOg, taOi, taOm, taOr, taOt, taOx]
-[]
-[([taOa, taOg, taOi, taOm, taOr, taOt, taOx],
-  g_rec2{-r5H,x-},
-  g_rec2_aNz)]
-    g_rec2_aNz x_r5r y_r5s z_r5t p_r5u
-	       = g_rec{-r65,x-}
-		     [taOm, taOg, taOi, (taOg, taOi, taOi), taOt, taOx, taOr, (taOr, taOt, taOt), (taOm, taOt, taOt), taOa, (taOm, taOi, taOi)] g_rec1{-r5G,x-}
-																		    [taOm, taOi, taOg]
-																		g_rec1{-r5G,x-}
-																		    [taOm, taOt, taOr]
-																		x_r5r
-																		y_r5s
-																		z_r5t
-																		p_r5u
-AbsBinds
-[taPa, taPk, taPo, taPs, taPt, taPu, taPD, taPF, taPH, taPL, taPM, taPN]
-[]
-[([taPa, taPk, taPo, taPs, taPt, taPu, taPD, taPF, taPH, taPL,
-   taPM, taPN],
-  g_rec3{-r5I,x-},
-  g_rec3_aOz)]
-    g_rec3_aOz x_r5m y_r5n z_r5o p_r5p
-	       = g_rec{-r65,x-}
-		     [taPu, taPk, GHC.Void{-3T,W-}, (taPk, taPo, GHC.Void{-3T,W-}), taPF, taPN, taPD, (taPD, taPH, GHC.Void{-3T,W-}), (taPu, (taPL, taPM, taPM), (taPL, taPH, taPH)), taPa, (taPu, (taPs, taPt, taPt), (taPs, taPo, taPo))] g_rec2{-r5H,x-}
-																														[taPu, GHC.Void{-3T,W-}, taPt, taPs, GHC.Void{-3T,W-}, taPo, taPk]
-																													    g_rec2{-r5H,x-}
-																														[taPu, taPF, taPM, taPL, GHC.Void{-3T,W-}, taPH, taPD]
-																													    x_r5m
-																													    y_r5n
-																													    z_r5o
-																													    p_r5p
-AbsBinds
-[taQq, taQF, taQN, taQO, taQP, taQQ, taQR, taQS, taQT, taQU, taR8, taRa, taRg, taRh, taRi, taRj, taRk, taRl, taRm, taRn]
-[]
-[([taQq, taQF, taQN, taQO, taQP, taQQ, taQR, taQS, taQT, taQU,
-   taR8, taRa, taRg, taRh, taRi, taRj, taRk, taRl, taRm, taRn],
-  g_rec4{-r5J,x-},
-  g_rec4_aPP)]
-    g_rec4_aPP x_r5h y_r5i z_r5j p_r5k
-	       = g_rec{-r65,x-}
-		     [taQU, taQF, GHC.Void{-3T,W-}, (taQF, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), taRa, taRn, taR8, (taR8, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), (taQU, (taRg, (taRh, taRi, taRi), (taRh, taRj, taRj)), (taRg, (taRk, taRl, taRl), (taRk, taRm, taRm))), taQq, (taQU, (taQN, (taQO, taQP, taQP), (taQO, taQQ, taQQ)), (taQN, (taQR, taQS, taQS), (taQR, taQT, taQT)))] g_rec3{-r5I,x-}
-																																															[taQU, GHC.Void{-3T,W-}, taQQ, taQO, taQP, taQN, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taQT, taQR, taQS, taQF]
-																																														    g_rec3{-r5I,x-}
-																																															[taQU, taRa, taRj, taRh, taRi, taRg, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taRm, taRk, taRl, taR8]
-																																														    x_r5h
-																																														    y_r5i
-																																														    z_r5j
-																																														    p_r5k
-AbsBinds
-[taS0, taSn, taSv, taSw, taSx, taSy, taSz, taSA, taSB, taSC, taSD, taSE, taSF, taSG, taSH, taSI, taSJ, taSK, taT6, taT8, taTe, taTf, taTg, taTh, taTi, taTj, taTk, taTl, taTm, taTn, taTo, taTp, taTq, taTr, taTs, taTt]
-[]
-[([taS0, taSn, taSv, taSw, taSx, taSy, taSz, taSA, taSB, taSC,
-   taSD, taSE, taSF, taSG, taSH, taSI, taSJ, taSK, taT6, taT8, taTe,
-   taTf, taTg, taTh, taTi, taTj, taTk, taTl, taTm, taTn, taTo, taTp,
-   taTq, taTr, taTs, taTt],
-  g_rec5{-r5K,x-},
-  g_rec5_aRp)]
-    g_rec5_aRp x_r5c y_r5d z_r5e p_r5f
-	       = g_rec{-r65,x-}
-		     [taSK, taSn, GHC.Void{-3T,W-}, (taSn, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), taT8, taTt, taT6, (taT6, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), (taSK, (taTe, (taTf, (taTg, taTh, taTh), (taTg, taTi, taTi)), (taTf, (taTj, taTk, taTk), (taTj, taTl, taTl))), (taTe, (taTm, (taTn, taTo, taTo), (taTn, taTp, taTp)), (taTm, (taTq, taTr, taTr), (taTq, taTs, taTs)))), taS0, (taSK, (taSv, (taSw, (taSx, taSy, taSy), (taSx, taSz, taSz)), (taSw, (taSA, taSB, taSB), (taSA, taSC, taSC))), (taSv, (taSD, (taSE, taSF, taSF), (taSE, taSG, taSG)), (taSD, (taSH, taSI, taSI), (taSH, taSJ, taSJ))))] g_rec4{-r5J,x-}
-																																																																											[taSK, GHC.Void{-3T,W-}, taSw, taSx, taSy, taSz, taSA, taSB, taSC, taSv, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taSD, taSE, taSF, taSG, taSH, taSI, taSJ, taSn]
-																																																																										    g_rec4{-r5J,x-}
-																																																																											[taSK, taT8, taTf, taTg, taTh, taTi, taTj, taTk, taTl, taTe, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taTm, taTn, taTo, taTp, taTq, taTr, taTs, taT6]
-																																																																										    x_r5c
-																																																																										    y_r5d
-																																																																										    z_r5e
-																																																																										    p_r5f
-AbsBinds
-[taU6, taUJ, taUR, taUS, taUT, taUU, taUV, taUW, taUX, taUY, taUZ, taV0, taV1, taV2, taV3, taV4, taV5, taV6, taV7, taV8, taV9, taVa, taVb, taVc, taVd, taVe, taVf, taVg, taVh, taVi, taVj, taVk, taVl, taVm, taVY, taW0, taW6, taW7, taW8, taW9, taWa, taWb, taWc, taWd, taWe, taWf, taWg, taWh, taWi, taWj, taWk, taWl, taWm, taWn, taWo, taWp, taWq, taWr, taWs, taWt, taWu, taWv, taWw, taWx, taWy, taWz, taWA, taWB]
-[]
-[([taU6, taUJ, taUR, taUS, taUT, taUU, taUV, taUW, taUX, taUY,
-   taUZ, taV0, taV1, taV2, taV3, taV4, taV5, taV6, taV7, taV8, taV9,
-   taVa, taVb, taVc, taVd, taVe, taVf, taVg, taVh, taVi, taVj, taVk,
-   taVl, taVm, taVY, taW0, taW6, taW7, taW8, taW9, taWa, taWb, taWc,
-   taWd, taWe, taWf, taWg, taWh, taWi, taWj, taWk, taWl, taWm, taWn,
-   taWo, taWp, taWq, taWr, taWs, taWt, taWu, taWv, taWw, taWx, taWy,
-   taWz, taWA, taWB],
-  g_rec6{-r5L,x-},
-  g_rec6_aTv)]
-    g_rec6_aTv x_r57 y_r58 z_r59 p_r5a
-	       = g_rec{-r65,x-}
-		     [taVm, taUJ, GHC.Void{-3T,W-}, (taUJ, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), taW0, taWB, taVY, (taVY, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), (taVm, (taW6, (taW7, (taW8, (taW9, taWa, taWa), (taW9, taWb, taWb)), (taW8, (taWc, taWd, taWd), (taWc, taWe, taWe))), (taW7, (taWf, (taWg, taWh, taWh), (taWg, taWi, taWi)), (taWf, (taWj, taWk, taWk), (taWj, taWl, taWl)))), (taW6, (taWm, (taWn, (taWo, taWp, taWp), (taWo, taWq, taWq)), (taWn, (taWr, taWs, taWs), (taWr, taWt, taWt))), (taWm, (taWu, (taWv, taWw, taWw), (taWv, taWx, taWx)), (taWu, (taWy, taWz, taWz), (taWy, taWA, taWA))))), taU6, (taVm, (taUR, (taUS, (taUT, (taUU, taUV, taUV), (taUU, taUW, taUW)), (taUT, (taUX, taUY, taUY), (taUX, taUZ, taUZ))), (taUS, (taV0, (taV1, taV2, taV2), (taV1, taV3, taV3)), (taV0, (taV4, taV5, taV5), (taV4, taV6, taV6)))), (taUR, (taV7, (taV8, (taV9, taVa, taVa), (taV9, taVb, taVb)), (taV8, (taVc, taVd, taVd), (taVc, taVe, taVe))), (taV7, (taVf, (taVg, taVh, taVh), (taVg, taVi, taVi)), (taVf, (taVj, taVk, taVk), (taVj, taVl, taVl)))))] g_rec5{-r5K,x-}
-																																																																																																																																			[taVm, GHC.Void{-3T,W-}, taUS, taUT, taUU, taUV, taUW, taUX, taUY, taUZ, taV0, taV1, taV2, taV3, taV4, taV5, taV6, taUR, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taV7, taV8, taV9, taVa, taVb, taVc, taVd, taVe, taVf, taVg, taVh, taVi, taVj, taVk, taVl, taUJ]
-																																																																																																																																		    g_rec5{-r5K,x-}
-																																																																																																																																			[taVm, taW0, taW7, taW8, taW9, taWa, taWb, taWc, taWd, taWe, taWf, taWg, taWh, taWi, taWj, taWk, taWl, taW6, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taWm, taWn, taWo, taWp, taWq, taWr, taWs, taWt, taWu, taWv, taWw, taWx, taWy, taWz, taWA, taVY]
-																																																																																																																																		    x_r57
-																																																																																																																																		    y_r58
-																																																																																																																																		    z_r59
-																																																																																																																																		    p_r5a
-AbsBinds
-[taXe, taYn, taYv, taYw, taYx, taYy, taYz, taYA, taYB, taYC, taYD, taYE, taYF, taYG, taYH, taYI, taYJ, taYK, taYL, taYM, taYN, taYO, taYP, taYQ, taYR, taYS, taYT, taYU, taYV, taYW, taYX, taYY, taYZ, taZ0, taZ1, taZ2, taZ3, taZ4, taZ5, taZ6, taZ7, taZ8, taZ9, taZa, taZb, taZc, taZd, taZe, taZf, taZg, taZh, taZi, taZj, taZk, taZl, taZm, taZn, taZo, taZp, taZq, taZr, taZs, taZt, taZu, taZv, taZw, ta10E, ta10G, ta10M, ta10N, ta10O, ta10P, ta10Q, ta10R, ta10S, ta10T, ta10U, ta10V, ta10W, ta10X, ta10Y, ta10Z, ta110, ta111, ta112, ta113, ta114, ta115, ta116, ta117, ta118, ta119, ta11a, ta11b, ta11c, ta11d, ta11e, ta11f, ta11g, ta11h, ta11i, ta11j, ta11k, ta11l, ta11m, ta11n, ta11o, ta11p, ta11q, ta11r, ta11s, ta11t, ta11u, ta11v, ta11w, ta11x, ta11y, ta11z, ta11A, ta11B, ta11C, ta11D, ta11E, ta11F, ta11G, ta11H, ta11I, ta11J, ta11K, ta11L, ta11M, ta11N]
-[]
-[([taXe, taYn, taYv, taYw, taYx, taYy, taYz, taYA, taYB, taYC,
-   taYD, taYE, taYF, taYG, taYH, taYI, taYJ, taYK, taYL, taYM, taYN,
-   taYO, taYP, taYQ, taYR, taYS, taYT, taYU, taYV, taYW, taYX, taYY,
-   taYZ, taZ0, taZ1, taZ2, taZ3, taZ4, taZ5, taZ6, taZ7, taZ8, taZ9,
-   taZa, taZb, taZc, taZd, taZe, taZf, taZg, taZh, taZi, taZj, taZk,
-   taZl, taZm, taZn, taZo, taZp, taZq, taZr, taZs, taZt, taZu, taZv,
-   taZw, ta10E, ta10G, ta10M, ta10N, ta10O, ta10P, ta10Q, ta10R,
-   ta10S, ta10T, ta10U, ta10V, ta10W, ta10X, ta10Y, ta10Z, ta110,
-   ta111, ta112, ta113, ta114, ta115, ta116, ta117, ta118, ta119,
-   ta11a, ta11b, ta11c, ta11d, ta11e, ta11f, ta11g, ta11h, ta11i,
-   ta11j, ta11k, ta11l, ta11m, ta11n, ta11o, ta11p, ta11q, ta11r,
-   ta11s, ta11t, ta11u, ta11v, ta11w, ta11x, ta11y, ta11z, ta11A,
-   ta11B, ta11C, ta11D, ta11E, ta11F, ta11G, ta11H, ta11I, ta11J,
-   ta11K, ta11L, ta11M, ta11N],
-  g_rec7{-r5M,x-},
-  g_rec7_aWD)]
-    g_rec7_aWD x_r52 y_r53 z_r54 p_r55
-	       = g_rec{-r65,x-}
-		     [taZw, taYn, GHC.Void{-3T,W-}, (taYn, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), ta10G, ta11N, ta10E, (ta10E, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), (taZw, (ta10M, (ta10N, (ta10O, (ta10P, (ta10Q, ta10R, ta10R), (ta10Q, ta10S, ta10S)), (ta10P, (ta10T, ta10U, ta10U), (ta10T, ta10V, ta10V))), (ta10O, (ta10W, (ta10X, ta10Y, ta10Y), (ta10X, ta10Z, ta10Z)), (ta10W, (ta110, ta111, ta111), (ta110, ta112, ta112)))), (ta10N, (ta113, (ta114, (ta115, ta116, ta116), (ta115, ta117, ta117)), (ta114, (ta118, ta119, ta119), (ta118, ta11a, ta11a))), (ta113, (ta11b, (ta11c, ta11d, ta11d), (ta11c, ta11e, ta11e)), (ta11b, (ta11f, ta11g, ta11g), (ta11f, ta11h, ta11h))))), (ta10M, (ta11i, (ta11j, (ta11k, (ta11l, ta11m, ta11m), (ta11l, ta11n, ta11n)), (ta11k, (ta11o, ta11p, ta11p), (ta11o, ta11q, ta11q))), (ta11j, (ta11r, (ta11s, ta11t, ta11t), (ta11s, ta11u, ta11u)), (ta11r, (ta11v, ta11w, ta11w), (ta11v, ta11x, ta11x)))), (ta11i, (ta11y, (ta11z, (ta11A, ta11B, ta11B), (ta11A, ta11C, ta11C)), (ta11z, (ta11D, ta11E, ta11E), (ta11D, ta11F, ta11F))), (ta11y, (ta11G, (ta11H, ta11I, ta11I), (ta11H, ta11J, ta11J)), (ta11G, (ta11K, ta11L, ta11L), (ta11K, ta11M, ta11M)))))), taXe, (taZw, (taYv, (taYw, (taYx, (taYy, (taYz, taYA, taYA), (taYz, taYB, taYB)), (taYy, (taYC, taYD, taYD), (taYC, taYE, taYE))), (taYx, (taYF, (taYG, taYH, taYH), (taYG, taYI, taYI)), (taYF, (taYJ, taYK, taYK), (taYJ, taYL, taYL)))), (taYw, (taYM, (taYN, (taYO, taYP, taYP), (taYO, taYQ, taYQ)), (taYN, (taYR, taYS, taYS), (taYR, taYT, taYT))), (taYM, (taYU, (taYV, taYW, taYW), (taYV, taYX, taYX)), (taYU, (taYY, taYZ, taYZ), (taYY, taZ0, taZ0))))), (taYv, (taZ1, (taZ2, (taZ3, (taZ4, taZ5, taZ5), (taZ4, taZ6, taZ6)), (taZ3, (taZ7, taZ8, taZ8), (taZ7, taZ9, taZ9))), (taZ2, (taZa, (taZb, taZc, taZc), (taZb, taZd, taZd)), (taZa, (taZe, taZf, taZf), (taZe, taZg, taZg)))), (taZ1, (taZh, (taZi, (taZj, taZk, taZk), (taZj, taZl, taZl)), (taZi, (taZm, taZn, taZn), (taZm, taZo, taZo))), (taZh, (taZp, (taZq, taZr, taZr), (taZq, taZs, taZs)), (taZp, (taZt, taZu, taZu), (taZt, taZv, taZv))))))] g_rec6{-r5L,x-}
-																																																																																																																																																																																																																																																																			  [taZw, GHC.Void{-3T,W-}, taYw, taYx, taYy, taYz, taYA, taYB, taYC, taYD, taYE, taYF, taYG, taYH, taYI, taYJ, taYK, taYL, taYM, taYN, taYO, taYP, taYQ, taYR, taYS, taYT, taYU, taYV, taYW, taYX, taYY, taYZ, taZ0, taYv, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taZ1, taZ2, taZ3, taZ4, taZ5, taZ6, taZ7, taZ8, taZ9, taZa, taZb, taZc, taZd, taZe, taZf, taZg, taZh, taZi, taZj, taZk, taZl, taZm, taZn, taZo, taZp, taZq, taZr, taZs, taZt, taZu, taZv, taYn]
-																																																																																																																																																																																																																																																																		      g_rec6{-r5L,x-}
-																																																																																																																																																																																																																																																																			  [taZw, ta10G, ta10N, ta10O, ta10P, ta10Q, ta10R, ta10S, ta10T, ta10U, ta10V, ta10W, ta10X, ta10Y, ta10Z, ta110, ta111, ta112, ta113, ta114, ta115, ta116, ta117, ta118, ta119, ta11a, ta11b, ta11c, ta11d, ta11e, ta11f, ta11g, ta11h, ta10M, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, ta11i, ta11j, ta11k, ta11l, ta11m, ta11n, ta11o, ta11p, ta11q, ta11r, ta11s, ta11t, ta11u, ta11v, ta11w, ta11x, ta11y, ta11z, ta11A, ta11B, ta11C, ta11D, ta11E, ta11F, ta11G, ta11H, ta11I, ta11J, ta11K, ta11L, ta11M, ta10E]
-																																																																																																																																																																																																																																																																		      x_r52
-																																																																																																																																																																																																																																																																		      y_r53
-																																																																																																																																																																																																																																																																		      z_r54
-																																																																																																																																																																																																																																																																		      p_r55
-AbsBinds
-[ta12q, ta14B, ta14J, ta14K, ta14L, ta14M, ta14N, ta14O, ta14P, ta14Q, ta14R, ta14S, ta14T, ta14U, ta14V, ta14W, ta14X, ta14Y, ta14Z, ta150, ta151, ta152, ta153, ta154, ta155, ta156, ta157, ta158, ta159, ta15a, ta15b, ta15c, ta15d, ta15e, ta15f, ta15g, ta15h, ta15i, ta15j, ta15k, ta15l, ta15m, ta15n, ta15o, ta15p, ta15q, ta15r, ta15s, ta15t, ta15u, ta15v, ta15w, ta15x, ta15y, ta15z, ta15A, ta15B, ta15C, ta15D, ta15E, ta15F, ta15G, ta15H, ta15I, ta15J, ta15K, ta15L, ta15M, ta15N, ta15O, ta15P, ta15Q, ta15R, ta15S, ta15T, ta15U, ta15V, ta15W, ta15X, ta15Y, ta15Z, ta160, ta161, ta162, ta163, ta164, ta165, ta166, ta167, ta168, ta169, ta16a, ta16b, ta16c, ta16d, ta16e, ta16f, ta16g, ta16h, ta16i, ta16j, ta16k, ta16l, ta16m, ta16n, ta16o, ta16p, ta16q, ta16r, ta16s, ta16t, ta16u, ta16v, ta16w, ta16x, ta16y, ta16z, ta16A, ta16B, ta16C, ta16D, ta16E, ta16F, ta16G, ta16H, ta16I, ta16J, ta16K, ta16L, ta16M, ta18W, ta18Y, ta194, ta195, ta196, ta197, ta198, ta199, ta19a, ta19b, ta19c, ta19d, ta19e, ta19f, ta19g, ta19h, ta19i, ta19j, ta19k, ta19l, ta19m, ta19n, ta19o, ta19p, ta19q, ta19r, ta19s, ta19t, ta19u, ta19v, ta19w, ta19x, ta19y, ta19z, ta19A, ta19B, ta19C, ta19D, ta19E, ta19F, ta19G, ta19H, ta19I, ta19J, ta19K, ta19L, ta19M, ta19N, ta19O, ta19P, ta19Q, ta19R, ta19S, ta19T, ta19U, ta19V, ta19W, ta19X, ta19Y, ta19Z, ta1a0, ta1a1, ta1a2, ta1a3, ta1a4, ta1a5, ta1a6, ta1a7, ta1a8, ta1a9, ta1aa, ta1ab, ta1ac, ta1ad, ta1ae, ta1af, ta1ag, ta1ah, ta1ai, ta1aj, ta1ak, ta1al, ta1am, ta1an, ta1ao, ta1ap, ta1aq, ta1ar, ta1as, ta1at, ta1au, ta1av, ta1aw, ta1ax, ta1ay, ta1az, ta1aA, ta1aB, ta1aC, ta1aD, ta1aE, ta1aF, ta1aG, ta1aH, ta1aI, ta1aJ, ta1aK, ta1aL, ta1aM, ta1aN, ta1aO, ta1aP, ta1aQ, ta1aR, ta1aS, ta1aT, ta1aU, ta1aV, ta1aW, ta1aX, ta1aY, ta1aZ, ta1b0, ta1b1, ta1b2, ta1b3, ta1b4, ta1b5, ta1b6, ta1b7]
-[]
-[([ta12q, ta14B, ta14J, ta14K, ta14L, ta14M, ta14N, ta14O, ta14P,
-   ta14Q, ta14R, ta14S, ta14T, ta14U, ta14V, ta14W, ta14X, ta14Y,
-   ta14Z, ta150, ta151, ta152, ta153, ta154, ta155, ta156, ta157,
-   ta158, ta159, ta15a, ta15b, ta15c, ta15d, ta15e, ta15f, ta15g,
-   ta15h, ta15i, ta15j, ta15k, ta15l, ta15m, ta15n, ta15o, ta15p,
-   ta15q, ta15r, ta15s, ta15t, ta15u, ta15v, ta15w, ta15x, ta15y,
-   ta15z, ta15A, ta15B, ta15C, ta15D, ta15E, ta15F, ta15G, ta15H,
-   ta15I, ta15J, ta15K, ta15L, ta15M, ta15N, ta15O, ta15P, ta15Q,
-   ta15R, ta15S, ta15T, ta15U, ta15V, ta15W, ta15X, ta15Y, ta15Z,
-   ta160, ta161, ta162, ta163, ta164, ta165, ta166, ta167, ta168,
-   ta169, ta16a, ta16b, ta16c, ta16d, ta16e, ta16f, ta16g, ta16h,
-   ta16i, ta16j, ta16k, ta16l, ta16m, ta16n, ta16o, ta16p, ta16q,
-   ta16r, ta16s, ta16t, ta16u, ta16v, ta16w, ta16x, ta16y, ta16z,
-   ta16A, ta16B, ta16C, ta16D, ta16E, ta16F, ta16G, ta16H, ta16I,
-   ta16J, ta16K, ta16L, ta16M, ta18W, ta18Y, ta194, ta195, ta196,
-   ta197, ta198, ta199, ta19a, ta19b, ta19c, ta19d, ta19e, ta19f,
-   ta19g, ta19h, ta19i, ta19j, ta19k, ta19l, ta19m, ta19n, ta19o,
-   ta19p, ta19q, ta19r, ta19s, ta19t, ta19u, ta19v, ta19w, ta19x,
-   ta19y, ta19z, ta19A, ta19B, ta19C, ta19D, ta19E, ta19F, ta19G,
-   ta19H, ta19I, ta19J, ta19K, ta19L, ta19M, ta19N, ta19O, ta19P,
-   ta19Q, ta19R, ta19S, ta19T, ta19U, ta19V, ta19W, ta19X, ta19Y,
-   ta19Z, ta1a0, ta1a1, ta1a2, ta1a3, ta1a4, ta1a5, ta1a6, ta1a7,
-   ta1a8, ta1a9, ta1aa, ta1ab, ta1ac, ta1ad, ta1ae, ta1af, ta1ag,
-   ta1ah, ta1ai, ta1aj, ta1ak, ta1al, ta1am, ta1an, ta1ao, ta1ap,
-   ta1aq, ta1ar, ta1as, ta1at, ta1au, ta1av, ta1aw, ta1ax, ta1ay,
-   ta1az, ta1aA, ta1aB, ta1aC, ta1aD, ta1aE, ta1aF, ta1aG, ta1aH,
-   ta1aI, ta1aJ, ta1aK, ta1aL, ta1aM, ta1aN, ta1aO, ta1aP, ta1aQ,
-   ta1aR, ta1aS, ta1aT, ta1aU, ta1aV, ta1aW, ta1aX, ta1aY, ta1aZ,
-   ta1b0, ta1b1, ta1b2, ta1b3, ta1b4, ta1b5, ta1b6, ta1b7],
-  g_rec8{-r5N,x-},
-  g_rec8_a11P)]
-    g_rec8_a11P x_r4X y_r4Y z_r4Z p_r50
-		= g_rec{-r65,x-}
-		      [ta16M, ta14B, GHC.Void{-3T,W-}, (ta14B, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), ta18Y, ta1b7, ta18W, (ta18W, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), (ta16M, (ta194, (ta195, (ta196, (ta197, (ta198, (ta199, ta19a, ta19a), (ta199, ta19b, ta19b)), (ta198, (ta19c, ta19d, ta19d), (ta19c, ta19e, ta19e))), (ta197, (ta19f, (ta19g, ta19h, ta19h), (ta19g, ta19i, ta19i)), (ta19f, (ta19j, ta19k, ta19k), (ta19j, ta19l, ta19l)))), (ta196, (ta19m, (ta19n, (ta19o, ta19p, ta19p), (ta19o, ta19q, ta19q)), (ta19n, (ta19r, ta19s, ta19s), (ta19r, ta19t, ta19t))), (ta19m, (ta19u, (ta19v, ta19w, ta19w), (ta19v, ta19x, ta19x)), (ta19u, (ta19y, ta19z, ta19z), (ta19y, ta19A, ta19A))))), (ta195, (ta19B, (ta19C, (ta19D, (ta19E, ta19F, ta19F), (ta19E, ta19G, ta19G)), (ta19D, (ta19H, ta19I, ta19I), (ta19H, ta19J, ta19J))), (ta19C, (ta19K, (ta19L, ta19M, ta19M), (ta19L, ta19N, ta19N)), (ta19K, (ta19O, ta19P, ta19P), (ta19O, ta19Q, ta19Q)))), (ta19B, (ta19R, (ta19S, (ta19T, ta19U, ta19U), (ta19T, ta19V, ta19V)), (ta19S, (ta19W, ta19X, ta19X), (ta19W, ta19Y, ta19Y))), (ta19R, (ta19Z, (ta1a0, ta1a1, ta1a1), (ta1a0, ta1a2, ta1a2)), (ta19Z, (ta1a3, ta1a4, ta1a4), (ta1a3, ta1a5, ta1a5)))))), (ta194, (ta1a6, (ta1a7, (ta1a8, (ta1a9, (ta1aa, ta1ab, ta1ab), (ta1aa, ta1ac, ta1ac)), (ta1a9, (ta1ad, ta1ae, ta1ae), (ta1ad, ta1af, ta1af))), (ta1a8, (ta1ag, (ta1ah, ta1ai, ta1ai), (ta1ah, ta1aj, ta1aj)), (ta1ag, (ta1ak, ta1al, ta1al), (ta1ak, ta1am, ta1am)))), (ta1a7, (ta1an, (ta1ao, (ta1ap, ta1aq, ta1aq), (ta1ap, ta1ar, ta1ar)), (ta1ao, (ta1as, ta1at, ta1at), (ta1as, ta1au, ta1au))), (ta1an, (ta1av, (ta1aw, ta1ax, ta1ax), (ta1aw, ta1ay, ta1ay)), (ta1av, (ta1az, ta1aA, ta1aA), (ta1az, ta1aB, ta1aB))))), (ta1a6, (ta1aC, (ta1aD, (ta1aE, (ta1aF, ta1aG, ta1aG), (ta1aF, ta1aH, ta1aH)), (ta1aE, (ta1aI, ta1aJ, ta1aJ), (ta1aI, ta1aK, ta1aK))), (ta1aD, (ta1aL, (ta1aM, ta1aN, ta1aN), (ta1aM, ta1aO, ta1aO)), (ta1aL, (ta1aP, ta1aQ, ta1aQ), (ta1aP, ta1aR, ta1aR)))), (ta1aC, (ta1aS, (ta1aT, (ta1aU, ta1aV, ta1aV), (ta1aU, ta1aW, ta1aW)), (ta1aT, (ta1aX, ta1aY, ta1aY), (ta1aX, ta1aZ, ta1aZ))), (ta1aS, (ta1b0, (ta1b1, ta1b2, ta1b2), (ta1b1, ta1b3, ta1b3)), (ta1b0, (ta1b4, ta1b5, ta1b5), (ta1b4, ta1b6, ta1b6))))))), ta12q, (ta16M, (ta14J, (ta14K, (ta14L, (ta14M, (ta14N, (ta14O, ta14P, ta14P), (ta14O, ta14Q, ta14Q)), (ta14N, (ta14R, ta14S, ta14S), (ta14R, ta14T, ta14T))), (ta14M, (ta14U, (ta14V, ta14W, ta14W), (ta14V, ta14X, ta14X)), (ta14U, (ta14Y, ta14Z, ta14Z), (ta14Y, ta150, ta150)))), (ta14L, (ta151, (ta152, (ta153, ta154, ta154), (ta153, ta155, ta155)), (ta152, (ta156, ta157, ta157), (ta156, ta158, ta158))), (ta151, (ta159, (ta15a, ta15b, ta15b), (ta15a, ta15c, ta15c)), (ta159, (ta15d, ta15e, ta15e), (ta15d, ta15f, ta15f))))), (ta14K, (ta15g, (ta15h, (ta15i, (ta15j, ta15k, ta15k), (ta15j, ta15l, ta15l)), (ta15i, (ta15m, ta15n, ta15n), (ta15m, ta15o, ta15o))), (ta15h, (ta15p, (ta15q, ta15r, ta15r), (ta15q, ta15s, ta15s)), (ta15p, (ta15t, ta15u, ta15u), (ta15t, ta15v, ta15v)))), (ta15g, (ta15w, (ta15x, (ta15y, ta15z, ta15z), (ta15y, ta15A, ta15A)), (ta15x, (ta15B, ta15C, ta15C), (ta15B, ta15D, ta15D))), (ta15w, (ta15E, (ta15F, ta15G, ta15G), (ta15F, ta15H, ta15H)), (ta15E, (ta15I, ta15J, ta15J), (ta15I, ta15K, ta15K)))))), (ta14J, (ta15L, (ta15M, (ta15N, (ta15O, (ta15P, ta15Q, ta15Q), (ta15P, ta15R, ta15R)), (ta15O, (ta15S, ta15T, ta15T), (ta15S, ta15U, ta15U))), (ta15N, (ta15V, (ta15W, ta15X, ta15X), (ta15W, ta15Y, ta15Y)), (ta15V, (ta15Z, ta160, ta160), (ta15Z, ta161, ta161)))), (ta15M, (ta162, (ta163, (ta164, ta165, ta165), (ta164, ta166, ta166)), (ta163, (ta167, ta168, ta168), (ta167, ta169, ta169))), (ta162, (ta16a, (ta16b, ta16c, ta16c), (ta16b, ta16d, ta16d)), (ta16a, (ta16e, ta16f, ta16f), (ta16e, ta16g, ta16g))))), (ta15L, (ta16h, (ta16i, (ta16j, (ta16k, ta16l, ta16l), (ta16k, ta16m, ta16m)), (ta16j, (ta16n, ta16o, ta16o), (ta16n, ta16p, ta16p))), (ta16i, (ta16q, (ta16r, ta16s, ta16s), (ta16r, ta16t, ta16t)), (ta16q, (ta16u, ta16v, ta16v), (ta16u, ta16w, ta16w)))), (ta16h, (ta16x, (ta16y, (ta16z, ta16A, ta16A), (ta16z, ta16B, ta16B)), (ta16y, (ta16C, ta16D, ta16D), (ta16C, ta16E, ta16E))), (ta16x, (ta16F, (ta16G, ta16H, ta16H), (ta16G, ta16I, ta16I)), (ta16F, (ta16J, ta16K, ta16K), (ta16J, ta16L, ta16L)))))))] g_rec7{-r5M,x-}
-																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																			       [ta16M, GHC.Void{-3T,W-}, ta14K, ta14L, ta14M, ta14N, ta14O, ta14P, ta14Q, ta14R, ta14S, ta14T, ta14U, ta14V, ta14W, ta14X, ta14Y, ta14Z, ta150, ta151, ta152, ta153, ta154, ta155, ta156, ta157, ta158, ta159, ta15a, ta15b, ta15c, ta15d, ta15e, ta15f, ta15g, ta15h, ta15i, ta15j, ta15k, ta15l, ta15m, ta15n, ta15o, ta15p, ta15q, ta15r, ta15s, ta15t, ta15u, ta15v, ta15w, ta15x, ta15y, ta15z, ta15A, ta15B, ta15C, ta15D, ta15E, ta15F, ta15G, ta15H, ta15I, ta15J, ta15K, ta14J, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, ta15L, ta15M, ta15N, ta15O, ta15P, ta15Q, ta15R, ta15S, ta15T, ta15U, ta15V, ta15W, ta15X, ta15Y, ta15Z, ta160, ta161, ta162, ta163, ta164, ta165, ta166, ta167, ta168, ta169, ta16a, ta16b, ta16c, ta16d, ta16e, ta16f, ta16g, ta16h, ta16i, ta16j, ta16k, ta16l, ta16m, ta16n, ta16o, ta16p, ta16q, ta16r, ta16s, ta16t, ta16u, ta16v, ta16w, ta16x, ta16y, ta16z, ta16A, ta16B, ta16C, ta16D, ta16E, ta16F, ta16G, ta16H, ta16I, ta16J, ta16K, ta16L, ta14B]
-																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																			   g_rec7{-r5M,x-}
-																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																			       [ta16M, ta18Y, ta195, ta196, ta197, ta198, ta199, ta19a, ta19b, ta19c, ta19d, ta19e, ta19f, ta19g, ta19h, ta19i, ta19j, ta19k, ta19l, ta19m, ta19n, ta19o, ta19p, ta19q, ta19r, ta19s, ta19t, ta19u, ta19v, ta19w, ta19x, ta19y, ta19z, ta19A, ta19B, ta19C, ta19D, ta19E, ta19F, ta19G, ta19H, ta19I, ta19J, ta19K, ta19L, ta19M, ta19N, ta19O, ta19P, ta19Q, ta19R, ta19S, ta19T, ta19U, ta19V, ta19W, ta19X, ta19Y, ta19Z, ta1a0, ta1a1, ta1a2, ta1a3, ta1a4, ta1a5, ta194, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, ta1a6, ta1a7, ta1a8, ta1a9, ta1aa, ta1ab, ta1ac, ta1ad, ta1ae, ta1af, ta1ag, ta1ah, ta1ai, ta1aj, ta1ak, ta1al, ta1am, ta1an, ta1ao, ta1ap, ta1aq, ta1ar, ta1as, ta1at, ta1au, ta1av, ta1aw, ta1ax, ta1ay, ta1az, ta1aA, ta1aB, ta1aC, ta1aD, ta1aE, ta1aF, ta1aG, ta1aH, ta1aI, ta1aJ, ta1aK, ta1aL, ta1aM, ta1aN, ta1aO, ta1aP, ta1aQ, ta1aR, ta1aS, ta1aT, ta1aU, ta1aV, ta1aW, ta1aX, ta1aY, ta1aZ, ta1b0, ta1b1, ta1b2, ta1b3, ta1b4, ta1b5, ta1b6, ta18W]
-																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																			   x_r4X
-																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																			   y_r4Y
-																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																			   z_r4Z
-																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																			   p_r50
-AbsBinds
-[ta1bK, ta1fZ, ta1g7, ta1g8, ta1g9, ta1ga, ta1gb, ta1gc, ta1gd, ta1ge, ta1gf, ta1gg, ta1gh, ta1gi, ta1gj, ta1gk, ta1gl, ta1gm, ta1gn, ta1go, ta1gp, ta1gq, ta1gr, ta1gs, ta1gt, ta1gu, ta1gv, ta1gw, ta1gx, ta1gy, ta1gz, ta1gA, ta1gB, ta1gC, ta1gD, ta1gE, ta1gF, ta1gG, ta1gH, ta1gI, ta1gJ, ta1gK, ta1gL, ta1gM, ta1gN, ta1gO, ta1gP, ta1gQ, ta1gR, ta1gS, ta1gT, ta1gU, ta1gV, ta1gW, ta1gX, ta1gY, ta1gZ, ta1h0, ta1h1, ta1h2, ta1h3, ta1h4, ta1h5, ta1h6, ta1h7, ta1h8, ta1h9, ta1ha, ta1hb, ta1hc, ta1hd, ta1he, ta1hf, ta1hg, ta1hh, ta1hi, ta1hj, ta1hk, ta1hl, ta1hm, ta1hn, ta1ho, ta1hp, ta1hq, ta1hr, ta1hs, ta1ht, ta1hu, ta1hv, ta1hw, ta1hx, ta1hy, ta1hz, ta1hA, ta1hB, ta1hC, ta1hD, ta1hE, ta1hF, ta1hG, ta1hH, ta1hI, ta1hJ, ta1hK, ta1hL, ta1hM, ta1hN, ta1hO, ta1hP, ta1hQ, ta1hR, ta1hS, ta1hT, ta1hU, ta1hV, ta1hW, ta1hX, ta1hY, ta1hZ, ta1i0, ta1i1, ta1i2, ta1i3, ta1i4, ta1i5, ta1i6, ta1i7, ta1i8, ta1i9, ta1ia, ta1ib, ta1ic, ta1id, ta1ie, ta1if, ta1ig, ta1ih, ta1ii, ta1ij, ta1ik, ta1il, ta1im, ta1in, ta1io, ta1ip, ta1iq, ta1ir, ta1is, ta1it, ta1iu, ta1iv, ta1iw, ta1ix, ta1iy, ta1iz, ta1iA, ta1iB, ta1iC, ta1iD, ta1iE, ta1iF, ta1iG, ta1iH, ta1iI, ta1iJ, ta1iK, ta1iL, ta1iM, ta1iN, ta1iO, ta1iP, ta1iQ, ta1iR, ta1iS, ta1iT, ta1iU, ta1iV, ta1iW, ta1iX, ta1iY, ta1iZ, ta1j0, ta1j1, ta1j2, ta1j3, ta1j4, ta1j5, ta1j6, ta1j7, ta1j8, ta1j9, ta1ja, ta1jb, ta1jc, ta1jd, ta1je, ta1jf, ta1jg, ta1jh, ta1ji, ta1jj, ta1jk, ta1jl, ta1jm, ta1jn, ta1jo, ta1jp, ta1jq, ta1jr, ta1js, ta1jt, ta1ju, ta1jv, ta1jw, ta1jx, ta1jy, ta1jz, ta1jA, ta1jB, ta1jC, ta1jD, ta1jE, ta1jF, ta1jG, ta1jH, ta1jI, ta1jJ, ta1jK, ta1jL, ta1jM, ta1jN, ta1jO, ta1jP, ta1jQ, ta1jR, ta1jS, ta1jT, ta1jU, ta1jV, ta1jW, ta1jX, ta1jY, ta1jZ, ta1k0, ta1k1, ta1k2, ta1k3, ta1k4, ta1k5, ta1k6, ta1k7, ta1k8, ta1k9, ta1ka, ta1kb, ta1kc, ta1kd, ta1ke, ta1os, ta1ou, ta1oA, ta1oB, ta1oC, ta1oD, ta1oE, ta1oF, ta1oG, ta1oH, ta1oI, ta1oJ, ta1oK, ta1oL, ta1oM, ta1oN, ta1oO, ta1oP, ta1oQ, ta1oR, ta1oS, ta1oT, ta1oU, ta1oV, ta1oW, ta1oX, ta1oY, ta1oZ, ta1p0, ta1p1, ta1p2, ta1p3, ta1p4, ta1p5, ta1p6, ta1p7, ta1p8, ta1p9, ta1pa, ta1pb, ta1pc, ta1pd, ta1pe, ta1pf, ta1pg, ta1ph, ta1pi, ta1pj, ta1pk, ta1pl, ta1pm, ta1pn, ta1po, ta1pp, ta1pq, ta1pr, ta1ps, ta1pt, ta1pu, ta1pv, ta1pw, ta1px, ta1py, ta1pz, ta1pA, ta1pB, ta1pC, ta1pD, ta1pE, ta1pF, ta1pG, ta1pH, ta1pI, ta1pJ, ta1pK, ta1pL, ta1pM, ta1pN, ta1pO, ta1pP, ta1pQ, ta1pR, ta1pS, ta1pT, ta1pU, ta1pV, ta1pW, ta1pX, ta1pY, ta1pZ, ta1q0, ta1q1, ta1q2, ta1q3, ta1q4, ta1q5, ta1q6, ta1q7, ta1q8, ta1q9, ta1qa, ta1qb, ta1qc, ta1qd, ta1qe, ta1qf, ta1qg, ta1qh, ta1qi, ta1qj, ta1qk, ta1ql, ta1qm, ta1qn, ta1qo, ta1qp, ta1qq, ta1qr, ta1qs, ta1qt, ta1qu, ta1qv, ta1qw, ta1qx, ta1qy, ta1qz, ta1qA, ta1qB, ta1qC, ta1qD, ta1qE, ta1qF, ta1qG, ta1qH, ta1qI, ta1qJ, ta1qK, ta1qL, ta1qM, ta1qN, ta1qO, ta1qP, ta1qQ, ta1qR, ta1qS, ta1qT, ta1qU, ta1qV, ta1qW, ta1qX, ta1qY, ta1qZ, ta1r0, ta1r1, ta1r2, ta1r3, ta1r4, ta1r5, ta1r6, ta1r7, ta1r8, ta1r9, ta1ra, ta1rb, ta1rc, ta1rd, ta1re, ta1rf, ta1rg, ta1rh, ta1ri, ta1rj, ta1rk, ta1rl, ta1rm, ta1rn, ta1ro, ta1rp, ta1rq, ta1rr, ta1rs, ta1rt, ta1ru, ta1rv, ta1rw, ta1rx, ta1ry, ta1rz, ta1rA, ta1rB, ta1rC, ta1rD, ta1rE, ta1rF, ta1rG, ta1rH, ta1rI, ta1rJ, ta1rK, ta1rL, ta1rM, ta1rN, ta1rO, ta1rP, ta1rQ, ta1rR, ta1rS, ta1rT, ta1rU, ta1rV, ta1rW, ta1rX, ta1rY, ta1rZ, ta1s0, ta1s1, ta1s2, ta1s3, ta1s4, ta1s5, ta1s6, ta1s7, ta1s8, ta1s9, ta1sa, ta1sb, ta1sc, ta1sd, ta1se, ta1sf, ta1sg, ta1sh, ta1si, ta1sj, ta1sk, ta1sl, ta1sm, ta1sn, ta1so, ta1sp, ta1sq, ta1sr, ta1ss, ta1st, ta1su, ta1sv, ta1sw, ta1sx, ta1sy, ta1sz, ta1sA, ta1sB, ta1sC, ta1sD, ta1sE, ta1sF, ta1sG, ta1sH]
-[]
-[([ta1bK, ta1fZ, ta1g7, ta1g8, ta1g9, ta1ga, ta1gb, ta1gc, ta1gd,
-   ta1ge, ta1gf, ta1gg, ta1gh, ta1gi, ta1gj, ta1gk, ta1gl, ta1gm,
-   ta1gn, ta1go, ta1gp, ta1gq, ta1gr, ta1gs, ta1gt, ta1gu, ta1gv,
-   ta1gw, ta1gx, ta1gy, ta1gz, ta1gA, ta1gB, ta1gC, ta1gD, ta1gE,
-   ta1gF, ta1gG, ta1gH, ta1gI, ta1gJ, ta1gK, ta1gL, ta1gM, ta1gN,
-   ta1gO, ta1gP, ta1gQ, ta1gR, ta1gS, ta1gT, ta1gU, ta1gV, ta1gW,
-   ta1gX, ta1gY, ta1gZ, ta1h0, ta1h1, ta1h2, ta1h3, ta1h4, ta1h5,
-   ta1h6, ta1h7, ta1h8, ta1h9, ta1ha, ta1hb, ta1hc, ta1hd, ta1he,
-   ta1hf, ta1hg, ta1hh, ta1hi, ta1hj, ta1hk, ta1hl, ta1hm, ta1hn,
-   ta1ho, ta1hp, ta1hq, ta1hr, ta1hs, ta1ht, ta1hu, ta1hv, ta1hw,
-   ta1hx, ta1hy, ta1hz, ta1hA, ta1hB, ta1hC, ta1hD, ta1hE, ta1hF,
-   ta1hG, ta1hH, ta1hI, ta1hJ, ta1hK, ta1hL, ta1hM, ta1hN, ta1hO,
-   ta1hP, ta1hQ, ta1hR, ta1hS, ta1hT, ta1hU, ta1hV, ta1hW, ta1hX,
-   ta1hY, ta1hZ, ta1i0, ta1i1, ta1i2, ta1i3, ta1i4, ta1i5, ta1i6,
-   ta1i7, ta1i8, ta1i9, ta1ia, ta1ib, ta1ic, ta1id, ta1ie, ta1if,
-   ta1ig, ta1ih, ta1ii, ta1ij, ta1ik, ta1il, ta1im, ta1in, ta1io,
-   ta1ip, ta1iq, ta1ir, ta1is, ta1it, ta1iu, ta1iv, ta1iw, ta1ix,
-   ta1iy, ta1iz, ta1iA, ta1iB, ta1iC, ta1iD, ta1iE, ta1iF, ta1iG,
-   ta1iH, ta1iI, ta1iJ, ta1iK, ta1iL, ta1iM, ta1iN, ta1iO, ta1iP,
-   ta1iQ, ta1iR, ta1iS, ta1iT, ta1iU, ta1iV, ta1iW, ta1iX, ta1iY,
-   ta1iZ, ta1j0, ta1j1, ta1j2, ta1j3, ta1j4, ta1j5, ta1j6, ta1j7,
-   ta1j8, ta1j9, ta1ja, ta1jb, ta1jc, ta1jd, ta1je, ta1jf, ta1jg,
-   ta1jh, ta1ji, ta1jj, ta1jk, ta1jl, ta1jm, ta1jn, ta1jo, ta1jp,
-   ta1jq, ta1jr, ta1js, ta1jt, ta1ju, ta1jv, ta1jw, ta1jx, ta1jy,
-   ta1jz, ta1jA, ta1jB, ta1jC, ta1jD, ta1jE, ta1jF, ta1jG, ta1jH,
-   ta1jI, ta1jJ, ta1jK, ta1jL, ta1jM, ta1jN, ta1jO, ta1jP, ta1jQ,
-   ta1jR, ta1jS, ta1jT, ta1jU, ta1jV, ta1jW, ta1jX, ta1jY, ta1jZ,
-   ta1k0, ta1k1, ta1k2, ta1k3, ta1k4, ta1k5, ta1k6, ta1k7, ta1k8,
-   ta1k9, ta1ka, ta1kb, ta1kc, ta1kd, ta1ke, ta1os, ta1ou, ta1oA,
-   ta1oB, ta1oC, ta1oD, ta1oE, ta1oF, ta1oG, ta1oH, ta1oI, ta1oJ,
-   ta1oK, ta1oL, ta1oM, ta1oN, ta1oO, ta1oP, ta1oQ, ta1oR, ta1oS,
-   ta1oT, ta1oU, ta1oV, ta1oW, ta1oX, ta1oY, ta1oZ, ta1p0, ta1p1,
-   ta1p2, ta1p3, ta1p4, ta1p5, ta1p6, ta1p7, ta1p8, ta1p9, ta1pa,
-   ta1pb, ta1pc, ta1pd, ta1pe, ta1pf, ta1pg, ta1ph, ta1pi, ta1pj,
-   ta1pk, ta1pl, ta1pm, ta1pn, ta1po, ta1pp, ta1pq, ta1pr, ta1ps,
-   ta1pt, ta1pu, ta1pv, ta1pw, ta1px, ta1py, ta1pz, ta1pA, ta1pB,
-   ta1pC, ta1pD, ta1pE, ta1pF, ta1pG, ta1pH, ta1pI, ta1pJ, ta1pK,
-   ta1pL, ta1pM, ta1pN, ta1pO, ta1pP, ta1pQ, ta1pR, ta1pS, ta1pT,
-   ta1pU, ta1pV, ta1pW, ta1pX, ta1pY, ta1pZ, ta1q0, ta1q1, ta1q2,
-   ta1q3, ta1q4, ta1q5, ta1q6, ta1q7, ta1q8, ta1q9, ta1qa, ta1qb,
-   ta1qc, ta1qd, ta1qe, ta1qf, ta1qg, ta1qh, ta1qi, ta1qj, ta1qk,
-   ta1ql, ta1qm, ta1qn, ta1qo, ta1qp, ta1qq, ta1qr, ta1qs, ta1qt,
-   ta1qu, ta1qv, ta1qw, ta1qx, ta1qy, ta1qz, ta1qA, ta1qB, ta1qC,
-   ta1qD, ta1qE, ta1qF, ta1qG, ta1qH, ta1qI, ta1qJ, ta1qK, ta1qL,
-   ta1qM, ta1qN, ta1qO, ta1qP, ta1qQ, ta1qR, ta1qS, ta1qT, ta1qU,
-   ta1qV, ta1qW, ta1qX, ta1qY, ta1qZ, ta1r0, ta1r1, ta1r2, ta1r3,
-   ta1r4, ta1r5, ta1r6, ta1r7, ta1r8, ta1r9, ta1ra, ta1rb, ta1rc,
-   ta1rd, ta1re, ta1rf, ta1rg, ta1rh, ta1ri, ta1rj, ta1rk, ta1rl,
-   ta1rm, ta1rn, ta1ro, ta1rp, ta1rq, ta1rr, ta1rs, ta1rt, ta1ru,
-   ta1rv, ta1rw, ta1rx, ta1ry, ta1rz, ta1rA, ta1rB, ta1rC, ta1rD,
-   ta1rE, ta1rF, ta1rG, ta1rH, ta1rI, ta1rJ, ta1rK, ta1rL, ta1rM,
-   ta1rN, ta1rO, ta1rP, ta1rQ, ta1rR, ta1rS, ta1rT, ta1rU, ta1rV,
-   ta1rW, ta1rX, ta1rY, ta1rZ, ta1s0, ta1s1, ta1s2, ta1s3, ta1s4,
-   ta1s5, ta1s6, ta1s7, ta1s8, ta1s9, ta1sa, ta1sb, ta1sc, ta1sd,
-   ta1se, ta1sf, ta1sg, ta1sh, ta1si, ta1sj, ta1sk, ta1sl, ta1sm,
-   ta1sn, ta1so, ta1sp, ta1sq, ta1sr, ta1ss, ta1st, ta1su, ta1sv,
-   ta1sw, ta1sx, ta1sy, ta1sz, ta1sA, ta1sB, ta1sC, ta1sD, ta1sE,
-   ta1sF, ta1sG, ta1sH],
-  g{-r5O,x-},
-  g_a1b9)]
-    g_a1b9 x_r4S y_r4T z_r4U p_r4V
-	   = g_rec{-r65,x-}
-		 [ta1ke, ta1fZ, GHC.Void{-3T,W-}, (ta1fZ, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), ta1ou, ta1sH, ta1os, (ta1os, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), (ta1ke, (ta1oA, (ta1oB, (ta1oC, (ta1oD, (ta1oE, (ta1oF, (ta1oG, ta1oH, ta1oH), (ta1oG, ta1oI, ta1oI)), (ta1oF, (ta1oJ, ta1oK, ta1oK), (ta1oJ, ta1oL, ta1oL))), (ta1oE, (ta1oM, (ta1oN, ta1oO, ta1oO), (ta1oN, ta1oP, ta1oP)), (ta1oM, (ta1oQ, ta1oR, ta1oR), (ta1oQ, ta1oS, ta1oS)))), (ta1oD, (ta1oT, (ta1oU, (ta1oV, ta1oW, ta1oW), (ta1oV, ta1oX, ta1oX)), (ta1oU, (ta1oY, ta1oZ, ta1oZ), (ta1oY, ta1p0, ta1p0))), (ta1oT, (ta1p1, (ta1p2, ta1p3, ta1p3), (ta1p2, ta1p4, ta1p4)), (ta1p1, (ta1p5, ta1p6, ta1p6), (ta1p5, ta1p7, ta1p7))))), (ta1oC, (ta1p8, (ta1p9, (ta1pa, (ta1pb, ta1pc, ta1pc), (ta1pb, ta1pd, ta1pd)), (ta1pa, (ta1pe, ta1pf, ta1pf), (ta1pe, ta1pg, ta1pg))), (ta1p9, (ta1ph, (ta1pi, ta1pj, ta1pj), (ta1pi, ta1pk, ta1pk)), (ta1ph, (ta1pl, ta1pm, ta1pm), (ta1pl, ta1pn, ta1pn)))), (ta1p8, (ta1po, (ta1pp, (ta1pq, ta1pr, ta1pr), (ta1pq, ta1ps, ta1ps)), (ta1pp, (ta1pt, ta1pu, ta1pu), (ta1pt, ta1pv, ta1pv))), (ta1po, (ta1pw, (ta1px, ta1py, ta1py), (ta1px, ta1pz, ta1pz)), (ta1pw, (ta1pA, ta1pB, ta1pB), (ta1pA, ta1pC, ta1pC)))))), (ta1oB, (ta1pD, (ta1pE, (ta1pF, (ta1pG, (ta1pH, ta1pI, ta1pI), (ta1pH, ta1pJ, ta1pJ)), (ta1pG, (ta1pK, ta1pL, ta1pL), (ta1pK, ta1pM, ta1pM))), (ta1pF, (ta1pN, (ta1pO, ta1pP, ta1pP), (ta1pO, ta1pQ, ta1pQ)), (ta1pN, (ta1pR, ta1pS, ta1pS), (ta1pR, ta1pT, ta1pT)))), (ta1pE, (ta1pU, (ta1pV, (ta1pW, ta1pX, ta1pX), (ta1pW, ta1pY, ta1pY)), (ta1pV, (ta1pZ, ta1q0, ta1q0), (ta1pZ, ta1q1, ta1q1))), (ta1pU, (ta1q2, (ta1q3, ta1q4, ta1q4), (ta1q3, ta1q5, ta1q5)), (ta1q2, (ta1q6, ta1q7, ta1q7), (ta1q6, ta1q8, ta1q8))))), (ta1pD, (ta1q9, (ta1qa, (ta1qb, (ta1qc, ta1qd, ta1qd), (ta1qc, ta1qe, ta1qe)), (ta1qb, (ta1qf, ta1qg, ta1qg), (ta1qf, ta1qh, ta1qh))), (ta1qa, (ta1qi, (ta1qj, ta1qk, ta1qk), (ta1qj, ta1ql, ta1ql)), (ta1qi, (ta1qm, ta1qn, ta1qn), (ta1qm, ta1qo, ta1qo)))), (ta1q9, (ta1qp, (ta1qq, (ta1qr, ta1qs, ta1qs), (ta1qr, ta1qt, ta1qt)), (ta1qq, (ta1qu, ta1qv, ta1qv), (ta1qu, ta1qw, ta1qw))), (ta1qp, (ta1qx, (ta1qy, ta1qz, ta1qz), (ta1qy, ta1qA, ta1qA)), (ta1qx, (ta1qB, ta1qC, ta1qC), (ta1qB, ta1qD, ta1qD))))))), (ta1oA, (ta1qE, (ta1qF, (ta1qG, (ta1qH, (ta1qI, (ta1qJ, ta1qK, ta1qK), (ta1qJ, ta1qL, ta1qL)), (ta1qI, (ta1qM, ta1qN, ta1qN), (ta1qM, ta1qO, ta1qO))), (ta1qH, (ta1qP, (ta1qQ, ta1qR, ta1qR), (ta1qQ, ta1qS, ta1qS)), (ta1qP, (ta1qT, ta1qU, ta1qU), (ta1qT, ta1qV, ta1qV)))), (ta1qG, (ta1qW, (ta1qX, (ta1qY, ta1qZ, ta1qZ), (ta1qY, ta1r0, ta1r0)), (ta1qX, (ta1r1, ta1r2, ta1r2), (ta1r1, ta1r3, ta1r3))), (ta1qW, (ta1r4, (ta1r5, ta1r6, ta1r6), (ta1r5, ta1r7, ta1r7)), (ta1r4, (ta1r8, ta1r9, ta1r9), (ta1r8, ta1ra, ta1ra))))), (ta1qF, (ta1rb, (ta1rc, (ta1rd, (ta1re, ta1rf, ta1rf), (ta1re, ta1rg, ta1rg)), (ta1rd, (ta1rh, ta1ri, ta1ri), (ta1rh, ta1rj, ta1rj))), (ta1rc, (ta1rk, (ta1rl, ta1rm, ta1rm), (ta1rl, ta1rn, ta1rn)), (ta1rk, (ta1ro, ta1rp, ta1rp), (ta1ro, ta1rq, ta1rq)))), (ta1rb, (ta1rr, (ta1rs, (ta1rt, ta1ru, ta1ru), (ta1rt, ta1rv, ta1rv)), (ta1rs, (ta1rw, ta1rx, ta1rx), (ta1rw, ta1ry, ta1ry))), (ta1rr, (ta1rz, (ta1rA, ta1rB, ta1rB), (ta1rA, ta1rC, ta1rC)), (ta1rz, (ta1rD, ta1rE, ta1rE), (ta1rD, ta1rF, ta1rF)))))), (ta1qE, (ta1rG, (ta1rH, (ta1rI, (ta1rJ, (ta1rK, ta1rL, ta1rL), (ta1rK, ta1rM, ta1rM)), (ta1rJ, (ta1rN, ta1rO, ta1rO), (ta1rN, ta1rP, ta1rP))), (ta1rI, (ta1rQ, (ta1rR, ta1rS, ta1rS), (ta1rR, ta1rT, ta1rT)), (ta1rQ, (ta1rU, ta1rV, ta1rV), (ta1rU, ta1rW, ta1rW)))), (ta1rH, (ta1rX, (ta1rY, (ta1rZ, ta1s0, ta1s0), (ta1rZ, ta1s1, ta1s1)), (ta1rY, (ta1s2, ta1s3, ta1s3), (ta1s2, ta1s4, ta1s4))), (ta1rX, (ta1s5, (ta1s6, ta1s7, ta1s7), (ta1s6, ta1s8, ta1s8)), (ta1s5, (ta1s9, ta1sa, ta1sa), (ta1s9, ta1sb, ta1sb))))), (ta1rG, (ta1sc, (ta1sd, (ta1se, (ta1sf, ta1sg, ta1sg), (ta1sf, ta1sh, ta1sh)), (ta1se, (ta1si, ta1sj, ta1sj), (ta1si, ta1sk, ta1sk))), (ta1sd, (ta1sl, (ta1sm, ta1sn, ta1sn), (ta1sm, ta1so, ta1so)), (ta1sl, (ta1sp, ta1sq, ta1sq), (ta1sp, ta1sr, ta1sr)))), (ta1sc, (ta1ss, (ta1st, (ta1su, ta1sv, ta1sv), (ta1su, ta1sw, ta1sw)), (ta1st, (ta1sx, ta1sy, ta1sy), (ta1sx, ta1sz, ta1sz))), (ta1ss, (ta1sA, (ta1sB, ta1sC, ta1sC), (ta1sB, ta1sD, ta1sD)), (ta1sA, (ta1sE, ta1sF, ta1sF), (ta1sE, ta1sG, ta1sG)))))))), ta1bK, (ta1ke, (ta1g7, (ta1g8, (ta1g9, (ta1ga, (ta1gb, (ta1gc, (ta1gd, ta1ge, ta1ge), (ta1gd, ta1gf, ta1gf)), (ta1gc, (ta1gg, ta1gh, ta1gh), (ta1gg, ta1gi, ta1gi))), (ta1gb, (ta1gj, (ta1gk, ta1gl, ta1gl), (ta1gk, ta1gm, ta1gm)), (ta1gj, (ta1gn, ta1go, ta1go), (ta1gn, ta1gp, ta1gp)))), (ta1ga, (ta1gq, (ta1gr, (ta1gs, ta1gt, ta1gt), (ta1gs, ta1gu, ta1gu)), (ta1gr, (ta1gv, ta1gw, ta1gw), (ta1gv, ta1gx, ta1gx))), (ta1gq, (ta1gy, (ta1gz, ta1gA, ta1gA), (ta1gz, ta1gB, ta1gB)), (ta1gy, (ta1gC, ta1gD, ta1gD), (ta1gC, ta1gE, ta1gE))))), (ta1g9, (ta1gF, (ta1gG, (ta1gH, (ta1gI, ta1gJ, ta1gJ), (ta1gI, ta1gK, ta1gK)), (ta1gH, (ta1gL, ta1gM, ta1gM), (ta1gL, ta1gN, ta1gN))), (ta1gG, (ta1gO, (ta1gP, ta1gQ, ta1gQ), (ta1gP, ta1gR, ta1gR)), (ta1gO, (ta1gS, ta1gT, ta1gT), (ta1gS, ta1gU, ta1gU)))), (ta1gF, (ta1gV, (ta1gW, (ta1gX, ta1gY, ta1gY), (ta1gX, ta1gZ, ta1gZ)), (ta1gW, (ta1h0, ta1h1, ta1h1), (ta1h0, ta1h2, ta1h2))), (ta1gV, (ta1h3, (ta1h4, ta1h5, ta1h5), (ta1h4, ta1h6, ta1h6)), (ta1h3, (ta1h7, ta1h8, ta1h8), (ta1h7, ta1h9, ta1h9)))))), (ta1g8, (ta1ha, (ta1hb, (ta1hc, (ta1hd, (ta1he, ta1hf, ta1hf), (ta1he, ta1hg, ta1hg)), (ta1hd, (ta1hh, ta1hi, ta1hi), (ta1hh, ta1hj, ta1hj))), (ta1hc, (ta1hk, (ta1hl, ta1hm, ta1hm), (ta1hl, ta1hn, ta1hn)), (ta1hk, (ta1ho, ta1hp, ta1hp), (ta1ho, ta1hq, ta1hq)))), (ta1hb, (ta1hr, (ta1hs, (ta1ht, ta1hu, ta1hu), (ta1ht, ta1hv, ta1hv)), (ta1hs, (ta1hw, ta1hx, ta1hx), (ta1hw, ta1hy, ta1hy))), (ta1hr, (ta1hz, (ta1hA, ta1hB, ta1hB), (ta1hA, ta1hC, ta1hC)), (ta1hz, (ta1hD, ta1hE, ta1hE), (ta1hD, ta1hF, ta1hF))))), (ta1ha, (ta1hG, (ta1hH, (ta1hI, (ta1hJ, ta1hK, ta1hK), (ta1hJ, ta1hL, ta1hL)), (ta1hI, (ta1hM, ta1hN, ta1hN), (ta1hM, ta1hO, ta1hO))), (ta1hH, (ta1hP, (ta1hQ, ta1hR, ta1hR), (ta1hQ, ta1hS, ta1hS)), (ta1hP, (ta1hT, ta1hU, ta1hU), (ta1hT, ta1hV, ta1hV)))), (ta1hG, (ta1hW, (ta1hX, (ta1hY, ta1hZ, ta1hZ), (ta1hY, ta1i0, ta1i0)), (ta1hX, (ta1i1, ta1i2, ta1i2), (ta1i1, ta1i3, ta1i3))), (ta1hW, (ta1i4, (ta1i5, ta1i6, ta1i6), (ta1i5, ta1i7, ta1i7)), (ta1i4, (ta1i8, ta1i9, ta1i9), (ta1i8, ta1ia, ta1ia))))))), (ta1g7, (ta1ib, (ta1ic, (ta1id, (ta1ie, (ta1if, (ta1ig, ta1ih, ta1ih), (ta1ig, ta1ii, ta1ii)), (ta1if, (ta1ij, ta1ik, ta1ik), (ta1ij, ta1il, ta1il))), (ta1ie, (ta1im, (ta1in, ta1io, ta1io), (ta1in, ta1ip, ta1ip)), (ta1im, (ta1iq, ta1ir, ta1ir), (ta1iq, ta1is, ta1is)))), (ta1id, (ta1it, (ta1iu, (ta1iv, ta1iw, ta1iw), (ta1iv, ta1ix, ta1ix)), (ta1iu, (ta1iy, ta1iz, ta1iz), (ta1iy, ta1iA, ta1iA))), (ta1it, (ta1iB, (ta1iC, ta1iD, ta1iD), (ta1iC, ta1iE, ta1iE)), (ta1iB, (ta1iF, ta1iG, ta1iG), (ta1iF, ta1iH, ta1iH))))), (ta1ic, (ta1iI, (ta1iJ, (ta1iK, (ta1iL, ta1iM, ta1iM), (ta1iL, ta1iN, ta1iN)), (ta1iK, (ta1iO, ta1iP, ta1iP), (ta1iO, ta1iQ, ta1iQ))), (ta1iJ, (ta1iR, (ta1iS, ta1iT, ta1iT), (ta1iS, ta1iU, ta1iU)), (ta1iR, (ta1iV, ta1iW, ta1iW), (ta1iV, ta1iX, ta1iX)))), (ta1iI, (ta1iY, (ta1iZ, (ta1j0, ta1j1, ta1j1), (ta1j0, ta1j2, ta1j2)), (ta1iZ, (ta1j3, ta1j4, ta1j4), (ta1j3, ta1j5, ta1j5))), (ta1iY, (ta1j6, (ta1j7, ta1j8, ta1j8), (ta1j7, ta1j9, ta1j9)), (ta1j6, (ta1ja, ta1jb, ta1jb), (ta1ja, ta1jc, ta1jc)))))), (ta1ib, (ta1jd, (ta1je, (ta1jf, (ta1jg, (ta1jh, ta1ji, ta1ji), (ta1jh, ta1jj, ta1jj)), (ta1jg, (ta1jk, ta1jl, ta1jl), (ta1jk, ta1jm, ta1jm))), (ta1jf, (ta1jn, (ta1jo, ta1jp, ta1jp), (ta1jo, ta1jq, ta1jq)), (ta1jn, (ta1jr, ta1js, ta1js), (ta1jr, ta1jt, ta1jt)))), (ta1je, (ta1ju, (ta1jv, (ta1jw, ta1jx, ta1jx), (ta1jw, ta1jy, ta1jy)), (ta1jv, (ta1jz, ta1jA, ta1jA), (ta1jz, ta1jB, ta1jB))), (ta1ju, (ta1jC, (ta1jD, ta1jE, ta1jE), (ta1jD, ta1jF, ta1jF)), (ta1jC, (ta1jG, ta1jH, ta1jH), (ta1jG, ta1jI, ta1jI))))), (ta1jd, (ta1jJ, (ta1jK, (ta1jL, (ta1jM, ta1jN, ta1jN), (ta1jM, ta1jO, ta1jO)), (ta1jL, (ta1jP, ta1jQ, ta1jQ), (ta1jP, ta1jR, ta1jR))), (ta1jK, (ta1jS, (ta1jT, ta1jU, ta1jU), (ta1jT, ta1jV, ta1jV)), (ta1jS, (ta1jW, ta1jX, ta1jX), (ta1jW, ta1jY, ta1jY)))), (ta1jJ, (ta1jZ, (ta1k0, (ta1k1, ta1k2, ta1k2), (ta1k1, ta1k3, ta1k3)), (ta1k0, (ta1k4, ta1k5, ta1k5), (ta1k4, ta1k6, ta1k6))), (ta1jZ, (ta1k7, (ta1k8, ta1k9, ta1k9), (ta1k8, ta1ka, ta1ka)), (ta1k7, (ta1kb, ta1kc, ta1kc), (ta1kb, ta1kd, ta1kd))))))))] g_rec8{-r5N,x-}
-																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																			  [ta1ke, GHC.Void{-3T,W-}, ta1g8, ta1g9, ta1ga, ta1gb, ta1gc, ta1gd, ta1ge, ta1gf, ta1gg, ta1gh, ta1gi, ta1gj, ta1gk, ta1gl, ta1gm, ta1gn, ta1go, ta1gp, ta1gq, ta1gr, ta1gs, ta1gt, ta1gu, ta1gv, ta1gw, ta1gx, ta1gy, ta1gz, ta1gA, ta1gB, ta1gC, ta1gD, ta1gE, ta1gF, ta1gG, ta1gH, ta1gI, ta1gJ, ta1gK, ta1gL, ta1gM, ta1gN, ta1gO, ta1gP, ta1gQ, ta1gR, ta1gS, ta1gT, ta1gU, ta1gV, ta1gW, ta1gX, ta1gY, ta1gZ, ta1h0, ta1h1, ta1h2, ta1h3, ta1h4, ta1h5, ta1h6, ta1h7, ta1h8, ta1h9, ta1ha, ta1hb, ta1hc, ta1hd, ta1he, ta1hf, ta1hg, ta1hh, ta1hi, ta1hj, ta1hk, ta1hl, ta1hm, ta1hn, ta1ho, ta1hp, ta1hq, ta1hr, ta1hs, ta1ht, ta1hu, ta1hv, ta1hw, ta1hx, ta1hy, ta1hz, ta1hA, ta1hB, ta1hC, ta1hD, ta1hE, ta1hF, ta1hG, ta1hH, ta1hI, ta1hJ, ta1hK, ta1hL, ta1hM, ta1hN, ta1hO, ta1hP, ta1hQ, ta1hR, ta1hS, ta1hT, ta1hU, ta1hV, ta1hW, ta1hX, ta1hY, ta1hZ, ta1i0, ta1i1, ta1i2, ta1i3, ta1i4, ta1i5, ta1i6, ta1i7, ta1i8, ta1i9, ta1ia, ta1g7, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, ta1ib, ta1ic, ta1id, ta1ie, ta1if, ta1ig, ta1ih, ta1ii, ta1ij, ta1ik, ta1il, ta1im, ta1in, ta1io, ta1ip, ta1iq, ta1ir, ta1is, ta1it, ta1iu, ta1iv, ta1iw, ta1ix, ta1iy, ta1iz, ta1iA, ta1iB, ta1iC, ta1iD, ta1iE, ta1iF, ta1iG, ta1iH, ta1iI, ta1iJ, ta1iK, ta1iL, ta1iM, ta1iN, ta1iO, ta1iP, ta1iQ, ta1iR, ta1iS, ta1iT, ta1iU, ta1iV, ta1iW, ta1iX, ta1iY, ta1iZ, ta1j0, ta1j1, ta1j2, ta1j3, ta1j4, ta1j5, ta1j6, ta1j7, ta1j8, ta1j9, ta1ja, ta1jb, ta1jc, ta1jd, ta1je, ta1jf, ta1jg, ta1jh, ta1ji, ta1jj, ta1jk, ta1jl, ta1jm, ta1jn, ta1jo, ta1jp, ta1jq, ta1jr, ta1js, ta1jt, ta1ju, ta1jv, ta1jw, ta1jx, ta1jy, ta1jz, ta1jA, ta1jB, ta1jC, ta1jD, ta1jE, ta1jF, ta1jG, ta1jH, ta1jI, ta1jJ, ta1jK, ta1jL, ta1jM, ta1jN, ta1jO, ta1jP, ta1jQ, ta1jR, ta1jS, ta1jT, ta1jU, ta1jV, ta1jW, ta1jX, ta1jY, ta1jZ, ta1k0, ta1k1, ta1k2, ta1k3, ta1k4, ta1k5, ta1k6, ta1k7, ta1k8, ta1k9, ta1ka, ta1kb, ta1kc, ta1kd, ta1fZ]
-																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																		      g_rec8{-r5N,x-}
-																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																			  [ta1ke, ta1ou, ta1oB, ta1oC, ta1oD, ta1oE, ta1oF, ta1oG, ta1oH, ta1oI, ta1oJ, ta1oK, ta1oL, ta1oM, ta1oN, ta1oO, ta1oP, ta1oQ, ta1oR, ta1oS, ta1oT, ta1oU, ta1oV, ta1oW, ta1oX, ta1oY, ta1oZ, ta1p0, ta1p1, ta1p2, ta1p3, ta1p4, ta1p5, ta1p6, ta1p7, ta1p8, ta1p9, ta1pa, ta1pb, ta1pc, ta1pd, ta1pe, ta1pf, ta1pg, ta1ph, ta1pi, ta1pj, ta1pk, ta1pl, ta1pm, ta1pn, ta1po, ta1pp, ta1pq, ta1pr, ta1ps, ta1pt, ta1pu, ta1pv, ta1pw, ta1px, ta1py, ta1pz, ta1pA, ta1pB, ta1pC, ta1pD, ta1pE, ta1pF, ta1pG, ta1pH, ta1pI, ta1pJ, ta1pK, ta1pL, ta1pM, ta1pN, ta1pO, ta1pP, ta1pQ, ta1pR, ta1pS, ta1pT, ta1pU, ta1pV, ta1pW, ta1pX, ta1pY, ta1pZ, ta1q0, ta1q1, ta1q2, ta1q3, ta1q4, ta1q5, ta1q6, ta1q7, ta1q8, ta1q9, ta1qa, ta1qb, ta1qc, ta1qd, ta1qe, ta1qf, ta1qg, ta1qh, ta1qi, ta1qj, ta1qk, ta1ql, ta1qm, ta1qn, ta1qo, ta1qp, ta1qq, ta1qr, ta1qs, ta1qt, ta1qu, ta1qv, ta1qw, ta1qx, ta1qy, ta1qz, ta1qA, ta1qB, ta1qC, ta1qD, ta1oA, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, ta1qE, ta1qF, ta1qG, ta1qH, ta1qI, ta1qJ, ta1qK, ta1qL, ta1qM, ta1qN, ta1qO, ta1qP, ta1qQ, ta1qR, ta1qS, ta1qT, ta1qU, ta1qV, ta1qW, ta1qX, ta1qY, ta1qZ, ta1r0, ta1r1, ta1r2, ta1r3, ta1r4, ta1r5, ta1r6, ta1r7, ta1r8, ta1r9, ta1ra, ta1rb, ta1rc, ta1rd, ta1re, ta1rf, ta1rg, ta1rh, ta1ri, ta1rj, ta1rk, ta1rl, ta1rm, ta1rn, ta1ro, ta1rp, ta1rq, ta1rr, ta1rs, ta1rt, ta1ru, ta1rv, ta1rw, ta1rx, ta1ry, ta1rz, ta1rA, ta1rB, ta1rC, ta1rD, ta1rE, ta1rF, ta1rG, ta1rH, ta1rI, ta1rJ, ta1rK, ta1rL, ta1rM, ta1rN, ta1rO, ta1rP, ta1rQ, ta1rR, ta1rS, ta1rT, ta1rU, ta1rV, ta1rW, ta1rX, ta1rY, ta1rZ, ta1s0, ta1s1, ta1s2, ta1s3, ta1s4, ta1s5, ta1s6, ta1s7, ta1s8, ta1s9, ta1sa, ta1sb, ta1sc, ta1sd, ta1se, ta1sf, ta1sg, ta1sh, ta1si, ta1sj, ta1sk, ta1sl, ta1sm, ta1sn, ta1so, ta1sp, ta1sq, ta1sr, ta1ss, ta1st, ta1su, ta1sv, ta1sw, ta1sx, ta1sy, ta1sz, ta1sA, ta1sB, ta1sC, ta1sD, ta1sE, ta1sF, ta1sG, ta1os]
-																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																		      x_r4S
-																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																		      y_r4T
-																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																		      z_r4U
-																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																		      p_r4V
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc090.stderr b/ghc/tests/typecheck/should_compile/tc090.stderr
index a19921fb0ee934fcdd8c3526454d78d4d3ce5d51..5ef41cbf8457e6e07a70c08699b620e3b1bd4163 100644
--- a/ghc/tests/typecheck/should_compile/tc090.stderr
+++ b/ghc/tests/typecheck/should_compile/tc090.stderr
@@ -1,15 +1,3 @@
-==================== Typechecked ====================
-AbsBinds
-[taBp]
-[d.Ord_aBy]
-[([taBp], a{-r3h,x-}, a_aBn), ([taBp], b{-r3i,x-}, b_aBo)]
-    d.Ord_aBA = d.Ord_aBy
-    b_aBE = b{-r3i,x-} taBp d.Ord_aBA
-    d.Ord_aBC = d.Ord_aBy
-    a_aBD = a{-r3h,x-} taBp d.Ord_aBC
-    a_aBn = b_aBE
-    b_aBo = a_aBD
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_compile/tc091.stderr b/ghc/tests/typecheck/should_compile/tc091.stderr
index 1e9e50da49e2a583ee71589ddef6965e1045dfd3..bbb399aeb46f442eb5df836972c5832cd67cca5c 100644
--- a/ghc/tests/typecheck/should_compile/tc091.stderr
+++ b/ghc/tests/typecheck/should_compile/tc091.stderr
@@ -1,43 +1,3 @@
-==================== Typechecked ====================
-AbsBinds [taWg] [] [([taWg], init_last{-r3m,x-}, init_last_aWd)]
-    init_last_aWd a_r3E b_r3F = (a_r3E, a_r3E)
-AbsBinds [taWp] [d.Ord_aWt] [([taWp], merge{-r3l,x-}, merge_aWm)]
-    merge_aWm xs_r3B ys_r3C = xs_r3B
-AbsBinds [taWA] [d.Ord_aXy] [([taWA], sort{-r3k,x-}, sort_aWx)]
-    d.Ord_aXw = d.Ord_aXy
-    sort_aWx xs_r3o
-	     = s_aXL xs_r3o PrelList.length{-rhD,p-} taWA xs_r3o
-	     where
-		 {- nonrec -}
-		 AbsBinds [taWH] [d.Ord_aXh] [([taWH], s_r3q, s_aWE)]
-		     d.Ord_aXl = d.Ord_aXh
-		     merge_aXO = merge{-r3l,x-} taWH d.Ord_aXl
-		     d.Ord_aXn = d.Ord_aXh
-		     sort_aXN = sort{-r3k,x-} taWH d.Ord_aXn
-		     sort_aXM = sort_aXN
-		     s_aWE xs_r3u k_r3v
-			   = if k_r3v <=_aXK lit_aXJ then
-				 xs_r3u
-			     else
-				 merge_aXO sort_aXN ys_r3x sort_aXM zs_r3y
-			   where
-			       {- nonrec -}
-			       AbsBinds [] [] [([], ys_r3x, ys_aWK), ([], zs_r3y, zs_aWL)]
-				   (ys_aWK, zs_aWL)
-				       = init_last{-r3m,x-} taWH xs_r3u
-								 k_r3v
-								 div_aXI (PrelBase.I#{-5b,w-}{i} 2#)
-			       {- nonrec -}
-			       {- nonrec -}
-		 {- nonrec -}
-		 s_aXL = s_r3q taWA d.Ord_aXw
-		 {- nonrec -}
-d.Ord_aXE = PrelBase.$d7{-rrR,p-}
-<=_aXK = PrelBase.<={-rqO,p-} PrelBase.Int{-3g,W-} d.Ord_aXE
-lit_aXJ = PrelBase.I#{-5b,w-}{i} 1#
-d.Integral_aXH = PrelNum.$d36{-rFA,p-}
-div_aXI = PrelNum.div{-ry2,p-} PrelBase.Int{-3g,W-} d.Integral_aXH
-
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
diff --git a/ghc/tests/typecheck/should_fail/tcfail046.stderr b/ghc/tests/typecheck/should_fail/tcfail046.stderr
index 7c9e941d54804b0590ca10df7111a381b3e91c0c..9a5aae59c9ce4b254782d42d136120e3a6101a7a 100644
--- a/ghc/tests/typecheck/should_fail/tcfail046.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail046.stderr
@@ -1,7 +1,4 @@
  
-tcfail046.hs:4: No instance for: `PrelBase.Eq (Process a)'
-    When deriving classes for `Message'
- 
 tcfail046.hs:4: No instance for: `PrelBase.Eq (Process a)'
     When deriving classes for `Continuation'
  
@@ -10,5 +7,8 @@ tcfail046.hs:4: No instance for: `PrelBase.Eq (Process a)'
  
 tcfail046.hs:4: No instance for: `PrelBase.Eq (Process a)'
     When deriving classes for `Continuation'
+ 
+tcfail046.hs:4: No instance for: `PrelBase.Eq (Process a)'
+    When deriving classes for `Message'
 
 Compilation had errors