Testsuite error message changes

17 files changed, 132 insertions, 156 deletions

diff --git a/testsuite/tests/simplCore/should_compile/EvalTest.stdout b/testsuite/tests/simplCore/should_compile/EvalTest.stdout
index 25ed3203f5..8bc22a42f2 100644
--- a/testsuite/tests/simplCore/should_compile/EvalTest.stdout
+++ b/testsuite/tests/simplCore/should_compile/EvalTest.stdout
@@ -1 +1 @@
-rght [Dmd=<S,U>] :: EvalTest.AList a1
+rght [Dmd=<S,U>] :: AList a1
diff --git a/testsuite/tests/simplCore/should_compile/T3717.stderr b/testsuite/tests/simplCore/should_compile/T3717.stderr
index 21e822b318..7cc1abe5dc 100644
--- a/testsuite/tests/simplCore/should_compile/T3717.stderr
+++ b/testsuite/tests/simplCore/should_compile/T3717.stderr
@@ -14,7 +14,7 @@ T3717.$wfoo =
     }
 end Rec }
 
-T3717.foo [InlPrag=INLINE[0]] :: GHC.Types.Int -> GHC.Types.Int
+foo [InlPrag=INLINE[0]] :: Int -> Int
 [GblId,
  Arity=1,
  Caf=NoCafRefs,
@@ -22,12 +22,12 @@ T3717.foo [InlPrag=INLINE[0]] :: GHC.Types.Int -> GHC.Types.Int
  Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True,
          Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=False)
-         Tmpl= \ (w [Occ=Once!] :: GHC.Types.Int) ->
+         Tmpl= \ (w [Occ=Once!] :: Int) ->
                  case w of _ [Occ=Dead] { GHC.Types.I# ww1 [Occ=Once] ->
                  case T3717.$wfoo ww1 of ww2 { __DEFAULT -> GHC.Types.I# ww2 }
                  }}]
-T3717.foo =
-  \ (w :: GHC.Types.Int) ->
+foo =
+  \ (w :: Int) ->
     case w of _ [Occ=Dead] { GHC.Types.I# ww1 ->
     case T3717.$wfoo ww1 of ww2 { __DEFAULT -> GHC.Types.I# ww2 }
     }
diff --git a/testsuite/tests/simplCore/should_compile/T3772.stdout b/testsuite/tests/simplCore/should_compile/T3772.stdout
index 506e342012..6609024183 100644
--- a/testsuite/tests/simplCore/should_compile/T3772.stdout
+++ b/testsuite/tests/simplCore/should_compile/T3772.stdout
@@ -13,15 +13,14 @@ $wxs =
     }
 end Rec }
 
-T3772.foo [InlPrag=NOINLINE] :: GHC.Types.Int -> ()
+foo [InlPrag=NOINLINE] :: Int -> ()
 [GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S,1*U(U)>]
-T3772.foo =
-  \ (n :: GHC.Types.Int) ->
+foo =
+  \ (n :: Int) ->
     case n of _ [Occ=Dead] { GHC.Types.I# y ->
-    case GHC.Prim.tagToEnum# @ GHC.Types.Bool (GHC.Prim.<# 0 y)
-    of _ [Occ=Dead] {
-      GHC.Types.False -> GHC.Tuple.();
-      GHC.Types.True -> $wxs y
+    case GHC.Prim.tagToEnum# @ Bool (GHC.Prim.<# 0 y) of _ [Occ=Dead] {
+      False -> GHC.Tuple.();
+      True -> $wxs y
     }
     }
 
diff --git a/testsuite/tests/simplCore/should_compile/T4201.stdout b/testsuite/tests/simplCore/should_compile/T4201.stdout
index 6ff4692854..51b159627e 100644
--- a/testsuite/tests/simplCore/should_compile/T4201.stdout
+++ b/testsuite/tests/simplCore/should_compile/T4201.stdout
@@ -1,3 +1,3 @@
   {- Arity: 1, HasNoCafRefs, Strictness: <S,1*U()>m,
      Unfolding: InlineRule (0, True, True)
-                Eta.bof `cast` (Sym (Eta.NTCo:Foo[0]) ->_R <Eta.T>_R) -}
+                bof `cast` (Sym (NTCo:Foo[0]) ->_R <T>_R) -}
diff --git a/testsuite/tests/simplCore/should_compile/T4306.stdout b/testsuite/tests/simplCore/should_compile/T4306.stdout
index b2a93ff1cc..3d52e94830 100644
--- a/testsuite/tests/simplCore/should_compile/T4306.stdout
+++ b/testsuite/tests/simplCore/should_compile/T4306.stdout
@@ -1 +1 @@
-  $wupd :: GHC.Prim.Double# -> GHC.Prim.Double#
+  $wupd :: Double# -> Double#
diff --git a/testsuite/tests/simplCore/should_compile/T4908.stderr b/testsuite/tests/simplCore/should_compile/T4908.stderr
index 9729289ea6..7cc25b9f06 100644
--- a/testsuite/tests/simplCore/should_compile/T4908.stderr
+++ b/testsuite/tests/simplCore/should_compile/T4908.stderr
@@ -3,27 +3,21 @@
 Result size of Tidy Core = {terms: 54, types: 38, coercions: 0}
 
 Rec {
-T4908.f_$s$wf [Occ=LoopBreaker]
-  :: GHC.Prim.Int#
-     -> GHC.Types.Int -> GHC.Prim.Int# -> GHC.Types.Bool
+T4908.f_$s$wf [Occ=LoopBreaker] :: Int# -> Int -> Int# -> Bool
 [GblId, Arity=3, Caf=NoCafRefs, Str=DmdType <S,1*U><L,A><L,U>]
 T4908.f_$s$wf =
-  \ (sc :: GHC.Prim.Int#)
-    (sc1 :: GHC.Types.Int)
-    (sc2 :: GHC.Prim.Int#) ->
+  \ (sc :: Int#) (sc1 :: Int) (sc2 :: Int#) ->
     case sc of ds {
       __DEFAULT ->
         case sc2 of ds1 {
-          __DEFAULT -> T4908.f_$s$wf (GHC.Prim.-# ds 1) sc1 ds1;
+          __DEFAULT -> T4908.f_$s$wf (-# ds 1) sc1 ds1;
           0 -> GHC.Types.True
         };
       0 -> GHC.Types.True
     }
 end Rec }
 
-T4908.$wf [InlPrag=[0]]
-  :: GHC.Prim.Int#
-     -> (GHC.Types.Int, GHC.Types.Int) -> GHC.Types.Bool
+T4908.$wf [InlPrag=[0]] :: Int# -> (Int, Int) -> Bool
 [GblId,
  Arity=2,
  Caf=NoCafRefs,
@@ -31,13 +25,13 @@ T4908.$wf [InlPrag=[0]]
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [30 20] 101 20}]
 T4908.$wf =
-  \ (ww :: GHC.Prim.Int#) (w :: (GHC.Types.Int, GHC.Types.Int)) ->
+  \ (ww :: Int#) (w :: (Int, Int)) ->
     case ww of ds {
       __DEFAULT ->
         case w of _ [Occ=Dead] { (a, b) ->
-        case b of _ [Occ=Dead] { GHC.Types.I# ds1 ->
+        case b of _ [Occ=Dead] { I# ds1 ->
         case ds1 of ds2 {
-          __DEFAULT -> T4908.f_$s$wf (GHC.Prim.-# ds 1) a ds2;
+          __DEFAULT -> T4908.f_$s$wf (-# ds 1) a ds2;
           0 -> GHC.Types.True
         }
         }
@@ -45,9 +39,7 @@ T4908.$wf =
       0 -> GHC.Types.True
     }
 
-T4908.f [InlPrag=INLINE[0]]
-  :: GHC.Types.Int
-     -> (GHC.Types.Int, GHC.Types.Int) -> GHC.Types.Bool
+f [InlPrag=INLINE[0]] :: Int -> (Int, Int) -> Bool
 [GblId,
  Arity=2,
  Caf=NoCafRefs,
@@ -55,21 +47,16 @@ T4908.f [InlPrag=INLINE[0]]
  Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True,
          Guidance=ALWAYS_IF(arity=2,unsat_ok=True,boring_ok=False)
-         Tmpl= \ (w [Occ=Once!] :: GHC.Types.Int)
-                 (w1 [Occ=Once] :: (GHC.Types.Int, GHC.Types.Int)) ->
-                 case w of _ [Occ=Dead] { GHC.Types.I# ww1 [Occ=Once] ->
-                 T4908.$wf ww1 w1
-                 }}]
-T4908.f =
-  \ (w :: GHC.Types.Int) (w1 :: (GHC.Types.Int, GHC.Types.Int)) ->
-    case w of _ [Occ=Dead] { GHC.Types.I# ww1 -> T4908.$wf ww1 w1 }
+         Tmpl= \ (w [Occ=Once!] :: Int) (w1 [Occ=Once] :: (Int, Int)) ->
+                 case w of _ [Occ=Dead] { I# ww1 [Occ=Once] -> T4908.$wf ww1 w1 }}]
+f =
+  \ (w :: Int) (w1 :: (Int, Int)) ->
+    case w of _ [Occ=Dead] { I# ww1 -> T4908.$wf ww1 w1 }
 
 
 ------ Local rules for imported ids --------
 "SC:$wf0" [0]
-    forall (sc :: GHC.Prim.Int#)
-           (sc1 :: GHC.Types.Int)
-           (sc2 :: GHC.Prim.Int#).
+    forall (sc :: Int#) (sc1 :: Int) (sc2 :: Int#).
       T4908.$wf sc (sc1, GHC.Types.I# sc2)
       = T4908.f_$s$wf sc sc1 sc2
 
diff --git a/testsuite/tests/simplCore/should_compile/T4918.stdout b/testsuite/tests/simplCore/should_compile/T4918.stdout
index 708be353c4..b0a072d2b0 100644
--- a/testsuite/tests/simplCore/should_compile/T4918.stdout
+++ b/testsuite/tests/simplCore/should_compile/T4918.stdout
@@ -1,2 +1,2 @@
-  {- HasNoCafRefs, Strictness: m, Unfolding: (GHC.Types.C# 'p') -}
-  {- HasNoCafRefs, Strictness: m, Unfolding: (GHC.Types.C# 'q') -}
+  {- HasNoCafRefs, Strictness: m, Unfolding: (C# 'p') -}
+  {- HasNoCafRefs, Strictness: m, Unfolding: (C# 'q') -}
diff --git a/testsuite/tests/simplCore/should_compile/T4930.stderr b/testsuite/tests/simplCore/should_compile/T4930.stderr
index 5f0aad2525..1a54d0d5bc 100644
--- a/testsuite/tests/simplCore/should_compile/T4930.stderr
+++ b/testsuite/tests/simplCore/should_compile/T4930.stderr
@@ -2,36 +2,34 @@
 ==================== Tidy Core ====================
 Result size of Tidy Core = {terms: 23, types: 11, coercions: 0}
 
-lvl :: [GHC.Types.Char]
+lvl :: [Char]
 [GblId, Str=DmdType]
 lvl = GHC.CString.unpackCString# "Too small"#
 
-T4930.foo1 :: GHC.Types.Int
+T4930.foo1 :: Int
 [GblId, Str=DmdType b]
-T4930.foo1 = GHC.Err.error @ GHC.Types.Int lvl
+T4930.foo1 = error @ Int lvl
 
-T4930.foo :: GHC.Types.Int -> GHC.Types.Int
+foo :: Int -> Int
 [GblId,
  Arity=1,
  Str=DmdType <S,1*U(U)>m,
  Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True,
          Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=False)
-         Tmpl= \ (n [Occ=Once!] :: GHC.Types.Int) ->
+         Tmpl= \ (n [Occ=Once!] :: Int) ->
                  case n of _ [Occ=Dead] { GHC.Types.I# x ->
-                 case GHC.Prim.tagToEnum# @ GHC.Types.Bool (GHC.Prim.<# x 5)
-                 of _ [Occ=Dead] {
-                   GHC.Types.False -> GHC.Types.I# (GHC.Prim.+# x 5);
-                   GHC.Types.True -> T4930.foo1
+                 case GHC.Prim.tagToEnum# @ Bool (GHC.Prim.<# x 5) of _ [Occ=Dead] {
+                   False -> GHC.Types.I# (GHC.Prim.+# x 5);
+                   True -> T4930.foo1
                  }
                  }}]
-T4930.foo =
-  \ (n :: GHC.Types.Int) ->
+foo =
+  \ (n :: Int) ->
     case n of _ [Occ=Dead] { GHC.Types.I# x ->
-    case GHC.Prim.tagToEnum# @ GHC.Types.Bool (GHC.Prim.<# x 5)
-    of _ [Occ=Dead] {
-      GHC.Types.False -> GHC.Types.I# (GHC.Prim.+# x 5);
-      GHC.Types.True -> T4930.foo1
+    case GHC.Prim.tagToEnum# @ Bool (GHC.Prim.<# x 5) of _ [Occ=Dead] {
+      False -> GHC.Types.I# (GHC.Prim.+# x 5);
+      True -> T4930.foo1
     }
     }
 
diff --git a/testsuite/tests/simplCore/should_compile/T5366.stdout b/testsuite/tests/simplCore/should_compile/T5366.stdout
index ccc1561d05..df0f9ba05d 100644
--- a/testsuite/tests/simplCore/should_compile/T5366.stdout
+++ b/testsuite/tests/simplCore/should_compile/T5366.stdout
@@ -1 +1 @@
-    case ds of _ [Occ=Dead] { T5366.Bar dt dt1 -> GHC.Types.I# dt }
+    case ds of _ [Occ=Dead] { Bar dt dt1 -> GHC.Types.I# dt }
diff --git a/testsuite/tests/simplCore/should_compile/T6056.stderr b/testsuite/tests/simplCore/should_compile/T6056.stderr
index 50c7e66f0a..d9d4193785 100644
--- a/testsuite/tests/simplCore/should_compile/T6056.stderr
+++ b/testsuite/tests/simplCore/should_compile/T6056.stderr
@@ -8,5 +8,6 @@ Rule fired: SPEC/T6056 $wsmallerAndRest @ Integer
 Rule fired: SPEC/T6056 $wsmallerAndRest @ Integer
 Rule fired: SPEC/T6056 $wsmallerAndRest @ Int
 Rule fired: SPEC/T6056 $wsmallerAndRest @ Int
-Rule fired: SPEC/T6056 $wsmallerAndRest @ Integer
 Rule fired: SPEC/T6056 $wsmallerAndRest @ Int
+Rule fired: SPEC/T6056 $wsmallerAndRest @ Integer
+
diff --git a/testsuite/tests/simplCore/should_compile/T7360.stderr b/testsuite/tests/simplCore/should_compile/T7360.stderr
index 5d10285099..2cd7c2100e 100644
--- a/testsuite/tests/simplCore/should_compile/T7360.stderr
+++ b/testsuite/tests/simplCore/should_compile/T7360.stderr
@@ -2,7 +2,7 @@
 ==================== Tidy Core ====================
 Result size of Tidy Core = {terms: 36, types: 29, coercions: 0}
 
-T7360.$WFoo3 [InlPrag=INLINE] :: GHC.Types.Int -> T7360.Foo
+T7360.$WFoo3 [InlPrag=INLINE] :: Int -> Foo
 [GblId[DataConWrapper],
  Arity=1,
  Caf=NoCafRefs,
@@ -10,20 +10,20 @@ T7360.$WFoo3 [InlPrag=INLINE] :: GHC.Types.Int -> T7360.Foo
  Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True,
          Guidance=ALWAYS_IF(arity=1,unsat_ok=False,boring_ok=False)
-         Tmpl= \ (dt [Occ=Once!] :: GHC.Types.Int) ->
+         Tmpl= \ (dt [Occ=Once!] :: Int) ->
                  case dt of _ [Occ=Dead] { GHC.Types.I# dt [Occ=Once] ->
                  T7360.Foo3 dt
                  }}]
 T7360.$WFoo3 =
-  \ (dt [Occ=Once!] :: GHC.Types.Int) ->
+  \ (dt [Occ=Once!] :: Int) ->
     case dt of _ [Occ=Dead] { GHC.Types.I# dt [Occ=Once] ->
     T7360.Foo3 dt
     }
 
-T7360.fun1 [InlPrag=NOINLINE] :: T7360.Foo -> ()
+fun1 [InlPrag=NOINLINE] :: Foo -> ()
 [GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S,1*U>]
-T7360.fun1 =
-  \ (x :: T7360.Foo) ->
+fun1 =
+  \ (x :: Foo) ->
     case x of _ [Occ=Dead] { __DEFAULT -> GHC.Tuple.() }
 
 T7360.fun4 :: ()
@@ -31,9 +31,9 @@ T7360.fun4 :: ()
  Str=DmdType,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=False, ConLike=False,
          WorkFree=False, Expandable=False, Guidance=IF_ARGS [] 20 0}]
-T7360.fun4 = T7360.fun1 T7360.Foo1
+T7360.fun4 = fun1 T7360.Foo1
 
-T7360.fun3 :: GHC.Types.Int
+T7360.fun3 :: Int
 [GblId,
  Caf=NoCafRefs,
  Str=DmdType m,
@@ -41,7 +41,7 @@ T7360.fun3 :: GHC.Types.Int
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 20}]
 T7360.fun3 = GHC.Types.I# 0
 
-T7360.fun2 :: forall a. [a] -> ((), GHC.Types.Int)
+fun2 :: forall a. [a] -> ((), Int)
 [GblId,
  Arity=1,
  Str=DmdType <L,1*U>m,
@@ -57,7 +57,7 @@ T7360.fun2 :: forall a. [a] -> ((), GHC.Types.Int)
                       GHC.Types.I# ww2
                       }
                   })}]
-T7360.fun2 =
+fun2 =
   \ (@ a) (x :: [a]) ->
     (T7360.fun4,
      case x of wild {
diff --git a/testsuite/tests/simplCore/should_compile/T7865.stdout b/testsuite/tests/simplCore/should_compile/T7865.stdout
index 93c495d1d7..56419a939c 100644
--- a/testsuite/tests/simplCore/should_compile/T7865.stdout
+++ b/testsuite/tests/simplCore/should_compile/T7865.stdout
@@ -1,4 +1,4 @@
-T7865.expensive [InlPrag=NOINLINE]
-T7865.expensive =
-        case T7865.expensive sc of _ [Occ=Dead] { GHC.Types.I# x ->
-                (case T7865.expensive x of _ [Occ=Dead] { GHC.Types.I# x1 ->
+expensive [InlPrag=NOINLINE] :: Int -> Int
+expensive =
+        case expensive sc of _ [Occ=Dead] { GHC.Types.I# x ->
+                (case expensive x of _ [Occ=Dead] { GHC.Types.I# x1 ->
diff --git a/testsuite/tests/simplCore/should_compile/T8832.stdout b/testsuite/tests/simplCore/should_compile/T8832.stdout
index 271963122d..aefe486c0c 100644
--- a/testsuite/tests/simplCore/should_compile/T8832.stdout
+++ b/testsuite/tests/simplCore/should_compile/T8832.stdout
@@ -1,10 +1,10 @@
-T8832.i = GHC.Types.I# 0
-T8832.i8 = GHC.Int.I8# 0
-T8832.i16 = GHC.Int.I16# 0
-T8832.i32 = GHC.Int.I32# 0
-T8832.i64 = GHC.Int.I64# 0
-T8832.w = GHC.Types.W# (__word 0)
-T8832.w8 = GHC.Word.W8# (__word 0)
-T8832.w16 = GHC.Word.W16# (__word 0)
-T8832.w32 = GHC.Word.W32# (__word 0)
-T8832.w64 = GHC.Word.W64# (__word 0)
+i = GHC.Types.I# 0
+i8 = GHC.Int.I8# 0
+i16 = GHC.Int.I16# 0
+i32 = GHC.Int.I32# 0
+i64 = GHC.Int.I64# 0
+w = GHC.Types.W# (__word 0)
+w8 = GHC.Word.W8# (__word 0)
+w16 = GHC.Word.W16# (__word 0)
+w32 = GHC.Word.W32# (__word 0)
+w64 = GHC.Word.W64# (__word 0)
diff --git a/testsuite/tests/simplCore/should_compile/T8832.stdout-ws-32 b/testsuite/tests/simplCore/should_compile/T8832.stdout-ws-32
index d09293705f..2a3238ce0c 100644
--- a/testsuite/tests/simplCore/should_compile/T8832.stdout-ws-32
+++ b/testsuite/tests/simplCore/should_compile/T8832.stdout-ws-32
@@ -1,8 +1,8 @@
-T8832.i = GHC.Types.I# 0
-T8832.i8 = GHC.Int.I8# 0
-T8832.i16 = GHC.Int.I16# 0
-T8832.i32 = GHC.Int.I32# 0
-T8832.w = GHC.Types.W# (__word 0)
-T8832.w8 = GHC.Word.W8# (__word 0)
-T8832.w16 = GHC.Word.W16# (__word 0)
-T8832.w32 = GHC.Word.W32# (__word 0)
+i = GHC.Types.I# 0

+i8 = GHC.Int.I8# 0

+i16 = GHC.Int.I16# 0

+i32 = GHC.Int.I32# 0

+w = GHC.Types.W# (__word 0)

+w8 = GHC.Word.W8# (__word 0)

+w16 = GHC.Word.W16# (__word 0)

+w32 = GHC.Word.W32# (__word 0)

diff --git a/testsuite/tests/simplCore/should_compile/T9400.stderr b/testsuite/tests/simplCore/should_compile/T9400.stderr
index e66eecfc0a..938a07204b 100644
--- a/testsuite/tests/simplCore/should_compile/T9400.stderr
+++ b/testsuite/tests/simplCore/should_compile/T9400.stderr
@@ -2,35 +2,35 @@
 ==================== Tidy Core ====================
 Result size of Tidy Core = {terms: 23, types: 16, coercions: 0}
 
-T9400.main :: GHC.Types.IO ()
+main :: IO ()
 [GblId, Str=DmdType]
-T9400.main =
-  GHC.Base.>>
-    @ GHC.Types.IO
+main =
+  >>
+    @ IO
     GHC.Base.$fMonadIO
     @ ()
     @ ()
-    (System.IO.putStrLn (GHC.CString.unpackCString# "c"#))
-    (GHC.Base.>>
-       @ GHC.Types.IO
+    (putStrLn (unpackCString# "c"#))
+    (>>
+       @ IO
        GHC.Base.$fMonadIO
        @ ()
        @ ()
-       (System.IO.putStrLn (GHC.CString.unpackCString# "x"#))
-       (GHC.Base.>>
-          @ GHC.Types.IO
+       (putStrLn (unpackCString# "x"#))
+       (>>
+          @ IO
           GHC.Base.$fMonadIO
           @ ()
           @ ()
-          (System.IO.putStrLn (GHC.CString.unpackCString# "z"#))
-          (GHC.Base.>>
-             @ GHC.Types.IO
+          (putStrLn (unpackCString# "z"#))
+          (>>
+             @ IO
              GHC.Base.$fMonadIO
              @ ()
              @ ()
-             (System.IO.putStrLn (GHC.CString.unpackCString# "efg"#))
+             (putStrLn (unpackCString# "efg"#))
              (Control.Exception.Base.patError
-                @ (GHC.Types.IO ()) "T9400.hs:(17,5)-(18,29)|case"#))))
+                @ (IO ()) "T9400.hs:(17,5)-(18,29)|case"#))))
 
 
 
diff --git a/testsuite/tests/simplCore/should_compile/rule2.stderr b/testsuite/tests/simplCore/should_compile/rule2.stderr
index 2c29fa40d5..a9f3a3b0f7 100644
--- a/testsuite/tests/simplCore/should_compile/rule2.stderr
+++ b/testsuite/tests/simplCore/should_compile/rule2.stderr
@@ -22,7 +22,7 @@ Total ticks:     11
   1 m
   1 a
   1 m
-  1 a
+  1 b
   1 m
   1 b
 9 SimplifierDone 9
diff --git a/testsuite/tests/simplCore/should_compile/spec-inline.stderr b/testsuite/tests/simplCore/should_compile/spec-inline.stderr
index aee86c36fa..29c8a91301 100644
--- a/testsuite/tests/simplCore/should_compile/spec-inline.stderr
+++ b/testsuite/tests/simplCore/should_compile/spec-inline.stderr
@@ -2,11 +2,11 @@
 ==================== Tidy Core ====================
 Result size of Tidy Core = {terms: 162, types: 61, coercions: 0}
 
-Roman.foo3 :: GHC.Types.Int
+Roman.foo3 :: Int
 [GblId, Str=DmdType b]
 Roman.foo3 =
   Control.Exception.Base.patError
-    @ GHC.Types.Int "spec-inline.hs:(19,5)-(29,25)|function go"#
+    @ Int "spec-inline.hs:(19,5)-(29,25)|function go"#
 
 Rec {
 Roman.foo_$s$wgo [Occ=LoopBreaker]
@@ -24,38 +24,34 @@ Roman.foo_$s$wgo =
                 (GHC.Prim.+# (GHC.Prim.+# (GHC.Prim.+# sc1 sc1) sc1) sc1) sc1)
              sc1)
           sc1 } in
-    case GHC.Prim.tagToEnum# @ GHC.Types.Bool (GHC.Prim.<=# sc 0)
+    case GHC.Prim.tagToEnum# @ Bool (GHC.Prim.<=# sc 0)
     of _ [Occ=Dead] {
-      GHC.Types.False ->
-        case GHC.Prim.tagToEnum# @ GHC.Types.Bool (GHC.Prim.<# sc 100)
+      False ->
+        case GHC.Prim.tagToEnum# @ Bool (GHC.Prim.<# sc 100)
         of _ [Occ=Dead] {
-          GHC.Types.False ->
-            case GHC.Prim.tagToEnum# @ GHC.Types.Bool (GHC.Prim.<# sc 500)
+          False ->
+            case GHC.Prim.tagToEnum# @ Bool (GHC.Prim.<# sc 500)
             of _ [Occ=Dead] {
-              GHC.Types.False ->
-                Roman.foo_$s$wgo (GHC.Prim.-# sc 1) (GHC.Prim.+# a a);
-              GHC.Types.True -> Roman.foo_$s$wgo (GHC.Prim.-# sc 3) a
+              False -> Roman.foo_$s$wgo (GHC.Prim.-# sc 1) (GHC.Prim.+# a a);
+              True -> Roman.foo_$s$wgo (GHC.Prim.-# sc 3) a
             };
-          GHC.Types.True -> Roman.foo_$s$wgo (GHC.Prim.-# sc 2) sc1
+          True -> Roman.foo_$s$wgo (GHC.Prim.-# sc 2) sc1
         };
-      GHC.Types.True -> 0
+      True -> 0
     }
 end Rec }
 
-Roman.$wgo [InlPrag=[0]]
-  :: GHC.Base.Maybe GHC.Types.Int
-     -> GHC.Base.Maybe GHC.Types.Int -> GHC.Prim.Int#
+Roman.$wgo [InlPrag=[0]] :: Maybe Int -> Maybe Int -> GHC.Prim.Int#
 [GblId,
  Arity=2,
  Str=DmdType <S,1*U><S,1*U>,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [60 30] 256 0}]
 Roman.$wgo =
-  \ (w :: GHC.Base.Maybe GHC.Types.Int)
-    (w1 :: GHC.Base.Maybe GHC.Types.Int) ->
+  \ (w :: Maybe Int) (w1 :: Maybe Int) ->
     case w1 of _ [Occ=Dead] {
-      GHC.Base.Nothing -> case Roman.foo3 of wild1 { };
-      GHC.Base.Just x ->
+      Nothing -> case Roman.foo3 of wild1 { };
+      Just x ->
         case x of _ [Occ=Dead] { GHC.Types.I# ipv ->
         let {
           a :: GHC.Prim.Int#
@@ -68,48 +64,43 @@ Roman.$wgo =
                  ipv)
               ipv } in
         case w of _ [Occ=Dead] {
-          GHC.Base.Nothing -> Roman.foo_$s$wgo 10 a;
-          GHC.Base.Just n ->
+          Nothing -> Roman.foo_$s$wgo 10 a;
+          Just n ->
             case n of _ [Occ=Dead] { GHC.Types.I# x2 ->
-            case GHC.Prim.tagToEnum# @ GHC.Types.Bool (GHC.Prim.<=# x2 0)
+            case GHC.Prim.tagToEnum# @ Bool (GHC.Prim.<=# x2 0)
             of _ [Occ=Dead] {
-              GHC.Types.False ->
-                case GHC.Prim.tagToEnum# @ GHC.Types.Bool (GHC.Prim.<# x2 100)
+              False ->
+                case GHC.Prim.tagToEnum# @ Bool (GHC.Prim.<# x2 100)
                 of _ [Occ=Dead] {
-                  GHC.Types.False ->
-                    case GHC.Prim.tagToEnum# @ GHC.Types.Bool (GHC.Prim.<# x2 500)
+                  False ->
+                    case GHC.Prim.tagToEnum# @ Bool (GHC.Prim.<# x2 500)
                     of _ [Occ=Dead] {
-                      GHC.Types.False ->
-                        Roman.foo_$s$wgo (GHC.Prim.-# x2 1) (GHC.Prim.+# a a);
-                      GHC.Types.True -> Roman.foo_$s$wgo (GHC.Prim.-# x2 3) a
+                      False -> Roman.foo_$s$wgo (GHC.Prim.-# x2 1) (GHC.Prim.+# a a);
+                      True -> Roman.foo_$s$wgo (GHC.Prim.-# x2 3) a
                     };
-                  GHC.Types.True -> Roman.foo_$s$wgo (GHC.Prim.-# x2 2) ipv
+                  True -> Roman.foo_$s$wgo (GHC.Prim.-# x2 2) ipv
                 };
-              GHC.Types.True -> 0
+              True -> 0
             }
             }
         }
         }
     }
 
-Roman.foo_go [InlPrag=INLINE[0]]
-  :: GHC.Base.Maybe GHC.Types.Int
-     -> GHC.Base.Maybe GHC.Types.Int -> GHC.Types.Int
+Roman.foo_go [InlPrag=INLINE[0]] :: Maybe Int -> Maybe Int -> Int
 [GblId,
  Arity=2,
  Str=DmdType <S,1*U><S,1*U>m,
  Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True,
          Guidance=ALWAYS_IF(arity=2,unsat_ok=True,boring_ok=False)
-         Tmpl= \ (w [Occ=Once] :: GHC.Base.Maybe GHC.Types.Int)
-                 (w1 [Occ=Once] :: GHC.Base.Maybe GHC.Types.Int) ->
+         Tmpl= \ (w [Occ=Once] :: Maybe Int) (w1 [Occ=Once] :: Maybe Int) ->
                  case Roman.$wgo w w1 of ww { __DEFAULT -> GHC.Types.I# ww }}]
 Roman.foo_go =
-  \ (w :: GHC.Base.Maybe GHC.Types.Int)
-    (w1 :: GHC.Base.Maybe GHC.Types.Int) ->
+  \ (w :: Maybe Int) (w1 :: Maybe Int) ->
     case Roman.$wgo w w1 of ww { __DEFAULT -> GHC.Types.I# ww }
 
-Roman.foo2 :: GHC.Types.Int
+Roman.foo2 :: Int
 [GblId,
  Caf=NoCafRefs,
  Str=DmdType m,
@@ -117,15 +108,15 @@ Roman.foo2 :: GHC.Types.Int
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 20}]
 Roman.foo2 = GHC.Types.I# 6
 
-Roman.foo1 :: GHC.Base.Maybe GHC.Types.Int
+Roman.foo1 :: Maybe Int
 [GblId,
  Caf=NoCafRefs,
  Str=DmdType m2,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 20}]
-Roman.foo1 = GHC.Base.Just @ GHC.Types.Int Roman.foo2
+Roman.foo1 = GHC.Base.Just @ Int Roman.foo2
 
-Roman.foo :: GHC.Types.Int -> GHC.Types.Int
+foo :: Int -> Int
 [GblId,
  Arity=1,
  Caf=NoCafRefs,
@@ -133,12 +124,12 @@ Roman.foo :: GHC.Types.Int -> GHC.Types.Int
  Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True,
          Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=False)
-         Tmpl= \ (n [Occ=Once!] :: GHC.Types.Int) ->
+         Tmpl= \ (n [Occ=Once!] :: Int) ->
                  case n of n1 { GHC.Types.I# _ [Occ=Dead] ->
-                 Roman.foo_go (GHC.Base.Just @ GHC.Types.Int n1) Roman.foo1
+                 Roman.foo_go (GHC.Base.Just @ Int n1) Roman.foo1
                  }}]
-Roman.foo =
-  \ (n :: GHC.Types.Int) ->
+foo =
+  \ (n :: Int) ->
     case n of _ [Occ=Dead] { GHC.Types.I# ipv ->
     case Roman.foo_$s$wgo ipv 6 of ww { __DEFAULT -> GHC.Types.I# ww }
     }
@@ -147,8 +138,8 @@ Roman.foo =
 ------ Local rules for imported ids --------
 "SC:$wgo0" [0]
     forall (sc :: GHC.Prim.Int#) (sc1 :: GHC.Prim.Int#).
-      Roman.$wgo (GHC.Base.Just @ GHC.Types.Int (GHC.Types.I# sc))
-                 (GHC.Base.Just @ GHC.Types.Int (GHC.Types.I# sc1))
+      Roman.$wgo (GHC.Base.Just @ Int (GHC.Types.I# sc))
+                 (GHC.Base.Just @ Int (GHC.Types.I# sc1))
       = Roman.foo_$s$wgo sc sc1