From 17f2e4cee594f8922bed6c3a8101a77c7fcb1977 Mon Sep 17 00:00:00 2001
From: sof <unknown>
Date: Thu, 30 Apr 1998 20:35:29 +0000
Subject: [PATCH] [project @ 1998-04-30 20:31:10 by sof] 3.02 changes plus
 don't emit the usages section of interface files

---
 ghc/tests/typecheck/should_compile/Makefile      |  3 ++-
 ghc/tests/typecheck/should_compile/tc001.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc002.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc003.stderr  |  7 -------
 ghc/tests/typecheck/should_compile/tc004.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc005.stderr  |  7 -------
 ghc/tests/typecheck/should_compile/tc006.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc007.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc008.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc009.stderr  |  7 -------
 ghc/tests/typecheck/should_compile/tc010.stderr  |  7 -------
 ghc/tests/typecheck/should_compile/tc011.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc012.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc013.stderr  |  7 -------
 ghc/tests/typecheck/should_compile/tc014.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc015.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc016.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc017.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc018.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc019.stderr  |  7 -------
 ghc/tests/typecheck/should_compile/tc020.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc021.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc022.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc023.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc024.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc025.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc026.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc027.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc028.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc029.stderr  |  5 -----
 ghc/tests/typecheck/should_compile/tc030.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc031.stderr  |  5 -----
 ghc/tests/typecheck/should_compile/tc032.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc033.stderr  |  5 -----
 ghc/tests/typecheck/should_compile/tc034.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc035.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc036.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc037.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc038.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc039.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc040.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc041.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc042.stderr  |  5 -----
 ghc/tests/typecheck/should_compile/tc043.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc044.stderr  |  5 -----
 ghc/tests/typecheck/should_compile/tc045.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc046.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc047.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc048.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc049.stderr  |  7 -------
 ghc/tests/typecheck/should_compile/tc050.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc051.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc052.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc053.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc054.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc055.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc056.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc057.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc058.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc059.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc060.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc061.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc062.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc063.stderr  |  5 -----
 ghc/tests/typecheck/should_compile/tc064.stderr  |  5 -----
 ghc/tests/typecheck/should_compile/tc065.stderr  | 10 ----------
 ghc/tests/typecheck/should_compile/tc066.stderr  |  5 -----
 ghc/tests/typecheck/should_compile/tc067.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc068.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc069.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc070.stderr  |  5 -----
 ghc/tests/typecheck/should_compile/tc073.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc074.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc076.stderr  |  5 -----
 ghc/tests/typecheck/should_compile/tc077.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc078.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc079.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc080.stderr  |  8 --------
 ghc/tests/typecheck/should_compile/tc081.stderr  |  7 -------
 ghc/tests/typecheck/should_compile/tc082.stderr  |  5 -----
 ghc/tests/typecheck/should_compile/tc084.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc085.stderr  |  9 +--------
 ghc/tests/typecheck/should_compile/tc086.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc087.stderr  | 10 ----------
 ghc/tests/typecheck/should_compile/tc088.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc089.stderr  |  3 ---
 ghc/tests/typecheck/should_compile/tc090.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc091.stderr  |  8 --------
 ghc/tests/typecheck/should_compile/tc092.stderr  |  6 ------
 ghc/tests/typecheck/should_compile/tc093.stderr  |  7 -------
 ghc/tests/typecheck/should_compile/tc094.stderr  |  7 -------
 ghc/tests/typecheck/should_compile/tc095.stderr  | 10 ----------
 ghc/tests/typecheck/should_fail/tcfail001.stderr |  4 ++--
 ghc/tests/typecheck/should_fail/tcfail002.stderr |  6 +++---
 ghc/tests/typecheck/should_fail/tcfail004.stderr |  6 +++---
 ghc/tests/typecheck/should_fail/tcfail005.stderr |  6 +++---
 ghc/tests/typecheck/should_fail/tcfail008.stderr |  8 ++++----
 ghc/tests/typecheck/should_fail/tcfail010.stderr |  4 ++--
 ghc/tests/typecheck/should_fail/tcfail012.stderr |  4 ++--
 ghc/tests/typecheck/should_fail/tcfail013.stderr |  4 ++--
 ghc/tests/typecheck/should_fail/tcfail014.stderr |  6 +++---
 ghc/tests/typecheck/should_fail/tcfail016.stderr |  6 +++---
 ghc/tests/typecheck/should_fail/tcfail018.stderr |  4 ++--
 ghc/tests/typecheck/should_fail/tcfail028.stderr |  4 ++--
 ghc/tests/typecheck/should_fail/tcfail033.stderr |  6 +++---
 ghc/tests/typecheck/should_fail/tcfail040.stderr |  4 ++--
 ghc/tests/typecheck/should_fail/tcfail065.stderr |  4 ++--
 ghc/tests/typecheck/should_fail/tcfail068.stderr | 16 ++++++++--------
 ghc/tests/typecheck/should_fail/tcfail069.stderr |  6 +++---
 ghc/tests/typecheck/should_fail/tcfail070.stderr |  4 ++--
 ghc/tests/typecheck/should_fail/tcfail071.stderr |  2 +-
 ghc/tests/typecheck/should_fail/tcfail072.stderr |  8 ++++----
 ghc/tests/typecheck/should_fail/tcfail076.stderr |  4 ++--
 ghc/tests/typecheck/should_fail/tcfail080.stderr |  4 ++--
 ghc/tests/typecheck/should_run/tcrun002.hs       |  6 ++----
 115 files changed, 65 insertions(+), 538 deletions(-)

diff --git a/ghc/tests/typecheck/should_compile/Makefile b/ghc/tests/typecheck/should_compile/Makefile
index 662ec6c27bf4..c35a8f84312e 100644
--- a/ghc/tests/typecheck/should_compile/Makefile
+++ b/ghc/tests/typecheck/should_compile/Makefile
@@ -2,9 +2,10 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/should_compile.mk
 
-HC_OPTS += -noC -dcore-lint -fno-warn-incomplete-patterns -hi
+HC_OPTS += -noC -dcore-lint -fno-warn-incomplete-patterns -hi-with-declarations -hi-with-instances -hi-with-exports
 
 tc019_HC_OPTS = -fglasgow-exts
 tc065_HC_OPTS = -syslib misc
+tc097_HC_OPTS = -fglasgow-exts
 
 include $(TOP)/mk/target.mk
diff --git a/ghc/tests/typecheck/should_compile/tc001.stderr b/ghc/tests/typecheck/should_compile/tc001.stderr
index 93e6393481c7..2c8604234854 100644
--- a/ghc/tests/typecheck/should_compile/tc001.stderr
+++ b/ghc/tests/typecheck/should_compile/tc001.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed a;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc002.stderr b/ghc/tests/typecheck/should_compile/tc002.stderr
index ada69ec3dffe..ef628998b002 100644
--- a/ghc/tests/typecheck/should_compile/tc002.stderr
+++ b/ghc/tests/typecheck/should_compile/tc002.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed b;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc003.stderr b/ghc/tests/typecheck/should_compile/tc003.stderr
index cdb3334c368d..f2bae39acd03 100644
--- a/ghc/tests/typecheck/should_compile/tc003.stderr
+++ b/ghc/tests/typecheck/should_compile/tc003.stderr
@@ -1,11 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
-PrelTup 1 :: $dEq0 1 $dEval0 1 $dShow3 1;
 _exports_
 ShouldSucceed c d e;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc004.stderr b/ghc/tests/typecheck/should_compile/tc004.stderr
index ab45c330a319..118b49890795 100644
--- a/ghc/tests/typecheck/should_compile/tc004.stderr
+++ b/ghc/tests/typecheck/should_compile/tc004.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed f;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc005.stderr b/ghc/tests/typecheck/should_compile/tc005.stderr
index d8b54d358f9f..40839ad86c6f 100644
--- a/ghc/tests/typecheck/should_compile/tc005.stderr
+++ b/ghc/tests/typecheck/should_compile/tc005.stderr
@@ -1,11 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
-PrelTup 1 :: $dEq0 1 $dEval0 1 $dShow3 1;
 _exports_
 ShouldSucceed g;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc006.stderr b/ghc/tests/typecheck/should_compile/tc006.stderr
index 64397779008d..b728f25ee475 100644
--- a/ghc/tests/typecheck/should_compile/tc006.stderr
+++ b/ghc/tests/typecheck/should_compile/tc006.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed h;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc007.stderr b/ghc/tests/typecheck/should_compile/tc007.stderr
index 92a9e2c2dd62..eb40bf86d152 100644
--- a/ghc/tests/typecheck/should_compile/tc007.stderr
+++ b/ghc/tests/typecheck/should_compile/tc007.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed j k l m;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc008.stderr b/ghc/tests/typecheck/should_compile/tc008.stderr
index 49f72cce05fd..de21ecf2b18b 100644
--- a/ghc/tests/typecheck/should_compile/tc008.stderr
+++ b/ghc/tests/typecheck/should_compile/tc008.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed n;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc009.stderr b/ghc/tests/typecheck/should_compile/tc009.stderr
index acb5d05ddda8..798cdd0e7903 100644
--- a/ghc/tests/typecheck/should_compile/tc009.stderr
+++ b/ghc/tests/typecheck/should_compile/tc009.stderr
@@ -1,11 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
-PrelTup 1 :: $dEq0 1 $dEval0 1 $dShow3 1;
 _exports_
 ShouldSucceed o;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc010.stderr b/ghc/tests/typecheck/should_compile/tc010.stderr
index 6c11d13f54a2..203846d49894 100644
--- a/ghc/tests/typecheck/should_compile/tc010.stderr
+++ b/ghc/tests/typecheck/should_compile/tc010.stderr
@@ -1,11 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dMonad0 1 $dMonadZero0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $m>> 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Monad 1 MonadZero 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
-PrelTup 1 :: $dEq0 1 $dEval0 1 $dShow3 1;
 _exports_
 ShouldSucceed p;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc011.stderr b/ghc/tests/typecheck/should_compile/tc011.stderr
index 26c8dc07cb8b..221865a2fb3f 100644
--- a/ghc/tests/typecheck/should_compile/tc011.stderr
+++ b/ghc/tests/typecheck/should_compile/tc011.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed x;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc012.stderr b/ghc/tests/typecheck/should_compile/tc012.stderr
index 4db034f48292..f7f32bc52f9f 100644
--- a/ghc/tests/typecheck/should_compile/tc012.stderr
+++ b/ghc/tests/typecheck/should_compile/tc012.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed q;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc013.stderr b/ghc/tests/typecheck/should_compile/tc013.stderr
index 297a6b77330d..116c33aa81b8 100644
--- a/ghc/tests/typecheck/should_compile/tc013.stderr
+++ b/ghc/tests/typecheck/should_compile/tc013.stderr
@@ -1,11 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
-PrelTup 1 :: $dEq0 1 $dEval0 1 $dShow3 1;
 _exports_
 ShouldSucceed r s;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc014.stderr b/ghc/tests/typecheck/should_compile/tc014.stderr
index 03b117ca761d..1686aac720bd 100644
--- a/ghc/tests/typecheck/should_compile/tc014.stderr
+++ b/ghc/tests/typecheck/should_compile/tc014.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed t;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc015.stderr b/ghc/tests/typecheck/should_compile/tc015.stderr
index 8f27fdaf277d..e63a8cf16974 100644
--- a/ghc/tests/typecheck/should_compile/tc015.stderr
+++ b/ghc/tests/typecheck/should_compile/tc015.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed u;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc016.stderr b/ghc/tests/typecheck/should_compile/tc016.stderr
index 3dcde44f9383..4bebb9c94617 100644
--- a/ghc/tests/typecheck/should_compile/tc016.stderr
+++ b/ghc/tests/typecheck/should_compile/tc016.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed f;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc017.stderr b/ghc/tests/typecheck/should_compile/tc017.stderr
index 0a002ba1d76a..a595c1057b49 100644
--- a/ghc/tests/typecheck/should_compile/tc017.stderr
+++ b/ghc/tests/typecheck/should_compile/tc017.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed v;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc018.stderr b/ghc/tests/typecheck/should_compile/tc018.stderr
index 55ebd4a98a64..58ed185b4ae3 100644
--- a/ghc/tests/typecheck/should_compile/tc018.stderr
+++ b/ghc/tests/typecheck/should_compile/tc018.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed w;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc019.stderr b/ghc/tests/typecheck/should_compile/tc019.stderr
index 0f290aee0b43..3dbc6eb8f095 100644
--- a/ghc/tests/typecheck/should_compile/tc019.stderr
+++ b/ghc/tests/typecheck/should_compile/tc019.stderr
@@ -1,11 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dMonad0 1 $dMonadZero0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $m>> 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Monad 1 MonadZero 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
-PrelTup 1 :: $dEq0 1 $dEval0 1 $dShow3 1;
 _exports_
 ShouldSucceed al am;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc020.stderr b/ghc/tests/typecheck/should_compile/tc020.stderr
index a092b93dbf96..f461f84b90d5 100644
--- a/ghc/tests/typecheck/should_compile/tc020.stderr
+++ b/ghc/tests/typecheck/should_compile/tc020.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed f;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc021.stderr b/ghc/tests/typecheck/should_compile/tc021.stderr
index ba12aa08fbaa..92ddc200f313 100644
--- a/ghc/tests/typecheck/should_compile/tc021.stderr
+++ b/ghc/tests/typecheck/should_compile/tc021.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed a f x;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc022.stderr b/ghc/tests/typecheck/should_compile/tc022.stderr
index 076a783208c6..aebfbac24768 100644
--- a/ghc/tests/typecheck/should_compile/tc022.stderr
+++ b/ghc/tests/typecheck/should_compile/tc022.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed iD main;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc023.stderr b/ghc/tests/typecheck/should_compile/tc023.stderr
index cc14d782bf57..ee47e923e6fd 100644
--- a/ghc/tests/typecheck/should_compile/tc023.stderr
+++ b/ghc/tests/typecheck/should_compile/tc023.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed k main s;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc024.stderr b/ghc/tests/typecheck/should_compile/tc024.stderr
index cc14d782bf57..ee47e923e6fd 100644
--- a/ghc/tests/typecheck/should_compile/tc024.stderr
+++ b/ghc/tests/typecheck/should_compile/tc024.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed k main s;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc025.stderr b/ghc/tests/typecheck/should_compile/tc025.stderr
index a5cbaeca7280..d9d19353b0cf 100644
--- a/ghc/tests/typecheck/should_compile/tc025.stderr
+++ b/ghc/tests/typecheck/should_compile/tc025.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed g;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc026.stderr b/ghc/tests/typecheck/should_compile/tc026.stderr
index fd02afe1388f..70334631bab2 100644
--- a/ghc/tests/typecheck/should_compile/tc026.stderr
+++ b/ghc/tests/typecheck/should_compile/tc026.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed f g;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc027.stderr b/ghc/tests/typecheck/should_compile/tc027.stderr
index 680cc73e704c..0e2072ce8b0f 100644
--- a/ghc/tests/typecheck/should_compile/tc027.stderr
+++ b/ghc/tests/typecheck/should_compile/tc027.stderr
@@ -1,9 +1,6 @@
 
 NOTE: Simplifier still going after 4 iterations; bailing out.
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed f g h;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc028.stderr b/ghc/tests/typecheck/should_compile/tc028.stderr
index d3cb7d371c38..0ec287baa2fd 100644
--- a/ghc/tests/typecheck/should_compile/tc028.stderr
+++ b/ghc/tests/typecheck/should_compile/tc028.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed H;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc029.stderr b/ghc/tests/typecheck/should_compile/tc029.stderr
index f8e6a2171e70..4b707052e6b9 100644
--- a/ghc/tests/typecheck/should_compile/tc029.stderr
+++ b/ghc/tests/typecheck/should_compile/tc029.stderr
@@ -1,9 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalDouble0 1 $dEvalInt0 1 Eval 1;
 _exports_
 ShouldSucceed G K(H M);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc030.stderr b/ghc/tests/typecheck/should_compile/tc030.stderr
index 79689c0914b5..6c905b7c758e 100644
--- a/ghc/tests/typecheck/should_compile/tc030.stderr
+++ b/ghc/tests/typecheck/should_compile/tc030.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed G H;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc031.stderr b/ghc/tests/typecheck/should_compile/tc031.stderr
index 81b8f9172741..33aa884a6f60 100644
--- a/ghc/tests/typecheck/should_compile/tc031.stderr
+++ b/ghc/tests/typecheck/should_compile/tc031.stderr
@@ -1,9 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEval0 1 $dEval2 1 $dEvalBool0 1 $dEvalDouble0 1 $dEvalInt0 1 Eval 1;
 _exports_
 ShouldSucceed Rec(Node);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc032.stderr b/ghc/tests/typecheck/should_compile/tc032.stderr
index 4c63ae1cfd63..77f034b126d4 100644
--- a/ghc/tests/typecheck/should_compile/tc032.stderr
+++ b/ghc/tests/typecheck/should_compile/tc032.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 Eval 1;
-PrelTup 1 :: $dEval0 1;
 _exports_
 ShouldSucceed AList(Node Other);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc033.stderr b/ghc/tests/typecheck/should_compile/tc033.stderr
index 2052d95a5909..59e7b1b7a2d6 100644
--- a/ghc/tests/typecheck/should_compile/tc033.stderr
+++ b/ghc/tests/typecheck/should_compile/tc033.stderr
@@ -1,9 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEval0 1 $dEval2 1 $dEvalBool0 1 $dEvalDouble0 1 $dEvalInt0 1 Eval 1;
 _exports_
 ShouldSucceed F Twine(Twine2) Twist(Twist2);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc034.stderr b/ghc/tests/typecheck/should_compile/tc034.stderr
index 02028dbcc7cd..17c9de227111 100644
--- a/ghc/tests/typecheck/should_compile/tc034.stderr
+++ b/ghc/tests/typecheck/should_compile/tc034.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed g AList(ANull ANode) IntList;
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc035.stderr b/ghc/tests/typecheck/should_compile/tc035.stderr
index 066a4ddc5586..3e8b793ff3ce 100644
--- a/ghc/tests/typecheck/should_compile/tc035.stderr
+++ b/ghc/tests/typecheck/should_compile/tc035.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dMonad0 1 $dMonadPlus0 1 $dMonadZero0 1 $m>> 1 Eval 1 Monad 1 MonadPlus 1 MonadZero 1;
-PrelTup 1 :: $dEval0 1;
 _exports_
 ShouldSucceed g AnnExpr Expr(Var App);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc036.stderr b/ghc/tests/typecheck/should_compile/tc036.stderr
index 1cf9b8ee8486..257bfbd0577e 100644
--- a/ghc/tests/typecheck/should_compile/tc036.stderr
+++ b/ghc/tests/typecheck/should_compile/tc036.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEqBool0 1 $dEqInt0 1 $m/= 1 Eq 1;
-PrelNum 1 :: $dEqDouble0 1;
 _exports_
 ShouldSucceed A(:A :A op1);
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc037.stderr b/ghc/tests/typecheck/should_compile/tc037.stderr
index 552fff2132bd..f74fa02baee1 100644
--- a/ghc/tests/typecheck/should_compile/tc037.stderr
+++ b/ghc/tests/typecheck/should_compile/tc037.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed Eq'(:Eq' :Eq' deq);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc038.stderr b/ghc/tests/typecheck/should_compile/tc038.stderr
index 7761e032404c..9f9f69f0044c 100644
--- a/ghc/tests/typecheck/should_compile/tc038.stderr
+++ b/ghc/tests/typecheck/should_compile/tc038.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed f;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc039.stderr b/ghc/tests/typecheck/should_compile/tc039.stderr
index 1cf9b8ee8486..257bfbd0577e 100644
--- a/ghc/tests/typecheck/should_compile/tc039.stderr
+++ b/ghc/tests/typecheck/should_compile/tc039.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEqBool0 1 $dEqInt0 1 $m/= 1 Eq 1;
-PrelNum 1 :: $dEqDouble0 1;
 _exports_
 ShouldSucceed A(:A :A op1);
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc040.stderr b/ghc/tests/typecheck/should_compile/tc040.stderr
index 5e90e5a33abc..f152e887a448 100644
--- a/ghc/tests/typecheck/should_compile/tc040.stderr
+++ b/ghc/tests/typecheck/should_compile/tc040.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqInt0 1 $m/= 1 Eq 1;
-PrelNum 1 :: $dEqDouble0 1;
 _exports_
 ShouldSucceed f;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc041.stderr b/ghc/tests/typecheck/should_compile/tc041.stderr
index 9a8d433ee20d..5dbc6f6d4b76 100644
--- a/ghc/tests/typecheck/should_compile/tc041.stderr
+++ b/ghc/tests/typecheck/should_compile/tc041.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed f H(:H :H op1);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc042.stderr b/ghc/tests/typecheck/should_compile/tc042.stderr
index e5d4bb6d9be8..16b34840f668 100644
--- a/ghc/tests/typecheck/should_compile/tc042.stderr
+++ b/ghc/tests/typecheck/should_compile/tc042.stderr
@@ -1,9 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEval0 1 $dEval2 1 $dEvalBool0 1 $dEvalDouble0 1 $dEvalInt0 1 Eval 1;
 _exports_
 ShouldSucceed add app before flatten idb idl lEngth nUll neg rEverse sUm swap Boolean(FF TT) List(Nil Cons) Nat(Zero Succ) Pair(Mkpair) Tree(Leaf Node);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc043.stderr b/ghc/tests/typecheck/should_compile/tc043.stderr
index 8c0dd0dc74cb..afcc264ed8f3 100644
--- a/ghc/tests/typecheck/should_compile/tc043.stderr
+++ b/ghc/tests/typecheck/should_compile/tc043.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed f A(:A :A op1) B(:B :B op2);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc044.stderr b/ghc/tests/typecheck/should_compile/tc044.stderr
index 96ddf5cec48d..8999dbf5e57a 100644
--- a/ghc/tests/typecheck/should_compile/tc044.stderr
+++ b/ghc/tests/typecheck/should_compile/tc044.stderr
@@ -1,9 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: otherwise 1;
 _exports_
 ShouldSucceed f;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc045.stderr b/ghc/tests/typecheck/should_compile/tc045.stderr
index c89763d28a1e..6dfe21e0909d 100644
--- a/ghc/tests/typecheck/should_compile/tc045.stderr
+++ b/ghc/tests/typecheck/should_compile/tc045.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed B(:B :B op2) C(:C :C op1);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc046.stderr b/ghc/tests/typecheck/should_compile/tc046.stderr
index 330c62e05e56..ae045aa98675 100644
--- a/ghc/tests/typecheck/should_compile/tc046.stderr
+++ b/ghc/tests/typecheck/should_compile/tc046.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed B(:B :B op2) C(:C :C op1);
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc047.stderr b/ghc/tests/typecheck/should_compile/tc047.stderr
index ad5d0891f610..4fa71f47439b 100644
--- a/ghc/tests/typecheck/should_compile/tc047.stderr
+++ b/ghc/tests/typecheck/should_compile/tc047.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed f mp sd OL;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc048.stderr b/ghc/tests/typecheck/should_compile/tc048.stderr
index 1d2568dcdf31..400bbf56a5e0 100644
--- a/ghc/tests/typecheck/should_compile/tc048.stderr
+++ b/ghc/tests/typecheck/should_compile/tc048.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalDouble0 1 $dEvalInt0 1 Eval 1;
-PrelTup 1 :: $dEval0 1;
 _exports_
 ShouldSucceed mAp ranAFE ranOAL sNd AFE(MkAFE) FG(MkFG) OL(MkOL);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc049.stderr b/ghc/tests/typecheck/should_compile/tc049.stderr
index db97ed898297..5e77c6db5c13 100644
--- a/ghc/tests/typecheck/should_compile/tc049.stderr
+++ b/ghc/tests/typecheck/should_compile/tc049.stderr
@@ -1,11 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEqOrdering0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dEvalOrdering0 1 $dNumInt0 1 $dOrd0 1 $dOrd1 1 $dOrdBool0 1 $dOrdChar0 1 $dOrdInt0 1 $dOrdOrdering0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $dShowOrdering0 1 $m- 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $mfromInt 1 $mmax 1 $mmin 1 $mshowList 1 Eq 1 Eval 1 Num 1 Ord 1 Ordering 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dOrdDouble0 1 $dOrdInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
-PrelTup 1 :: $dEq0 1 $dEval0 1 $dOrd0 1 $dShow3 1;
 _exports_
 ShouldSucceed fib main1 main2 main3 mem mem1 mem2 mem3 mem4 oR oR1;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc050.stderr b/ghc/tests/typecheck/should_compile/tc050.stderr
index 8be32a9413b5..6958c61a9e93 100644
--- a/ghc/tests/typecheck/should_compile/tc050.stderr
+++ b/ghc/tests/typecheck/should_compile/tc050.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed f g Foo(:Foo :Foo o_and);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc051.stderr b/ghc/tests/typecheck/should_compile/tc051.stderr
index efafb7dceadd..eb4745fbda5c 100644
--- a/ghc/tests/typecheck/should_compile/tc051.stderr
+++ b/ghc/tests/typecheck/should_compile/tc051.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed Eq'(:Eq' :Eq' doubleeq) Ord'(:Ord' :Ord' lt);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc052.stderr b/ghc/tests/typecheck/should_compile/tc052.stderr
index f8132cb00ab6..69084badeece 100644
--- a/ghc/tests/typecheck/should_compile/tc052.stderr
+++ b/ghc/tests/typecheck/should_compile/tc052.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed A B C;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc053.stderr b/ghc/tests/typecheck/should_compile/tc053.stderr
index 0897c0f46ca2..4ca8186e3dd2 100644
--- a/ghc/tests/typecheck/should_compile/tc053.stderr
+++ b/ghc/tests/typecheck/should_compile/tc053.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed f Eq'(:Eq' :Eq' deq);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc054.stderr b/ghc/tests/typecheck/should_compile/tc054.stderr
index 1f8ebf1813a9..7139413685c8 100644
--- a/ghc/tests/typecheck/should_compile/tc054.stderr
+++ b/ghc/tests/typecheck/should_compile/tc054.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 otherwise 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed f Eq'(:Eq' :Eq' doubleeq) Ord'(:Ord' :Ord' lt);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc055.stderr b/ghc/tests/typecheck/should_compile/tc055.stderr
index 56fb3274e254..2dfd583cdee7 100644
--- a/ghc/tests/typecheck/should_compile/tc055.stderr
+++ b/ghc/tests/typecheck/should_compile/tc055.stderr
@@ -1,9 +1,6 @@
 
 NOTE: Simplifier still going after 4 iterations; bailing out.
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed x y;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc056.stderr b/ghc/tests/typecheck/should_compile/tc056.stderr
index b65e7cfb57e8..ca654bb1ec4a 100644
--- a/ghc/tests/typecheck/should_compile/tc056.stderr
+++ b/ghc/tests/typecheck/should_compile/tc056.stderr
@@ -3,12 +3,6 @@ tc056.hs:15: Warning:
     Duplicated class assertion `Eq' a' in the context: (Eq' a, Eq' a)
 
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed f Eq'(:Eq' :Eq' doubleeq) Ord'(:Ord' :Ord' lt);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc057.stderr b/ghc/tests/typecheck/should_compile/tc057.stderr
index 8a236389c77f..1afaa8040180 100644
--- a/ghc/tests/typecheck/should_compile/tc057.stderr
+++ b/ghc/tests/typecheck/should_compile/tc057.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed dand f Eq'(:Eq' :Eq' deq);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc058.stderr b/ghc/tests/typecheck/should_compile/tc058.stderr
index cf0354bd3a6d..2b8ad2783dbd 100644
--- a/ghc/tests/typecheck/should_compile/tc058.stderr
+++ b/ghc/tests/typecheck/should_compile/tc058.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed f Eq2(:Eq2 :Eq2 doubleeq) Ord2(:Ord2 :Ord2 lt);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc059.stderr b/ghc/tests/typecheck/should_compile/tc059.stderr
index 17a0adc0d42f..2e3350bb2882 100644
--- a/ghc/tests/typecheck/should_compile/tc059.stderr
+++ b/ghc/tests/typecheck/should_compile/tc059.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed f Eq2(:Eq2 :Eq2 foo deq);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc060.stderr b/ghc/tests/typecheck/should_compile/tc060.stderr
index 487e3b885d09..825c3a627721 100644
--- a/ghc/tests/typecheck/should_compile/tc060.stderr
+++ b/ghc/tests/typecheck/should_compile/tc060.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed Eq2(:Eq2 :Eq2 deq);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc061.stderr b/ghc/tests/typecheck/should_compile/tc061.stderr
index fdb407451b3d..2943fd4b8f33 100644
--- a/ghc/tests/typecheck/should_compile/tc061.stderr
+++ b/ghc/tests/typecheck/should_compile/tc061.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed Eq1(:Eq1 :Eq1 deq);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc062.stderr b/ghc/tests/typecheck/should_compile/tc062.stderr
index 1d3bfec6d7cb..5b8105254882 100644
--- a/ghc/tests/typecheck/should_compile/tc062.stderr
+++ b/ghc/tests/typecheck/should_compile/tc062.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed f Eq1(:Eq1 :Eq1 deq);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc063.stderr b/ghc/tests/typecheck/should_compile/tc063.stderr
index 79a39d987cd3..9b1d8fe6ff1d 100644
--- a/ghc/tests/typecheck/should_compile/tc063.stderr
+++ b/ghc/tests/typecheck/should_compile/tc063.stderr
@@ -1,9 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEval0 1 $dEval2 1 $dEvalBool0 1 $dEvalDouble0 1 $dEvalInt0 1 Eval 1;
 _exports_
 ShouldSucceed g Reps(:Reps :Reps f) X(Tag);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc064.stderr b/ghc/tests/typecheck/should_compile/tc064.stderr
index d9d4448eddb9..5734a1dac7f7 100644
--- a/ghc/tests/typecheck/should_compile/tc064.stderr
+++ b/ghc/tests/typecheck/should_compile/tc064.stderr
@@ -1,9 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEval0 1 $dEval2 1 $dEvalBool0 1 $dEvalDouble0 1 $dEvalInt0 1 Eval 1;
 _exports_
 ShouldSucceed idb Boolean(FF TT);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc065.stderr b/ghc/tests/typecheck/should_compile/tc065.stderr
index 21a09a347d9f..b3bc34a6b678 100644
--- a/ghc/tests/typecheck/should_compile/tc065.stderr
+++ b/ghc/tests/typecheck/should_compile/tc065.stderr
@@ -1,14 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-List 1 :: partition 1;
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqInt0 1 $dEqOrdering0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalOrdering0 1 $dFunctor0 1 $dMonad0 1 $dMonadPlus0 1 $dMonadZero0 1 $dOrd0 1 $dOrd1 1 $dOrdBool0 1 $dOrdInt0 1 $dOrdOrdering0 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $m>> 1 $mcompare 1 $mmax 1 $mmin 1 otherwise 1 Eq 1 Eval 1 Functor 1 Monad 1 MonadPlus 1 MonadZero 1 Ord 1 Ordering 1;
-PrelList 1 :: elem 1 head 1;
-PrelNum 1 :: $dEqDouble0 1 $dOrdDouble0 1;
-PrelTup 1 :: $dEq0 1 $dEq2 1 $dEval0 1 $dEval2 1 $dOrd0 1 $dOrd2 1 snd 1;
-Set 1 :: $dEqSet0 1 $dEvalSet0 1 elementOf 1 setToList 1 Set 1;
 _exports_
 ShouldSucceed dfs isCyclic isRecursiveCycle lookupVertex mkDigraph mkEdges mkVertices stronglyConnComp topSort Cycle Digraph(MkDigraph) Edge FlattenedDependencyInfo MaybeErr(Succeeded Failed);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc066.stderr b/ghc/tests/typecheck/should_compile/tc066.stderr
index 9a1dc4325653..b8c7bf97534f 100644
--- a/ghc/tests/typecheck/should_compile/tc066.stderr
+++ b/ghc/tests/typecheck/should_compile/tc066.stderr
@@ -1,9 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEval0 1 $dEval2 1 $dEvalBool0 1 $dEvalDouble0 1 $dEvalInt0 1 $m>> 1 Eval 1 Monad 1 MonadZero 1;
 _exports_
 ShouldSucceed f Pair(MkPair);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc067.stderr b/ghc/tests/typecheck/should_compile/tc067.stderr
index 39da88a1fc01..8b2ab9bdce9d 100644
--- a/ghc/tests/typecheck/should_compile/tc067.stderr
+++ b/ghc/tests/typecheck/should_compile/tc067.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed f;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc068.stderr b/ghc/tests/typecheck/should_compile/tc068.stderr
index e170cdf0e370..f99b609c33bd 100644
--- a/ghc/tests/typecheck/should_compile/tc068.stderr
+++ b/ghc/tests/typecheck/should_compile/tc068.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEqBool0 1 $dEqInt0 1 $dEval0 1 $dEval2 1 $dEvalBool0 1 $dEvalDouble0 1 $dEvalInt0 1 $m/= 1 not 1 Eq 1 Eval 1;
-PrelNum 1 :: $dEqDouble0 1;
 _exports_
 ShouldSucceed B(X Y) T(D C);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc069.stderr b/ghc/tests/typecheck/should_compile/tc069.stderr
index ec883291f68c..d6c4003b7b1c 100644
--- a/ghc/tests/typecheck/should_compile/tc069.stderr
+++ b/ghc/tests/typecheck/should_compile/tc069.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed x y ys;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc070.stderr b/ghc/tests/typecheck/should_compile/tc070.stderr
index d9d4448eddb9..5734a1dac7f7 100644
--- a/ghc/tests/typecheck/should_compile/tc070.stderr
+++ b/ghc/tests/typecheck/should_compile/tc070.stderr
@@ -1,9 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEval0 1 $dEval2 1 $dEvalBool0 1 $dEvalDouble0 1 $dEvalInt0 1 Eval 1;
 _exports_
 ShouldSucceed idb Boolean(FF TT);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc073.stderr b/ghc/tests/typecheck/should_compile/tc073.stderr
index 39da88a1fc01..8b2ab9bdce9d 100644
--- a/ghc/tests/typecheck/should_compile/tc073.stderr
+++ b/ghc/tests/typecheck/should_compile/tc073.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed f;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc074.stderr b/ghc/tests/typecheck/should_compile/tc074.stderr
index e170cdf0e370..f99b609c33bd 100644
--- a/ghc/tests/typecheck/should_compile/tc074.stderr
+++ b/ghc/tests/typecheck/should_compile/tc074.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEqBool0 1 $dEqInt0 1 $dEval0 1 $dEval2 1 $dEvalBool0 1 $dEvalDouble0 1 $dEvalInt0 1 $m/= 1 not 1 Eq 1 Eval 1;
-PrelNum 1 :: $dEqDouble0 1;
 _exports_
 ShouldSucceed B(X Y) T(D C);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc076.stderr b/ghc/tests/typecheck/should_compile/tc076.stderr
index 6cc4aff0390b..39e0613d98d9 100644
--- a/ghc/tests/typecheck/should_compile/tc076.stderr
+++ b/ghc/tests/typecheck/should_compile/tc076.stderr
@@ -1,9 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dMonad0 1 $dMonadZero0 1 $m>> 1 Monad 1 MonadZero 1;
 _exports_
 ShouldSucceed x xs;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc077.stderr b/ghc/tests/typecheck/should_compile/tc077.stderr
index 0034d4aeb7ad..2ec321bfb5a5 100644
--- a/ghc/tests/typecheck/should_compile/tc077.stderr
+++ b/ghc/tests/typecheck/should_compile/tc077.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed EQ(:EQ :EQ ===) NUM(ONE TWO) ORD(:ORD :ORD);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc078.stderr b/ghc/tests/typecheck/should_compile/tc078.stderr
index a1578d93ba02..8431460060e1 100644
--- a/ghc/tests/typecheck/should_compile/tc078.stderr
+++ b/ghc/tests/typecheck/should_compile/tc078.stderr
@@ -4,12 +4,6 @@ tc078.hs:7: Warning:
     in an instance declaration for `Eq'
 
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldFail 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEqBool0 1 $dEqInt0 1 $dEqOrdering0 1 $dEval0 1 $dEval2 1 $dEvalBool0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalOrdering0 1 $dOrd0 1 $dOrdBool0 1 $dOrdInt0 1 $dOrdOrdering0 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $mmax 1 $mmin 1 Eq 1 Eval 1 Ord 1 Ordering 1;
-PrelNum 1 :: $dEqDouble0 1 $dOrdDouble0 1;
 _exports_
 ShouldFail Bar(MkBar);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc079.stderr b/ghc/tests/typecheck/should_compile/tc079.stderr
index 7d8efd1ff4de..0a1d3b1b40dd 100644
--- a/ghc/tests/typecheck/should_compile/tc079.stderr
+++ b/ghc/tests/typecheck/should_compile/tc079.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqInt0 1 $dEqOrdering0 1 $dOrd0 1 $dOrd1 1 $dOrdBool0 1 $dOrdInt0 1 $dOrdOrdering0 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $mmax 1 $mmin 1 && 1 Eq 1 Ord 1 Ordering 1;
-PrelNum 1 :: $dEqDouble0 1 $dOrdDouble0 1;
 _exports_
 ShouldSucceed Foo(:Foo :Foo op2 op1);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc080.stderr b/ghc/tests/typecheck/should_compile/tc080.stderr
index 58a8a8230902..ccaf3b819e63 100644
--- a/ghc/tests/typecheck/should_compile/tc080.stderr
+++ b/ghc/tests/typecheck/should_compile/tc080.stderr
@@ -1,12 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEnum0 1 $dEnumBool0 1 $dEnumChar0 1 $dEnumInt0 1 $dEnumOrdering0 1 $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEqOrdering0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dEvalOrdering0 1 $dFunctor0 1 $dMonad0 1 $dMonadPlus0 1 $dMonadZero0 1 $dNumInt0 1 $dOrd0 1 $dOrd1 1 $dOrdBool0 1 $dOrdChar0 1 $dOrdInt0 1 $dOrdOrdering0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $dShowOrdering0 1 $m- 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $m>> 1 $mcompare 1 $menumFromThenTo 1 $menumFromTo 1 $mfromInt 1 $mmax 1 $mmin 1 $mshowList 1 . 1 dropWhile 1 isDigit 1 isSpace 1 ord 1 Enum 1 Eq 1 Eval 1 Functor 1 Monad 1 MonadPlus 1 MonadZero 1 Num 1 Ord 1 Ordering 1 Show 1 String 1;
-PrelList 1 :: all 1 length 1 null 1 tail 1;
-PrelNum 1 :: $dEnumDouble0 1 $dEnumInteger0 1 $dEnumRatio0 1 $dEqDouble0 1 $dEqInteger0 1 $dEqRatio0 1 $dEvalRatio0 1 $dIntegralInt0 1 $dIntegralInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dNumRatio0 1 $dOrdDouble0 1 $dOrdInteger0 1 $dOrdRatio0 1 $dRealDouble0 1 $dRealInt0 1 $dRealInteger0 1 $dRealRatio0 1 $dShowDouble0 1 $dShowInteger0 1 $dShowRatio0 1 $mdiv 1 $mdivMod 1 $mmod 1 $mquot 1 $mrem 1 ^ 1 Integral 1 Ratio 1 Rational 1 Real 1;
-PrelTup 1 :: $dEq0 1 $dEval0 1 $dOrd0 1 $dShow3 1;
 _exports_
 ShouldSucceed charToInt lines' seperatedBy span' strToInt whiteSpace Parse(:Parse :Parse forced parse parseType parseLine parseFile);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc081.stderr b/ghc/tests/typecheck/should_compile/tc081.stderr
index 2030fe1b25b8..c4048b4babe2 100644
--- a/ghc/tests/typecheck/should_compile/tc081.stderr
+++ b/ghc/tests/typecheck/should_compile/tc081.stderr
@@ -1,11 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEqOrdering0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dEvalOrdering0 1 $dNumInt0 1 $dOrd0 1 $dOrd1 1 $dOrdBool0 1 $dOrdChar0 1 $dOrdInt0 1 $dOrdOrdering0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $dShowOrdering0 1 $m- 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $mfromInt 1 $mmax 1 $mmin 1 $mshowList 1 Eq 1 Eval 1 Num 1 Ord 1 Ordering 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dOrdDouble0 1 $dOrdInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
-PrelTup 1 :: $dEq2 1 $dEval2 1 $dOrd2 1 $dShow1 1;
 _exports_
 ShouldSucceed f f2 f3;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc082.stderr b/ghc/tests/typecheck/should_compile/tc082.stderr
index a73706a267e9..d6c860aeb5b6 100644
--- a/ghc/tests/typecheck/should_compile/tc082.stderr
+++ b/ghc/tests/typecheck/should_compile/tc082.stderr
@@ -1,11 +1,6 @@
 
 NOTE: Simplifier still going after 4 iterations; bailing out.
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: id 1;
 _exports_
 ShouldSucceed f Normal(:Normal :Normal normal);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc084.stderr b/ghc/tests/typecheck/should_compile/tc084.stderr
index 71799e64e439..433675155d76 100644
--- a/ghc/tests/typecheck/should_compile/tc084.stderr
+++ b/ghc/tests/typecheck/should_compile/tc084.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed f g h;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc085.stderr b/ghc/tests/typecheck/should_compile/tc085.stderr
index 5d3eb29d424d..657ba011e75f 100644
--- a/ghc/tests/typecheck/should_compile/tc085.stderr
+++ b/ghc/tests/typecheck/should_compile/tc085.stderr
@@ -1,14 +1,7 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-IOExts 1 ::;
-PrelBase 1 :: $dEval0 1 $dEval2 1 $dEvalBool0 1 $dEvalDouble0 1 $dEvalInt0 1 Eval 1;
-PrelGHC 2 ::;
 _exports_
 IOExts boundsIOArray freezeIOArray newIOArray newIORef readIOArray readIORef reallyUnsafePtrEq writeIOArray writeIORef IOArray IORef;
-PrelGHC *# *## **## +# +## -# -## /# /## /=# /=## <# <## <=# <=## ==# ==## ># >## >=# >=## acosDouble# acosFloat# addr2Int# and# asinDouble# asinFloat# assert__ atanDouble# atanFloat# chr# cmpInteger# cosDouble# cosFloat# coshDouble# coshFloat# deRefStablePtr# decodeDouble# decodeFloat# delay# divideFloat# double2Float# double2Int# encodeDouble# encodeFloat# eqAddr# eqChar# eqFloat# eqWord# errorIO# expDouble# expFloat# float2Double# float2Int# fork# geAddr# geChar# geFloat# geWord# gtAddr# gtChar# gtFloat# gtWord# iShiftL# iShiftRA# iShiftRL# indexAddrArray# indexAddrOffAddr# indexAddrOffForeignObj# indexArray# indexCharArray# indexCharOffAddr# indexCharOffForeignObj# indexDoubleArray# indexDoubleOffAddr# indexDoubleOffForeignObj# indexFloatArray# indexFloatOffAddr# indexFloatOffForeignObj# indexIntArray# indexIntOffAddr# indexIntOffForeignObj# indexWordArray# indexWordOffAddr# indexWordOffForeignObj# int2Addr# int2Double# int2Float# int2Integer# int2Word# integer2Int# integer2Word# leAddr# leChar# leFloat# leWord# logDouble# logFloat# ltAddr# ltChar# ltFloat# ltWord# makeForeignObj# makeStablePtr# minusFloat# minusInteger# neAddr# neChar# neFloat# neWord# negateDouble# negateFloat# negateInt# negateInteger# newAddrArray# newArray# newCharArray# newDoubleArray# newFloatArray# newIntArray# newSynchVar# newWordArray# not# or# ord# par# parAt# parAtAbs# parAtForNow# parAtRel# parGlobal# parLocal# plusFloat# plusInteger# powerFloat# putMVar# quotInt# quotRemInteger# quotWord# readAddrArray# readArray# readCharArray# readDoubleArray# readFloatArray# readIntArray# readWordArray# realWorld# reallyUnsafePtrEquality# remInt# remWord# sameMutableArray# sameMutableByteArray# seq# shiftL# shiftRA# shiftRL# sinDouble# sinFloat# sinhDouble# sinhFloat# sizeofByteArray# sizeofMutableByteArray# sqrtDouble# sqrtFloat# takeMVar# tanDouble# tanFloat# tanhDouble# tanhFloat# timesFloat# timesInteger# unsafeFreezeArray# unsafeFreezeByteArray# waitRead# waitWrite# word2Int# word2Integer# writeAddrArray# writeArray# writeCharArray# writeDoubleArray# writeFloatArray# writeForeignObj# writeIntArray# writeWordArray# xor# -> Addr# All Array# ByteArray# CCallable CReturnable Char# Double# Float# ForeignObj# Int# MutableArray# MutableByteArray# RealWorld StablePtr# State# SynchVar# Void Word#;
+PrelGHC *# *## **## +# +## -# -## /# /## /=# /=## <# <## <=# <=## ==# ==## ># >## >=# >=## acosDouble# acosFloat# addr2Int# and# asinDouble# asinFloat# assert__ atanDouble# atanFloat# chr# cmpInteger# cosDouble# cosFloat# coshDouble# coshFloat# deRefStablePtr# decodeDouble# decodeFloat# delay# divideFloat# double2Float# double2Int# encodeDouble# encodeFloat# eqAddr# eqChar# eqFloat# eqWord# errorIO# expDouble# expFloat# float2Double# float2Int# fork# geAddr# geChar# geFloat# geWord# gtAddr# gtChar# gtFloat# gtWord# iShiftL# iShiftRA# iShiftRL# indexAddrArray# indexAddrOffAddr# indexAddrOffForeignObj# indexArray# indexCharArray# indexCharOffAddr# indexCharOffForeignObj# indexDoubleArray# indexDoubleOffAddr# indexDoubleOffForeignObj# indexFloatArray# indexFloatOffAddr# indexFloatOffForeignObj# indexIntArray# indexIntOffAddr# indexIntOffForeignObj# indexWordArray# indexWordOffAddr# indexWordOffForeignObj# int2Addr# int2Double# int2Float# int2Integer# int2Word# integer2Int# integer2Word# leAddr# leChar# leFloat# leWord# logDouble# logFloat# ltAddr# ltChar# ltFloat# ltWord# makeForeignObj# makeStablePtr# minusFloat# minusInteger# neAddr# neChar# neFloat# neWord# negateDouble# negateFloat# negateInt# negateInteger# newAddrArray# newArray# newCharArray# newDoubleArray# newFloatArray# newIntArray# newSynchVar# newWordArray# not# or# ord# par# parAt# parAtAbs# parAtForNow# parAtRel# parGlobal# parLocal# plusFloat# plusInteger# powerFloat# putMVar# quotInt# quotRemInteger# quotWord# readAddrArray# readArray# readCharArray# readDoubleArray# readFloatArray# readIntArray# readWordArray# realWorld# reallyUnsafePtrEquality# remInt# remWord# sameMutableArray# sameMutableByteArray# seq# shiftL# shiftRA# shiftRL# sinDouble# sinFloat# sinhDouble# sinhFloat# sizeofByteArray# sizeofMutableByteArray# sqrtDouble# sqrtFloat# takeMVar# tanDouble# tanFloat# tanhDouble# tanhFloat# timesFloat# timesInteger# unsafeFreezeArray# unsafeFreezeByteArray# waitRead# waitWrite# word2Int# word2Integer# writeAddrArray# writeArray# writeCharArray# writeDoubleArray# writeFloatArray# writeForeignObj# writeIntArray# writeWordArray# xor# -> Addr# All Array# ByteArray# CCallable CReturnable Char# Double# Float# ForeignObj# Int# Int64# MutableArray# MutableByteArray# RealWorld StablePtr# State# SynchVar# Void Word# Word64#;
 PrelHandle openFileEx IOModeEx(BinaryMode TextMode);
 PrelIOBase fixIO performGC;
 PrelUnsafe trace unsafeInterleaveIO unsafePerformIO;
diff --git a/ghc/tests/typecheck/should_compile/tc086.stderr b/ghc/tests/typecheck/should_compile/tc086.stderr
index 699f81b16027..f85e891c30c8 100644
--- a/ghc/tests/typecheck/should_compile/tc086.stderr
+++ b/ghc/tests/typecheck/should_compile/tc086.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEqOrdering0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dEvalOrdering0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $dShowOrdering0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Ordering 1 Ordering 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 ShouldSucceed Group Ring;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc087.stderr b/ghc/tests/typecheck/should_compile/tc087.stderr
index 4c8d1b605774..c3d9f48e1e16 100644
--- a/ghc/tests/typecheck/should_compile/tc087.stderr
+++ b/ghc/tests/typecheck/should_compile/tc087.stderr
@@ -1,14 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEnum0 1 $dEnumBool0 1 $dEnumChar0 1 $dEnumInt0 1 $dEnumOrdering0 1 $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEqOrdering0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dEvalOrdering0 1 $dMonad0 1 $dMonadZero0 1 $dNumInt0 1 $dOrd0 1 $dOrd1 1 $dOrdBool0 1 $dOrdChar0 1 $dOrdInt0 1 $dOrdOrdering0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $dShowOrdering0 1 $m- 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $m>> 1 $mcompare 1 $menumFromThenTo 1 $menumFromTo 1 $mfromInt 1 $mmax 1 $mmin 1 $mshowList 1 otherwise 1 Enum 1 Eq 1 Eval 1 Monad 1 MonadZero 1 Num 1 Ord 1 Ordering 1 Show 1 String 1;
-PrelIO 1 :: putStr 1;
-PrelIOBase 1 :: $dEvalIO0 1 $dMonadIO0 1 $dShowIO0 1 IO 1;
-PrelList 1 :: sum 1;
-PrelNum 1 :: $dEnumDouble0 1 $dEnumInteger0 1 $dEnumRatio0 1 $dEqDouble0 1 $dEqInteger0 1 $dEqRatio0 1 $dEvalRatio0 1 $dFractionalDouble0 1 $dFractionalRatio0 1 $dIntegralInt0 1 $dIntegralInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dNumRatio0 1 $dOrdDouble0 1 $dOrdInteger0 1 $dOrdRatio0 1 $dRealDouble0 1 $dRealInt0 1 $dRealInteger0 1 $dRealRatio0 1 $dShowDouble0 1 $dShowInteger0 1 $dShowRatio0 1 $mdiv 1 $mdivMod 1 $mmod 1 $mquot 1 $mrecip 1 $mrem 1 Fractional 1 Integral 1 Ratio 1 Rational 1 Real 1;
-PrelTup 1 :: $dEq0 1 $dEval0 1 $dOrd0 1 $dShow3 1;
 _exports_
 ShouldSucceed check insertMany out pqSort toOrderedList PriorityQueue(:PriorityQueue :PriorityQueue splitMin meld insert single empty) SeqView(Null Cons);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc088.stderr b/ghc/tests/typecheck/should_compile/tc088.stderr
index 31f9f7809c23..376c6012ad0e 100644
--- a/ghc/tests/typecheck/should_compile/tc088.stderr
+++ b/ghc/tests/typecheck/should_compile/tc088.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum ShouldSucceed
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
 _exports_
 _instances_
 instance _forall_ [a b] {PrelBase.Eq b} => {PrelBase.Eq (a -> b)} = $dEq0;
diff --git a/ghc/tests/typecheck/should_compile/tc089.stderr b/ghc/tests/typecheck/should_compile/tc089.stderr
index 476ecd475f20..68e157130b95 100644
--- a/ghc/tests/typecheck/should_compile/tc089.stderr
+++ b/ghc/tests/typecheck/should_compile/tc089.stderr
@@ -1,7 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _exports_
 ShouldSucceed absAnd absIf bottom f f_rec f_rec0 f_rec1 f_rec2 fac fac_rec fac_rec0 fac_rec1 fac_rec2 fac_rec3 fac_rec4 g g_rec g_rec0 g_rec1 g_rec2 g_rec3 g_rec4 g_rec5 g_rec6 g_rec7 g_rec8 head one s_1_0 s_2_0 s_2_1 s_3_0 s_3_1 s_3_2;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc090.stderr b/ghc/tests/typecheck/should_compile/tc090.stderr
index 4e92dfadc94b..39b602f4b49b 100644
--- a/ghc/tests/typecheck/should_compile/tc090.stderr
+++ b/ghc/tests/typecheck/should_compile/tc090.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEqBool0 1 $dEqInt0 1 $dEqOrdering0 1 $dOrd0 1 $dOrdBool0 1 $dOrdInt0 1 $dOrdOrdering0 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $mmax 1 $mmin 1 Eq 1 Ord 1 Ordering 1;
-PrelNum 1 :: $dEqDouble0 1 $dOrdDouble0 1;
 _exports_
 ShouldSucceed a b;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc091.stderr b/ghc/tests/typecheck/should_compile/tc091.stderr
index 6b4c4c47fc47..16f8baab4663 100644
--- a/ghc/tests/typecheck/should_compile/tc091.stderr
+++ b/ghc/tests/typecheck/should_compile/tc091.stderr
@@ -1,12 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEnum0 1 $dEnumBool0 1 $dEnumChar0 1 $dEnumInt0 1 $dEnumOrdering0 1 $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEqOrdering0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dEvalOrdering0 1 $dNumInt0 1 $dOrd0 1 $dOrd1 1 $dOrdBool0 1 $dOrdChar0 1 $dOrdInt0 1 $dOrdOrdering0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $dShowOrdering0 1 $m- 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $menumFromThenTo 1 $menumFromTo 1 $mfromInt 1 $mmax 1 $mmin 1 $mshowList 1 Enum 1 Eq 1 Eval 1 Num 1 Ord 1 Ordering 1 Show 1 String 1;
-PrelList 1 :: length 1;
-PrelNum 1 :: $dEnumDouble0 1 $dEnumInteger0 1 $dEnumRatio0 1 $dEqDouble0 1 $dEqInteger0 1 $dEqRatio0 1 $dEvalRatio0 1 $dIntegralInt0 1 $dIntegralInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dNumRatio0 1 $dOrdDouble0 1 $dOrdInteger0 1 $dOrdRatio0 1 $dRealDouble0 1 $dRealInt0 1 $dRealInteger0 1 $dRealRatio0 1 $dShowDouble0 1 $dShowInteger0 1 $dShowRatio0 1 $mdiv 1 $mdivMod 1 $mmod 1 $mquot 1 $mrem 1 Integral 1 Ratio 1 Rational 1 Real 1;
-PrelTup 1 :: $dEq0 1 $dEval0 1 $dOrd0 1 $dShow3 1;
 _exports_
 ShouldSucceed init_last merge sort;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc092.stderr b/ghc/tests/typecheck/should_compile/tc092.stderr
index 897b590d994b..31e96b8a239f 100644
--- a/ghc/tests/typecheck/should_compile/tc092.stderr
+++ b/ghc/tests/typecheck/should_compile/tc092.stderr
@@ -1,10 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqInt0 1 $dEqOrdering0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalOrdering0 1 $dOrd0 1 $dOrd1 1 $dOrdBool0 1 $dOrdInt0 1 $dOrdOrdering0 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $mmax 1 $mmin 1 Eq 1 Eval 1 Ord 1 Ordering 1;
-PrelNum 1 :: $dEqDouble0 1 $dOrdDouble0 1;
 _exports_
 ShouldSucceed e0 e1 e2 q Empty(Empty);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc093.stderr b/ghc/tests/typecheck/should_compile/tc093.stderr
index 08a973b681de..29630d4eaf5a 100644
--- a/ghc/tests/typecheck/should_compile/tc093.stderr
+++ b/ghc/tests/typecheck/should_compile/tc093.stderr
@@ -1,11 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEqOrdering0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dEvalOrdering0 1 $dMonad0 1 $dNumInt0 1 $dOrd0 1 $dOrd1 1 $dOrdBool0 1 $dOrdChar0 1 $dOrdInt0 1 $dOrdOrdering0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $dShowOrdering0 1 $m- 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $m>> 1 $mcompare 1 $mfromInt 1 $mmax 1 $mmin 1 $mshowList 1 && 1 . 1 not 1 showList__ 1 showParen 1 showSpace 1 showString 1 Eq 1 Eval 1 Monad 1 Num 1 Ord 1 Ordering 1 Show 1 ShowS 1 String 1;
-PrelNum 1 :: $dEqDouble0 1 $dEqInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dOrdDouble0 1 $dOrdInteger0 1 $dShowDouble0 1 $dShowInteger0 1;
-PrelTup 1 :: $dEq0 1 $dEval0 1 $dOrd0 1 $dShow3 1;
 _exports_
 ShouldSucceed bindState foo unState unitState St State(State) TS(TS vs);
 _instances_
diff --git a/ghc/tests/typecheck/should_compile/tc094.stderr b/ghc/tests/typecheck/should_compile/tc094.stderr
index d4129d9606b7..5989722cc1c5 100644
--- a/ghc/tests/typecheck/should_compile/tc094.stderr
+++ b/ghc/tests/typecheck/should_compile/tc094.stderr
@@ -1,11 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEnum0 1 $dEnumBool0 1 $dEnumChar0 1 $dEnumInt0 1 $dEnumOrdering0 1 $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEqOrdering0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dEvalOrdering0 1 $dNumInt0 1 $dOrd0 1 $dOrd1 1 $dOrdBool0 1 $dOrdChar0 1 $dOrdInt0 1 $dOrdOrdering0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $dShowOrdering0 1 $m- 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $menumFromThenTo 1 $menumFromTo 1 $mfromInt 1 $mmax 1 $mmin 1 $mshowList 1 Enum 1 Eq 1 Eval 1 Num 1 Ord 1 Ordering 1 Show 1 String 1;
-PrelNum 1 :: $dEnumDouble0 1 $dEnumInteger0 1 $dEnumRatio0 1 $dEqDouble0 1 $dEqInteger0 1 $dEqRatio0 1 $dEvalRatio0 1 $dFractionalDouble0 1 $dFractionalRatio0 1 $dIntegralInt0 1 $dIntegralInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dNumRatio0 1 $dOrdDouble0 1 $dOrdInteger0 1 $dOrdRatio0 1 $dRealDouble0 1 $dRealFracDouble0 1 $dRealFracRatio0 1 $dRealInt0 1 $dRealInteger0 1 $dRealRatio0 1 $dShowDouble0 1 $dShowInteger0 1 $dShowRatio0 1 $mceiling 1 $mdiv 1 $mdivMod 1 $mfloor 1 $mmod 1 $mquot 1 $mrecip 1 $mrem 1 $mround 1 $mtruncate 1 Fractional 1 Integral 1 Ratio 1 Rational 1 Real 1 RealFrac 1;
-PrelTup 1 :: $dEq0 1 $dEval0 1 $dOrd0 1 $dShow3 1;
 _exports_
 ShouldSucceed foo;
 _declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc095.stderr b/ghc/tests/typecheck/should_compile/tc095.stderr
index 96b37410758e..30e5b7b228a0 100644
--- a/ghc/tests/typecheck/should_compile/tc095.stderr
+++ b/ghc/tests/typecheck/should_compile/tc095.stderr
@@ -1,16 +1,6 @@
 
 NOTE: Simplifier still going after 4 iterations; bailing out.
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ ShouldSucceed 1 302
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $dEnum0 1 $dEnumBool0 1 $dEnumChar0 1 $dEnumInt0 1 $dEnumOrdering0 1 $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEqOrdering0 1 $dEval0 1 $dEval1 1 $dEval2 1 $dEvalBool0 1 $dEvalChar0 1 $dEvalDouble0 1 $dEvalInt0 1 $dEvalInteger0 1 $dEvalOrdering0 1 $dFunctor0 1 $dNumInt0 1 $dOrd0 1 $dOrd1 1 $dOrdBool0 1 $dOrdChar0 1 $dOrdInt0 1 $dOrdOrdering0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $dShowOrdering0 1 $m- 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $menumFromThenTo 1 $menumFromTo 1 $mfromInt 1 $mmax 1 $mmin 1 $mshowList 1 . 1 showList__ 1 showParen 1 showSpace 1 showString 1 Enum 1 Eq 1 Eval 1 Functor 1 Num 1 Ord 1 Ordering 1 Show 1 ShowS 1 String 1;
-PrelIO 1 :: print 1;
-PrelIOBase 1 :: $dEvalIO0 1 $dFunctorIO0 1 $dShowIO0 1 IO 1;
-PrelList 1 :: drop 1;
-PrelNum 1 :: $dEnumDouble0 1 $dEnumInteger0 1 $dEnumRatio0 1 $dEqDouble0 1 $dEqInteger0 1 $dEqRatio0 1 $dEvalRatio0 1 $dFractionalDouble0 1 $dFractionalRatio0 1 $dIntegralInt0 1 $dIntegralInteger0 1 $dNumDouble0 1 $dNumInteger0 1 $dNumRatio0 1 $dOrdDouble0 1 $dOrdInteger0 1 $dOrdRatio0 1 $dRealDouble0 1 $dRealInt0 1 $dRealInteger0 1 $dRealRatio0 1 $dShowDouble0 1 $dShowInteger0 1 $dShowRatio0 1 $mdiv 1 $mdivMod 1 $mmod 1 $mquot 1 $mrecip 1 $mrem 1 Fractional 1 Integral 1 Ratio 1 Rational 1 Real 1;
-PrelTup 1 :: $dEq0 1 $dEval0 1 $dOrd0 1 $dShow3 1;
 _exports_
 ShouldSucceed action_0 action_1 action_2 action_3 action_4 action_5 action_6 happyAccept happyError happyFail happyGoto happyMonadReduce happyNewToken happyParse happyReduce happyReduce_1 happyReduce_2 happyReduce_3 happyReturn happyShift happySpecReduce_0 happySpecReduce_1 happySpecReduce_2 happySpecReduce_3 happyThen main myparser notHappyAtAll HappyAbsSyn(HappyTerminal HappyErrorToken HappyAbsSyn1 HappyAbsSyn2 HappyAbsSyn3) HappyState(HappyState) Token(TokenInt TokenVar TokenEq);
 _instances_
diff --git a/ghc/tests/typecheck/should_fail/tcfail001.stderr b/ghc/tests/typecheck/should_fail/tcfail001.stderr
index eae33c05d093..e4b4cbfd16c8 100644
--- a/ghc/tests/typecheck/should_fail/tcfail001.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail001.stderr
@@ -4,9 +4,9 @@ tcfail001.hs:9: Warning:
 
  
 tcfail001.hs:9:
-    Couldn't match the type `[a]' against `aqd -> aqe'
+    Couldn't match the type `[a]' against `aqv -> aqw'
     Expected: [a]
-    Inferred: aqd -> aqe
+    Inferred: aqv -> aqw
     In an equation for function `op': op [] = []
     In the definition for method `op'
 
diff --git a/ghc/tests/typecheck/should_fail/tcfail002.stderr b/ghc/tests/typecheck/should_fail/tcfail002.stderr
index eed52ab80afb..1779c2af10cd 100644
--- a/ghc/tests/typecheck/should_fail/tcfail002.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail002.stderr
@@ -1,8 +1,8 @@
  
 tcfail002.hs:4:
-    Occurs check: cannot construct the infinite type: apP = [apP]
-    Expected: apP
-    Inferred: [apP]
+    Occurs check: cannot construct the infinite type: aq7 = [aq7]
+    Expected: aq7
+    Inferred: [aq7]
     In an equation for function `c': c z = z
 
 
diff --git a/ghc/tests/typecheck/should_fail/tcfail004.stderr b/ghc/tests/typecheck/should_fail/tcfail004.stderr
index 42b03be8d938..b5a525f12d13 100644
--- a/ghc/tests/typecheck/should_fail/tcfail004.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail004.stderr
@@ -1,8 +1,8 @@
  
 tcfail004.hs:3:
-    Couldn't match the type `(a12F, a12I)' against `(a12K, a12M, a12O)'
-    Expected: (a12E, a12H)
-    Inferred: (a12K, a12M, a12O)
+    Couldn't match the type `(a13f, a13i)' against `(a13k, a13m, a13o)'
+    Expected: (a13e, a13h)
+    Inferred: (a13k, a13m, a13o)
     In a pattern binding: (f, g) = (1, 2, 3)
 
 
diff --git a/ghc/tests/typecheck/should_fail/tcfail005.stderr b/ghc/tests/typecheck/should_fail/tcfail005.stderr
index 538ceb3f1040..72c88b5e0eb3 100644
--- a/ghc/tests/typecheck/should_fail/tcfail005.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail005.stderr
@@ -1,8 +1,8 @@
  
 tcfail005.hs:3:
-    Couldn't match the type `[a11U]' against `(a11Y, a120)'
-    Expected: [a11U]
-    Inferred: (a11Y, a120)
+    Couldn't match the type `[a12u]' against `(a12y, a12A)'
+    Expected: [a12u]
+    Inferred: (a12y, a12A)
     In a pattern binding: (h : i) = (1, ('a'))
 
 
diff --git a/ghc/tests/typecheck/should_fail/tcfail008.stderr b/ghc/tests/typecheck/should_fail/tcfail008.stderr
index 2c4047f3c249..6d0057769591 100644
--- a/ghc/tests/typecheck/should_fail/tcfail008.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail008.stderr
@@ -1,14 +1,14 @@
  
 tcfail008.hs:3:
     Ambiguous type variable(s)
-    `aMu'
-	in the constraint `Num [aMu]'
+    `aN4'
+	in the constraint `Num [aN4]'
 	arising from the literal `2' at tcfail008.hs:3
  
 tcfail008.hs:3:
     Ambiguous type variable(s)
-    `aMu'
-	in the constraint `Num aMu'
+    `aN4'
+	in the constraint `Num aN4'
 	arising from the literal `1' at tcfail008.hs:3
 
 
diff --git a/ghc/tests/typecheck/should_fail/tcfail010.stderr b/ghc/tests/typecheck/should_fail/tcfail010.stderr
index 755ec117f17d..29992511720d 100644
--- a/ghc/tests/typecheck/should_fail/tcfail010.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail010.stderr
@@ -1,8 +1,8 @@
  
 tcfail010.hs:3:
     Ambiguous type variable(s)
-    `aME'
-	in the constraint `Num [aME]'
+    `aNe'
+	in the constraint `Num [aNe]'
 	arising from the literal `2' at tcfail010.hs:3
 
 
diff --git a/ghc/tests/typecheck/should_fail/tcfail012.stderr b/ghc/tests/typecheck/should_fail/tcfail012.stderr
index 70fca455b729..705d07620fb4 100644
--- a/ghc/tests/typecheck/should_fail/tcfail012.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail012.stderr
@@ -1,8 +1,8 @@
  
 tcfail012.hs:3:
-    Couldn't match the type `Bool' against `[apz]'
+    Couldn't match the type `Bool' against `[apR]'
     Expected: Bool
-    Inferred: [apz]
+    Inferred: [apR]
     In a pattern binding: True = []
 
 
diff --git a/ghc/tests/typecheck/should_fail/tcfail013.stderr b/ghc/tests/typecheck/should_fail/tcfail013.stderr
index 2e89104eb5c2..3da86aa189cd 100644
--- a/ghc/tests/typecheck/should_fail/tcfail013.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail013.stderr
@@ -1,8 +1,8 @@
  
 tcfail013.hs:4:
-    Couldn't match the type `[aMB]' against `Bool'
+    Couldn't match the type `[aNb]' against `Bool'
     Expected: Bool
-    Inferred: [aMB]
+    Inferred: [aNb]
     In an equation for function `f': f True = 2
 
 
diff --git a/ghc/tests/typecheck/should_fail/tcfail014.stderr b/ghc/tests/typecheck/should_fail/tcfail014.stderr
index f594162129f8..3917d0ee1b03 100644
--- a/ghc/tests/typecheck/should_fail/tcfail014.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail014.stderr
@@ -1,8 +1,8 @@
  
 tcfail014.hs:5:
-    Occurs check: cannot construct the infinite type: aN3 = aN3 -> aN5
-    Expected: aN3
-    Inferred: aN3 -> aN5
+    Occurs check: cannot construct the infinite type: aND = aND -> aNF
+    Expected: aND
+    Inferred: aND -> aNF
     In the first argument of `z', namely `z'
     In an equation for function `h': h z = z z
 
diff --git a/ghc/tests/typecheck/should_fail/tcfail016.stderr b/ghc/tests/typecheck/should_fail/tcfail016.stderr
index e4f622c538e8..8736b16c1255 100644
--- a/ghc/tests/typecheck/should_fail/tcfail016.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail016.stderr
@@ -1,8 +1,8 @@
  
 tcfail016.hs:9:
-    Couldn't match the type `AnnExpr a12c' against `Expr a125'
-    Expected: Expr a12c
-    Inferred: AnnExpr a12c
+    Couldn't match the type `AnnExpr a12M' against `Expr a12F'
+    Expected: Expr a12M
+    Inferred: AnnExpr a12M
     In the first argument of `g', namely `e1'
     In the first argument of `++', namely `(g e1)'
 
diff --git a/ghc/tests/typecheck/should_fail/tcfail018.stderr b/ghc/tests/typecheck/should_fail/tcfail018.stderr
index 7b40abb6fd29..e8c7737c1385 100644
--- a/ghc/tests/typecheck/should_fail/tcfail018.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail018.stderr
@@ -1,8 +1,8 @@
  
 tcfail018.hs:5:
     Ambiguous type variable(s)
-    `aMx'
-	in the constraint `Num [aMx]'
+    `aN7'
+	in the constraint `Num [aN7]'
 	arising from the literal `1' at tcfail018.hs:5
 
 
diff --git a/ghc/tests/typecheck/should_fail/tcfail028.stderr b/ghc/tests/typecheck/should_fail/tcfail028.stderr
index 9c87d405422c..d2983200934d 100644
--- a/ghc/tests/typecheck/should_fail/tcfail028.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail028.stderr
@@ -1,8 +1,8 @@
  
 tcfail028.hs:4:
-    Couldn't match the kind ** against kaPo -> *
+    Couldn't match the kind ** against kaPY -> *
     Expected: **
-    Found:    kaPo -> *
+    Found:    kaPY -> *
     In the type `A a'
     In the data declaration for `A'
 
diff --git a/ghc/tests/typecheck/should_fail/tcfail033.stderr b/ghc/tests/typecheck/should_fail/tcfail033.stderr
index 2655db927a09..f2b13dcdb0ce 100644
--- a/ghc/tests/typecheck/should_fail/tcfail033.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail033.stderr
@@ -1,8 +1,8 @@
  
 tcfail033.hs:4:
-    Occurs check: cannot construct the infinite type: aM8 = (aM8, aMb)
-    Expected: aMc (aM8, aMb)
-    Inferred: aMc aM8
+    Occurs check: cannot construct the infinite type: aMq = (aMq, aMt)
+    Expected: aMu (aMq, aMt)
+    Inferred: aMu aMq
     In a pattern binding: buglet = [x | (x, y) <- buglet]
 
 
diff --git a/ghc/tests/typecheck/should_fail/tcfail040.stderr b/ghc/tests/typecheck/should_fail/tcfail040.stderr
index 7a15cd016b65..6550bc2470e6 100644
--- a/ghc/tests/typecheck/should_fail/tcfail040.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail040.stderr
@@ -1,8 +1,8 @@
  
 tcfail040.hs:19:
     Ambiguous type variable(s)
-    `aMu'
-	in the constraint `ORD aMu'
+    `aN4'
+	in the constraint `ORD aN4'
 	arising from use of `<<' at tcfail040.hs:19
 
 
diff --git a/ghc/tests/typecheck/should_fail/tcfail065.stderr b/ghc/tests/typecheck/should_fail/tcfail065.stderr
index 1354c367a18b..c2cc0516612c 100644
--- a/ghc/tests/typecheck/should_fail/tcfail065.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail065.stderr
@@ -1,8 +1,8 @@
  
 tcfail065.hs:29:
     A type signature is more polymorphic than the inferred type
-	Can't for-all the type variable(s) `aSs'
-	in the type `aSs -> X x -> X x'
+	Can't for-all the type variable(s) `aT2'
+	in the type `aT2 -> X x -> X x'
     When checking the type signature for `setX'
     In the definition for method `setX'
 
diff --git a/ghc/tests/typecheck/should_fail/tcfail068.stderr b/ghc/tests/typecheck/should_fail/tcfail068.stderr
index da466571b552..63440c2aa708 100644
--- a/ghc/tests/typecheck/should_fail/tcfail068.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail068.stderr
@@ -1,8 +1,8 @@
  
 tcfail068.hs:45:
     A type signature is more polymorphic than the inferred type
-	Can't for-all the type variable(s) `a1jl'
-	in the type `ST a1jl a1jh'
+	Can't for-all the type variable(s) `a1jV'
+	in the type `ST a1jV a1jR'
     In the first argument of `runST', namely `(itrapstate' i k s)'
     In an equation for function `itrapstate':
 	itrapstate ((i, k), (j, l)) f c d s arr
@@ -25,8 +25,8 @@ tcfail068.hs:45:
  
 tcfail068.hs:32:
     A type signature is more polymorphic than the inferred type
-	Can't for-all the type variable(s) `a1m6'
-	in the type `ST a1m6 a1m2'
+	Can't for-all the type variable(s) `a1mG'
+	in the type `ST a1mG a1mC'
     In the first argument of `runST', namely `(itrap' i k)'
     In an equation for function `itrap':
 	itrap ((i, k), (j, l)) f arr
@@ -48,8 +48,8 @@ tcfail068.hs:32:
  
 tcfail068.hs:21:
     A type signature is more polymorphic than the inferred type
-	Can't for-all the type variable(s) `a1mB'
-	in the type `ST a1mB a1mr'
+	Can't for-all the type variable(s) `a1nb'
+	in the type `ST a1nb a1n1'
     In the first argument of `runST', namely
 	`((readArray arr i)
 	  >>= (\ val -> (writeArray arr i (f val)) >> (return arr)))'
@@ -60,8 +60,8 @@ tcfail068.hs:21:
  
 tcfail068.hs:14:
     A type signature is more polymorphic than the inferred type
-	Can't for-all the type variable(s) `a1nB'
-	in the type `ST a1nB a1nx'
+	Can't for-all the type variable(s) `a1ob'
+	in the type `ST a1ob a1o7'
     In the first argument of `runST', namely
 	`(newArray ((1, (1)), (n)) x)'
     In an equation for function `itgen':
diff --git a/ghc/tests/typecheck/should_fail/tcfail069.stderr b/ghc/tests/typecheck/should_fail/tcfail069.stderr
index df8cd95029a7..260666389c5e 100644
--- a/ghc/tests/typecheck/should_fail/tcfail069.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail069.stderr
@@ -1,8 +1,8 @@
  
 tcfail069.hs:20:
-    Couldn't match the type `[aEL]' against `(aEP, aER)'
-    Expected: [aEL]
-    Inferred: (aEP, aER)
+    Couldn't match the type `[aF3]' against `(aF7, aF9)'
+    Expected: [aF3]
+    Inferred: (aF7, aF9)
     In the scrutinee of a case expression: (list1, (list2))
     In the case expression: case (list1, (list2)) of [] -> error "foo"
 
diff --git a/ghc/tests/typecheck/should_fail/tcfail070.stderr b/ghc/tests/typecheck/should_fail/tcfail070.stderr
index 0d43049fafe7..475c96becb8a 100644
--- a/ghc/tests/typecheck/should_fail/tcfail070.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail070.stderr
@@ -1,8 +1,8 @@
  
 tcfail070.hs:13:
-    Couldn't match the kind * against * -> kaAl
+    Couldn't match the kind * against * -> kaAD
     Expected: *
-    Found:    * -> kaAl
+    Found:    * -> kaAD
     In the type `[Int] Bool'
     In the type declaration for `State'
 
diff --git a/ghc/tests/typecheck/should_fail/tcfail071.stderr b/ghc/tests/typecheck/should_fail/tcfail071.stderr
index 9a54281715a0..de77b0c489bc 100644
--- a/ghc/tests/typecheck/should_fail/tcfail071.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail071.stderr
@@ -2,7 +2,7 @@
 tcfail071.hs:8:
     Type signature doesn't match inferred type
 	Signature: c -> c
-	Inferred : (aMF -> [aMD] -> [aMD]) -> aMF -> [aMD] -> [aMD]
+	Inferred : (aNf -> [aNd] -> [aNd]) -> aNf -> [aNd] -> [aNd]
     When checking the type signature for `g'
 
 
diff --git a/ghc/tests/typecheck/should_fail/tcfail072.stderr b/ghc/tests/typecheck/should_fail/tcfail072.stderr
index 1573a6687706..c8a7b6f60e30 100644
--- a/ghc/tests/typecheck/should_fail/tcfail072.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail072.stderr
@@ -1,14 +1,14 @@
  
 tcfail072.hs:23:
     Ambiguous type variable(s)
-    `aMK'
-	in the constraint `Ord aMK'
+    `aNk'
+	in the constraint `Ord aNk'
 	arising from use of `g' at tcfail072.hs:23
  
 tcfail072.hs:23:
     Ambiguous type variable(s)
-    `aMN'
-	in the constraint `Ord aMN'
+    `aNn'
+	in the constraint `Ord aNn'
 	arising from use of `g' at tcfail072.hs:23
 
 
diff --git a/ghc/tests/typecheck/should_fail/tcfail076.stderr b/ghc/tests/typecheck/should_fail/tcfail076.stderr
index 1e2c2e3b7abb..7fd5f0c6137b 100644
--- a/ghc/tests/typecheck/should_fail/tcfail076.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail076.stderr
@@ -1,8 +1,8 @@
  
 tcfail076.hs:20:
     A type signature is more polymorphic than the inferred type
-	Can't for-all the type variable(s) `aNv'
-	in the type `(aNr -> aNp aNv) -> aNp aNv'
+	Can't for-all the type variable(s) `aO3'
+	in the type `(aNZ -> aNX aO3) -> aNX aO3'
     In the first argument of `KContT', namely `(\ cont' -> cont a)'
     In the first argument of `f', namely
 	`(\ a -> KContT (\ cont' -> cont a))'
diff --git a/ghc/tests/typecheck/should_fail/tcfail080.stderr b/ghc/tests/typecheck/should_fail/tcfail080.stderr
index f97dbd79e237..3096a5e800d5 100644
--- a/ghc/tests/typecheck/should_fail/tcfail080.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail080.stderr
@@ -1,8 +1,8 @@
  
 tcfail080.hs:11:
     Ambiguous type variable(s)
-    `aqR'
-	in the constraint `Collection aqR aqU'
+    `ar9'
+	in the constraint `Collection ar9 arc'
 	arising from use of `singleton' at tcfail080.hs:11
 
 
diff --git a/ghc/tests/typecheck/should_run/tcrun002.hs b/ghc/tests/typecheck/should_run/tcrun002.hs
index 79174022124d..0c511f63cdeb 100644
--- a/ghc/tests/typecheck/should_run/tcrun002.hs
+++ b/ghc/tests/typecheck/should_run/tcrun002.hs
@@ -1,13 +1,11 @@
-module Main where
-
 --!!! space leak from overloading !!!
+module Main where
 
 -- This program develops a space leak if sfoldl isn't compiled with some
 -- care.  See comment about polymorphic recursion in TcMonoBinds.lhs
 
 import System(getArgs)
-import IOBase
-import STBase
+import PrelIOBase
 
 sfoldl :: Eval a => (a -> Int -> a) -> a -> [Int] -> a
 sfoldl f z [] = z
-- 
GitLab