Print Core type applications with no whitespace after @ (#17643)

This brings the pretty-printer for Core in line with how visible
type applications are normally printed: namely, with no whitespace
after the `@` character (i.e., `f @a` instead of `f @ a`). While I'm
in town, I also give the same treatment to type abstractions (i.e.,
`\(@a)` instead of `\(@ a)`) and coercion applications (i.e.,
`f @~x` instead of `f @~ x`).

Fixes #17643.

36 files changed, 160 insertions, 195 deletions

diff --git a/compiler/GHC/Iface/Syntax.hs b/compiler/GHC/Iface/Syntax.hs
index 723401cb7e..9509cfe77c 100644
--- a/compiler/GHC/Iface/Syntax.hs
+++ b/compiler/GHC/Iface/Syntax.hs
@@ -1290,8 +1290,8 @@ pprIfaceExpr _       (IfaceLcl v)       = ppr v
 pprIfaceExpr _       (IfaceExt v)       = ppr v
 pprIfaceExpr _       (IfaceLit l)       = ppr l
 pprIfaceExpr _       (IfaceFCall cc ty) = braces (ppr cc <+> ppr ty)
-pprIfaceExpr _       (IfaceType ty)     = char '@' <+> pprParendIfaceType ty
-pprIfaceExpr _       (IfaceCo co)       = text "@~" <+> pprParendIfaceCoercion co
+pprIfaceExpr _       (IfaceType ty)     = char '@' <> pprParendIfaceType ty
+pprIfaceExpr _       (IfaceCo co)       = text "@~" <> pprParendIfaceCoercion co
 
 pprIfaceExpr add_par app@(IfaceApp _ _) = add_par (pprIfaceApp app [])
 pprIfaceExpr _       (IfaceTuple c as)  = tupleParens c (pprWithCommas ppr as)
diff --git a/compiler/GHC/Iface/Type.hs b/compiler/GHC/Iface/Type.hs
index fbabb5b8b5..184849d319 100644
--- a/compiler/GHC/Iface/Type.hs
+++ b/compiler/GHC/Iface/Type.hs
@@ -714,8 +714,8 @@ isIfaceTauType _ = True
 
 instance Outputable IfaceBndr where
     ppr (IfaceIdBndr bndr) = pprIfaceIdBndr bndr
-    ppr (IfaceTvBndr bndr) = char '@' <+> pprIfaceTvBndr bndr (SuppressBndrSig False)
-                                                              (UseBndrParens False)
+    ppr (IfaceTvBndr bndr) = char '@' <> pprIfaceTvBndr bndr (SuppressBndrSig False)
+                                                             (UseBndrParens False)
 
 pprIfaceBndrs :: [IfaceBndr] -> SDoc
 pprIfaceBndrs bs = sep (map ppr bs)
diff --git a/compiler/basicTypes/RdrName.hs b/compiler/basicTypes/RdrName.hs
index 87e6fd41b6..1cf2b6b260 100644
--- a/compiler/basicTypes/RdrName.hs
+++ b/compiler/basicTypes/RdrName.hs
@@ -280,7 +280,7 @@ instance Outputable RdrName where
 
 instance OutputableBndr RdrName where
     pprBndr _ n
-        | isTvOcc (rdrNameOcc n) = char '@' <+> ppr n
+        | isTvOcc (rdrNameOcc n) = char '@' <> ppr n
         | otherwise              = ppr n
 
     pprInfixOcc  rdr = pprInfixVar  (isSymOcc (rdrNameOcc rdr)) (ppr rdr)
diff --git a/compiler/coreSyn/PprCore.hs b/compiler/coreSyn/PprCore.hs
index c959fc1c4e..0bf188e6a8 100644
--- a/compiler/coreSyn/PprCore.hs
+++ b/compiler/coreSyn/PprCore.hs
@@ -319,8 +319,8 @@ pprArg (Type ty)
  = sdocWithDynFlags $ \dflags ->
    if gopt Opt_SuppressTypeApplications dflags
    then empty
-   else text "@" <+> pprParendType ty
-pprArg (Coercion co) = text "@~" <+> pprOptCo co
+   else text "@" <> pprParendType ty
+pprArg (Coercion co) = text "@~" <> pprOptCo co
 pprArg expr          = pprParendExpr expr
 
 {-
@@ -381,7 +381,7 @@ pprCoreBinder bind_site bndr
 
 pprUntypedBinder :: Var -> SDoc
 pprUntypedBinder binder
-  | isTyVar binder = text "@" <+> ppr binder    -- NB: don't print kind
+  | isTyVar binder = text "@" <> ppr binder    -- NB: don't print kind
   | otherwise      = pprIdBndr binder
 
 pprTypedLamBinder :: BindingSite -> Bool -> Var -> SDoc
@@ -431,7 +431,7 @@ pprTypedLetBinder binder
 pprKindedTyVarBndr :: TyVar -> SDoc
 -- Print a type variable binder with its kind (but not if *)
 pprKindedTyVarBndr tyvar
-  = text "@" <+> pprTyVar tyvar
+  = text "@" <> pprTyVar tyvar
 
 -- pprIdBndr does *not* print the type
 -- When printing any Id binder in debug mode, we print its inline pragma and one-shot-ness
diff --git a/compiler/specialise/Specialise.hs b/compiler/specialise/Specialise.hs
index 642071129e..1dcf76b8ea 100644
--- a/compiler/specialise/Specialise.hs
+++ b/compiler/specialise/Specialise.hs
@@ -2158,7 +2158,7 @@ pprCallInfo fn (CI { ci_key = key })
   = ppr fn <+> ppr key
 
 ppr_call_key_ty :: SpecArg -> Maybe SDoc
-ppr_call_key_ty (SpecType ty) = Just $ char '@' <+> pprParendType ty
+ppr_call_key_ty (SpecType ty) = Just $ char '@' <> pprParendType ty
 ppr_call_key_ty UnspecType    = Just $ char '_'
 ppr_call_key_ty (SpecDict _)  = Nothing
 ppr_call_key_ty UnspecArg     = Nothing
diff --git a/compiler/typecheck/TcEvidence.hs b/compiler/typecheck/TcEvidence.hs
index ee5b72033f..77ea45b3d5 100644
--- a/compiler/typecheck/TcEvidence.hs
+++ b/compiler/typecheck/TcEvidence.hs
@@ -924,7 +924,7 @@ pprHsWrapper wrap pp_thing_inside
     help it (WpCast co)   = add_parens $ sep [it False, nest 2 (text "|>"
                                               <+> pprParendCo co)]
     help it (WpEvApp id)  = no_parens  $ sep [it True, nest 2 (ppr id)]
-    help it (WpTyApp ty)  = no_parens  $ sep [it True, text "@" <+> pprParendType ty]
+    help it (WpTyApp ty)  = no_parens  $ sep [it True, text "@" <> pprParendType ty]
     help it (WpEvLam id)  = add_parens $ sep [ text "\\" <> pprLamBndr id <> dot, it False]
     help it (WpTyLam tv)  = add_parens $ sep [text "/\\" <> pprLamBndr tv <> dot, it False]
     help it (WpLet binds) = add_parens $ sep [text "let" <+> braces (ppr binds), it False]
diff --git a/testsuite/tests/deSugar/should_compile/T13208.stdout b/testsuite/tests/deSugar/should_compile/T13208.stdout
index d2e0c1fd05..da04a43c6b 100644
--- a/testsuite/tests/deSugar/should_compile/T13208.stdout
+++ b/testsuite/tests/deSugar/should_compile/T13208.stdout
@@ -1,6 +1,6 @@
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True,
          Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=True)}]
-f = \ (@ p) _ [Occ=Dead] -> GHC.Types.True
+f = \ (@p) _ [Occ=Dead] -> GHC.Types.True
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 80 30}]
diff --git a/testsuite/tests/deSugar/should_compile/T16615.stderr b/testsuite/tests/deSugar/should_compile/T16615.stderr
index 41b754c37e..9c2ccb5235 100644
--- a/testsuite/tests/deSugar/should_compile/T16615.stderr
+++ b/testsuite/tests/deSugar/should_compile/T16615.stderr
@@ -19,8 +19,8 @@ g :: Int -> Bool
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [0] 120 10}]
 g = \ (i :: Int) ->
-      case == @ Int GHC.Classes.$fEqInt i (GHC.Types.I# 0#) of {
-        False -> f (pred @ Int GHC.Enum.$fEnumInt i);
+      case == @Int GHC.Classes.$fEqInt i (GHC.Types.I# 0#) of {
+        False -> f (pred @Int GHC.Enum.$fEnumInt i);
         True -> GHC.Types.False
       }
 
@@ -30,8 +30,8 @@ f [Occ=LoopBreaker] :: Int -> Bool
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [0] 120 10}]
 f = \ (i :: Int) ->
-      case == @ Int GHC.Classes.$fEqInt i (GHC.Types.I# 0#) of {
-        False -> g (pred @ Int GHC.Enum.$fEnumInt i);
+      case == @Int GHC.Classes.$fEqInt i (GHC.Types.I# 0#) of {
+        False -> g (pred @Int GHC.Enum.$fEnumInt i);
         True -> GHC.Types.True
       }
 end Rec }
diff --git a/testsuite/tests/deSugar/should_compile/T2431.stderr b/testsuite/tests/deSugar/should_compile/T2431.stderr
index 92d99a8d14..6073e67108 100644
--- a/testsuite/tests/deSugar/should_compile/T2431.stderr
+++ b/testsuite/tests/deSugar/should_compile/T2431.stderr
@@ -11,14 +11,14 @@ T2431.$WRefl [InlPrag=INLINE[0]] :: forall a. a :~: a
  Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True,
          Guidance=ALWAYS_IF(arity=0,unsat_ok=True,boring_ok=True)
-         Tmpl= \ (@ a) -> T2431.Refl @ a @ a @~ (<a>_N :: a GHC.Prim.~# a)}]
+         Tmpl= \ (@a) -> T2431.Refl @a @a @~(<a>_N :: a GHC.Prim.~# a)}]
 T2431.$WRefl
-  = \ (@ a) -> T2431.Refl @ a @ a @~ (<a>_N :: a GHC.Prim.~# a)
+  = \ (@a) -> T2431.Refl @a @a @~(<a>_N :: a GHC.Prim.~# a)
 
 -- RHS size: {terms: 4, types: 8, coercions: 0, joins: 0/0}
 absurd :: forall a. (Int :~: Bool) -> a
 [GblId, Arity=1, Caf=NoCafRefs, Str=<L,U>b, Unf=OtherCon []]
-absurd = \ (@ a) (x :: Int :~: Bool) -> case x of { }
+absurd = \ (@a) (x :: Int :~: Bool) -> case x of { }
 
 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0}
 $trModule1 :: GHC.Prim.Addr#
@@ -77,12 +77,12 @@ $krep1 :: [GHC.Types.KindRep]
 [GblId, Caf=NoCafRefs, Unf=OtherCon []]
 $krep1
   = GHC.Types.:
-      @ GHC.Types.KindRep $krep (GHC.Types.[] @ GHC.Types.KindRep)
+      @GHC.Types.KindRep $krep (GHC.Types.[] @GHC.Types.KindRep)
 
 -- RHS size: {terms: 3, types: 1, coercions: 0, joins: 0/0}
 $krep2 :: [GHC.Types.KindRep]
 [GblId, Caf=NoCafRefs, Unf=OtherCon []]
-$krep2 = GHC.Types.: @ GHC.Types.KindRep $krep $krep1
+$krep2 = GHC.Types.: @GHC.Types.KindRep $krep $krep1
 
 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0}
 $krep3 :: GHC.Types.KindRep
diff --git a/testsuite/tests/deriving/should_compile/T17339.stderr b/testsuite/tests/deriving/should_compile/T17339.stderr
index 68da373ae4..496ec84d88 100644
--- a/testsuite/tests/deriving/should_compile/T17339.stderr
+++ b/testsuite/tests/deriving/should_compile/T17339.stderr
@@ -5,19 +5,19 @@ Result size of Tidy Core
 
 -- RHS size: {terms: 1, types: 2, coercions: 0, joins: 0/0}
 T17339.$fClsA1B1 :: Cls A1 B1
-T17339.$fClsA1B1 = T17339.C:Cls @ A1 @ B1
+T17339.$fClsA1B1 = T17339.C:Cls @A1 @B1
 
 -- RHS size: {terms: 1, types: 2, coercions: 0, joins: 0/0}
 T17339.$fClsA2B1 :: Cls A2 B1
-T17339.$fClsA2B1 = T17339.C:Cls @ A2 @ B1
+T17339.$fClsA2B1 = T17339.C:Cls @A2 @B1
 
 -- RHS size: {terms: 1, types: 2, coercions: 0, joins: 0/0}
 T17339.$fClsA1B2 :: Cls A1 B2
-T17339.$fClsA1B2 = T17339.C:Cls @ A1 @ B2
+T17339.$fClsA1B2 = T17339.C:Cls @A1 @B2
 
 -- RHS size: {terms: 1, types: 2, coercions: 0, joins: 0/0}
 T17339.$fClsA2B2 :: Cls A2 B2
-T17339.$fClsA2B2 = T17339.C:Cls @ A2 @ B2
+T17339.$fClsA2B2 = T17339.C:Cls @A2 @B2
 
 
 
diff --git a/testsuite/tests/ghci/should_run/T16096.stdout b/testsuite/tests/ghci/should_run/T16096.stdout
index 8b87b7d61c..6b34692d54 100644
--- a/testsuite/tests/ghci/should_run/T16096.stdout
+++ b/testsuite/tests/ghci/should_run/T16096.stdout
@@ -10,20 +10,15 @@ letrec {
       letrec {
         x :: [GHC.Types.Int]
         [LclId]
-        x = GHC.Enum.enumFrom
-              @ GHC.Types.Int $dEnum (GHC.Types.I# 1#); } in
+        x = GHC.Enum.enumFrom @GHC.Types.Int $dEnum (GHC.Types.I# 1#); } in
       x; } in
 GHC.Base.returnIO
-  @ [()]
+  @[()]
   (GHC.Types.:
-     @ ()
+     @()
      (GHC.Prim.unsafeCoerce#
-        @ 'GHC.Types.LiftedRep
-        @ 'GHC.Types.LiftedRep
-        @ [GHC.Types.Int]
-        @ ()
-        x)
-     (GHC.Types.[] @ ()))
+        @'GHC.Types.LiftedRep @'GHC.Types.LiftedRep @[GHC.Types.Int] @() x)
+     (GHC.Types.[] @()))
 
 
 
@@ -38,19 +33,14 @@ letrec {
       letrec {
         x :: [GHC.Types.Int]
         [LclId]
-        x = GHC.Enum.enumFrom
-              @ GHC.Types.Int $dEnum (GHC.Types.I# 1#); } in
+        x = GHC.Enum.enumFrom @GHC.Types.Int $dEnum (GHC.Types.I# 1#); } in
       x; } in
 GHC.Base.returnIO
-  @ [()]
+  @[()]
   (GHC.Types.:
-     @ ()
+     @()
      (GHC.Prim.unsafeCoerce#
-        @ 'GHC.Types.LiftedRep
-        @ 'GHC.Types.LiftedRep
-        @ [GHC.Types.Int]
-        @ ()
-        x)
-     (GHC.Types.[] @ ()))
+        @'GHC.Types.LiftedRep @'GHC.Types.LiftedRep @[GHC.Types.Int] @() x)
+     (GHC.Types.[] @()))
 
 
diff --git a/testsuite/tests/numeric/should_compile/T14465.stdout b/testsuite/tests/numeric/should_compile/T14465.stdout
index b7c88c40ac..88ac5f70e0 100644
--- a/testsuite/tests/numeric/should_compile/T14465.stdout
+++ b/testsuite/tests/numeric/should_compile/T14465.stdout
@@ -71,10 +71,10 @@ minusOne
   = case M.minusOne1 of {
       NatS# ds1 ->
         case ds1 of {
-          __DEFAULT -> GHC.Natural.underflowError @ Natural;
+          __DEFAULT -> GHC.Natural.underflowError @Natural;
           0## -> GHC.Natural.zero
         };
-      NatJ# ipv -> GHC.Natural.underflowError @ Natural
+      NatJ# ipv -> GHC.Natural.underflowError @Natural
     }
 
 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0}
diff --git a/testsuite/tests/perf/compiler/T16473.stdout b/testsuite/tests/perf/compiler/T16473.stdout
index 4427d39a45..e70603e56f 100644
--- a/testsuite/tests/perf/compiler/T16473.stdout
+++ b/testsuite/tests/perf/compiler/T16473.stdout
@@ -68,15 +68,15 @@ Rule fired: Class op >>= (BUILTIN)
 Rule fired: Class op >>= (BUILTIN)
 Rule fired: Class op $p1Monad (BUILTIN)
 Rule fired: Class op $p1Applicative (BUILTIN)
-Rule fired: SPEC/Main $fApplicativeStateT @ Identity _ (Main)
-Rule fired: SPEC/Main $fMonadStateT_$c>>= @ Identity _ (Main)
-Rule fired: SPEC/Main $fMonadStateT_$c>> @ Identity _ (Main)
+Rule fired: SPEC/Main $fApplicativeStateT @Identity _ (Main)
+Rule fired: SPEC/Main $fMonadStateT_$c>>= @Identity _ (Main)
+Rule fired: SPEC/Main $fMonadStateT_$c>> @Identity _ (Main)
 Rule fired: Class op return (BUILTIN)
 Rule fired: Class op $p1Monad (BUILTIN)
 Rule fired: Class op $p1Applicative (BUILTIN)
-Rule fired: SPEC/Main $fApplicativeStateT @ Identity _ (Main)
-Rule fired: SPEC/Main $fMonadStateT_$c>>= @ Identity _ (Main)
-Rule fired: SPEC/Main $fMonadStateT_$c>> @ Identity _ (Main)
+Rule fired: SPEC/Main $fApplicativeStateT @Identity _ (Main)
+Rule fired: SPEC/Main $fMonadStateT_$c>>= @Identity _ (Main)
+Rule fired: SPEC/Main $fMonadStateT_$c>> @Identity _ (Main)
 Rule fired: Class op return (BUILTIN)
 Rule fired: Class op >>= (BUILTIN)
 Rule fired: Class op >>= (BUILTIN)
@@ -84,10 +84,10 @@ Rule fired: Class op >>= (BUILTIN)
 Rule fired: Class op >>= (BUILTIN)
 Rule fired: Class op $p1Monad (BUILTIN)
 Rule fired: Class op $p1Applicative (BUILTIN)
-Rule fired: SPEC/Main $fApplicativeStateT @ Identity _ (Main)
+Rule fired: SPEC/Main $fApplicativeStateT @Identity _ (Main)
 Rule fired: Class op $p1Monad (BUILTIN)
 Rule fired: Class op $p1Applicative (BUILTIN)
-Rule fired: SPEC/Main $fApplicativeStateT @ Identity _ (Main)
+Rule fired: SPEC/Main $fApplicativeStateT @Identity _ (Main)
 Rule fired: Class op $p1Monad (BUILTIN)
 Rule fired: Class op $p1Applicative (BUILTIN)
 Rule fired: Class op fmap (BUILTIN)
@@ -105,19 +105,17 @@ Rule fired: Class op fmap (BUILTIN)
 Rule fired: Class op >>= (BUILTIN)
 Rule fired: Class op >>= (BUILTIN)
 Rule fired: Class op fmap (BUILTIN)
-Rule fired: SPEC/Main $fFunctorStateT @ Identity _ (Main)
-Rule fired:
-    SPEC/Main $fApplicativeStateT_$cpure @ Identity _ (Main)
-Rule fired: SPEC/Main $fApplicativeStateT_$c<*> @ Identity _ (Main)
+Rule fired: SPEC/Main $fFunctorStateT @Identity _ (Main)
+Rule fired: SPEC/Main $fApplicativeStateT_$cpure @Identity _ (Main)
+Rule fired: SPEC/Main $fApplicativeStateT_$c<*> @Identity _ (Main)
 Rule fired: Class op fmap (BUILTIN)
-Rule fired: SPEC/Main $fApplicativeStateT_$c*> @ Identity _ (Main)
+Rule fired: SPEC/Main $fApplicativeStateT_$c*> @Identity _ (Main)
 Rule fired: Class op fmap (BUILTIN)
-Rule fired: SPEC/Main $fFunctorStateT @ Identity _ (Main)
-Rule fired:
-    SPEC/Main $fApplicativeStateT_$cpure @ Identity _ (Main)
-Rule fired: SPEC/Main $fApplicativeStateT_$c<*> @ Identity _ (Main)
-Rule fired: SPEC/Main $fApplicativeStateT_$c*> @ Identity _ (Main)
-Rule fired: SPEC/Main $fMonadStateT @ Identity _ (Main)
+Rule fired: SPEC/Main $fFunctorStateT @Identity _ (Main)
+Rule fired: SPEC/Main $fApplicativeStateT_$cpure @Identity _ (Main)
+Rule fired: SPEC/Main $fApplicativeStateT_$c<*> @Identity _ (Main)
+Rule fired: SPEC/Main $fApplicativeStateT_$c*> @Identity _ (Main)
+Rule fired: SPEC/Main $fMonadStateT @Identity _ (Main)
 Rule fired: Class op $p1Monad (BUILTIN)
 Rule fired: Class op <*> (BUILTIN)
 Rule fired: Class op $p1Monad (BUILTIN)
@@ -131,8 +129,8 @@ Rule fired: Class op $p1Applicative (BUILTIN)
 Rule fired: Class op fmap (BUILTIN)
 Rule fired: Class op >>= (BUILTIN)
 Rule fired: Class op fmap (BUILTIN)
-Rule fired: SPEC go @ (StateT (Sum Int) Identity) (Main)
+Rule fired: SPEC go @(StateT (Sum Int) Identity) (Main)
 Rule fired: Class op $p1Monad (BUILTIN)
 Rule fired: Class op pure (BUILTIN)
-Rule fired: SPEC/Main $fMonadStateT @ Identity _ (Main)
-Rule fired: SPEC go @ (StateT (Sum Int) Identity) (Main)
+Rule fired: SPEC/Main $fMonadStateT @Identity _ (Main)
+Rule fired: SPEC go @(StateT (Sum Int) Identity) (Main)
diff --git a/testsuite/tests/perf/compiler/T4007.stdout b/testsuite/tests/perf/compiler/T4007.stdout
index 14e7bf82e3..c83de9cfd9 100644
--- a/testsuite/tests/perf/compiler/T4007.stdout
+++ b/testsuite/tests/perf/compiler/T4007.stdout
@@ -4,7 +4,7 @@ Rule fired: unpack (GHC.Base)
 Rule fired: fold/build (GHC.Base)
 Rule fired: Class op >> (BUILTIN)
 Rule fired: Class op >> (BUILTIN)
-Rule fired: SPEC/T4007 sequence__c @ IO _ _ (T4007)
+Rule fired: SPEC/T4007 sequence__c @IO _ _ (T4007)
 Rule fired: <# (BUILTIN)
 Rule fired: tagToEnum# (BUILTIN)
 Rule fired: unpack-list (GHC.Base)
diff --git a/testsuite/tests/rename/should_compile/ExplicitForAllRules1.stderr b/testsuite/tests/rename/should_compile/ExplicitForAllRules1.stderr
index 5dfdb4a570..a233fb4f50 100644
--- a/testsuite/tests/rename/should_compile/ExplicitForAllRules1.stderr
+++ b/testsuite/tests/rename/should_compile/ExplicitForAllRules1.stderr
@@ -2,12 +2,12 @@
 ExplicitForAllRules1.hs:49:11: warning:
     Forall'd type variable ‘k’ is not bound in RULE lhs
       Orig bndrs: [k, a, b, x]
-      Orig lhs: id' @ a x
-      optimised lhs: id' @ a x
+      Orig lhs: id' @a x
+      optimised lhs: id' @a x
     Forall'd type variable ‘b’ is not bound in RULE lhs
       Orig bndrs: [k, a, b, x]
-      Orig lhs: id' @ a x
-      optimised lhs: id' @ a x
+      Orig lhs: id' @a x
+      optimised lhs: id' @a x
 
 ExplicitForAllRules1.hs:49:31: warning: [-Wunused-foralls (in -Wextra)]
     Unused quantified type variable ‘b’
diff --git a/testsuite/tests/roles/should_compile/Roles13.stderr b/testsuite/tests/roles/should_compile/Roles13.stderr
index 29b7b2de26..e6017f9e7b 100644
--- a/testsuite/tests/roles/should_compile/Roles13.stderr
+++ b/testsuite/tests/roles/should_compile/Roles13.stderr
@@ -46,7 +46,7 @@ $krep :: GHC.Types.KindRep
 [GblId, Unf=OtherCon []]
 $krep
   = GHC.Types.KindRepTyConApp
-      GHC.Types.$tcInt (GHC.Types.[] @ GHC.Types.KindRep)
+      GHC.Types.$tcInt (GHC.Types.[] @GHC.Types.KindRep)
 
 -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0}
 $krep1 :: GHC.Types.KindRep
@@ -80,7 +80,7 @@ $krep2 :: GHC.Types.KindRep
 [GblId, Unf=OtherCon []]
 $krep2
   = GHC.Types.KindRepTyConApp
-      Roles13.$tcAge (GHC.Types.[] @ GHC.Types.KindRep)
+      Roles13.$tcAge (GHC.Types.[] @GHC.Types.KindRep)
 
 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0}
 $krep3 :: GHC.Types.KindRep
@@ -136,7 +136,7 @@ $krep4 :: [GHC.Types.KindRep]
 [GblId, Caf=NoCafRefs, Unf=OtherCon []]
 $krep4
   = GHC.Types.:
-      @ GHC.Types.KindRep $krep1 (GHC.Types.[] @ GHC.Types.KindRep)
+      @GHC.Types.KindRep $krep1 (GHC.Types.[] @GHC.Types.KindRep)
 
 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0}
 $krep5 :: GHC.Types.KindRep
diff --git a/testsuite/tests/roles/should_compile/T8958.stderr b/testsuite/tests/roles/should_compile/T8958.stderr
index b975c66d9c..f498b9b009 100644
--- a/testsuite/tests/roles/should_compile/T8958.stderr
+++ b/testsuite/tests/roles/should_compile/T8958.stderr
@@ -16,58 +16,34 @@ CLASS INSTANCES
     -- Defined at T8958.hs:10:10
   instance [incoherent] Nominal a -- Defined at T8958.hs:7:10
 Dependent modules: []
-Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1,
+Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1,
                      integer-gmp-1.0.2.0]
 
 ==================== Typechecker ====================
 T8958.$tcMap
   = GHC.Types.TyCon
-      16542473435673943392##
-      5374201132143305512##
-      T8958.$trModule
-      (GHC.Types.TrNameS "Map"#)
-      0
-      GHC.Types.krep$*->*->*
+      16542473435673943392## 5374201132143305512## T8958.$trModule
+      (GHC.Types.TrNameS "Map"#) 0 GHC.Types.krep$*->*->*
 T8958.$tc'MkMap
   = GHC.Types.TyCon
-      2942839876828444488##
-      3989137838066763457##
-      T8958.$trModule
-      (GHC.Types.TrNameS "'MkMap"#)
-      2
-      $krep
+      2942839876828444488## 3989137838066763457## T8958.$trModule
+      (GHC.Types.TrNameS "'MkMap"#) 2 $krep
 T8958.$tcRepresentational
   = GHC.Types.TyCon
-      12809567151893673426##
-      12159693688248149156##
-      T8958.$trModule
-      (GHC.Types.TrNameS "Representational"#)
-      0
-      $krep
+      12809567151893673426## 12159693688248149156## T8958.$trModule
+      (GHC.Types.TrNameS "Representational"#) 0 $krep
 T8958.$tc'C:Representational
   = GHC.Types.TyCon
-      2358772282532242424##
-      5444038897914446879##
-      T8958.$trModule
-      (GHC.Types.TrNameS "'C:Representational"#)
-      1
-      $krep
+      2358772282532242424## 5444038897914446879## T8958.$trModule
+      (GHC.Types.TrNameS "'C:Representational"#) 1 $krep
 T8958.$tcNominal
   = GHC.Types.TyCon
-      12224997609886144634##
-      9866011944332051160##
-      T8958.$trModule
-      (GHC.Types.TrNameS "Nominal"#)
-      0
-      $krep
+      12224997609886144634## 9866011944332051160## T8958.$trModule
+      (GHC.Types.TrNameS "Nominal"#) 0 $krep
 T8958.$tc'C:Nominal
   = GHC.Types.TyCon
-      10562260635335201742##
-      1215478186250709459##
-      T8958.$trModule
-      (GHC.Types.TrNameS "'C:Nominal"#)
-      1
-      $krep
+      10562260635335201742## 1215478186250709459## T8958.$trModule
+      (GHC.Types.TrNameS "'C:Nominal"#) 1 $krep
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepVar 0
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepVar 1
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepFun $krep $krep
@@ -76,28 +52,28 @@ $krep [InlPrag=NOUSERINLINE[~]]
 $krep [InlPrag=NOUSERINLINE[~]]
   = GHC.Types.KindRepTyConApp
       GHC.Tuple.$tc(,)
-      ((:) @ GHC.Types.KindRep
-         $krep ((:) @ GHC.Types.KindRep $krep [] @ GHC.Types.KindRep))
+      ((:) @GHC.Types.KindRep
+         $krep ((:) @GHC.Types.KindRep $krep [] @GHC.Types.KindRep))
 $krep [InlPrag=NOUSERINLINE[~]]
   = GHC.Types.KindRepTyConApp
       T8958.$tcMap
-      ((:) @ GHC.Types.KindRep
-         $krep ((:) @ GHC.Types.KindRep $krep [] @ GHC.Types.KindRep))
+      ((:) @GHC.Types.KindRep
+         $krep ((:) @GHC.Types.KindRep $krep [] @GHC.Types.KindRep))
 $krep [InlPrag=NOUSERINLINE[~]]
   = GHC.Types.KindRepTyConApp
       GHC.Types.$tc[]
-      ((:) @ GHC.Types.KindRep $krep [] @ GHC.Types.KindRep)
+      ((:) @GHC.Types.KindRep $krep [] @GHC.Types.KindRep)
 $krep [InlPrag=NOUSERINLINE[~]]
   = GHC.Types.KindRepTyConApp
-      GHC.Types.$tcConstraint [] @ GHC.Types.KindRep
+      GHC.Types.$tcConstraint [] @GHC.Types.KindRep
 $krep [InlPrag=NOUSERINLINE[~]]
   = GHC.Types.KindRepTyConApp
       T8958.$tcRepresentational
-      ((:) @ GHC.Types.KindRep $krep [] @ GHC.Types.KindRep)
+      ((:) @GHC.Types.KindRep $krep [] @GHC.Types.KindRep)
 $krep [InlPrag=NOUSERINLINE[~]]
   = GHC.Types.KindRepTyConApp
       T8958.$tcNominal
-      ((:) @ GHC.Types.KindRep $krep [] @ GHC.Types.KindRep)
+      ((:) @GHC.Types.KindRep $krep [] @GHC.Types.KindRep)
 T8958.$trModule
   = GHC.Types.Module
       (GHC.Types.TrNameS "main"#) (GHC.Types.TrNameS "T8958"#)
@@ -107,15 +83,16 @@ AbsBinds [a] []
    Exported types: T8958.$fRepresentationala [InlPrag=NOUSERINLINE CONLIKE]
                      :: forall a. Representational a
                    [LclIdX[DFunId],
-                    Unf=DFun: \ (@ a) -> T8958.C:Representational TYPE: a]
-   Binds: $dRepresentational = T8958.C:Representational @ a
+                    Unf=DFun: \ (@a) -> T8958.C:Representational TYPE: a]
+   Binds: $dRepresentational = T8958.C:Representational @a
    Evidence: [EvBinds{}]}
 AbsBinds [a] []
   {Exports: [T8958.$fNominala <= $dNominal
                wrap: <>]
    Exported types: T8958.$fNominala [InlPrag=NOUSERINLINE CONLIKE]
                      :: forall a. Nominal a
-                   [LclIdX[DFunId], Unf=DFun: \ (@ a) -> T8958.C:Nominal TYPE: a]
-   Binds: $dNominal = T8958.C:Nominal @ a
+                   [LclIdX[DFunId], Unf=DFun: \ (@a) -> T8958.C:Nominal TYPE: a]
+   Binds: $dNominal = T8958.C:Nominal @a
    Evidence: [EvBinds{}]}
 
+
diff --git a/testsuite/tests/showIface/Orphans.stdout b/testsuite/tests/showIface/Orphans.stdout
index 38e4066d9e..08725b6715 100644
--- a/testsuite/tests/showIface/Orphans.stdout
+++ b/testsuite/tests/showIface/Orphans.stdout
@@ -2,5 +2,5 @@ instance [orphan] GHC.Exts.IsList [GHC.Types.Bool] = $fIsListBool
 instance GHC.Exts.IsList [X] = $fIsListX
 family instance GHC.Exts.Item [X] = D:R:ItemX
 family instance [orphan] GHC.Exts.Item [GHC.Types.Bool]
-"myrule1" [orphan] forall @ a.
-"myrule2" GHC.Base.id @ (X -> X) f = f
+"myrule1" [orphan] forall @a.
+"myrule2" GHC.Base.id @(X -> X) f = f
diff --git a/testsuite/tests/simplCore/should_compile/T13143.stderr b/testsuite/tests/simplCore/should_compile/T13143.stderr
index ddc8b1169b..eb9622b16b 100644
--- a/testsuite/tests/simplCore/should_compile/T13143.stderr
+++ b/testsuite/tests/simplCore/should_compile/T13143.stderr
@@ -8,7 +8,7 @@ Rec {
 T13143.$wf [InlPrag=NOINLINE, Occ=LoopBreaker]
   :: forall a. GHC.Prim.Void# -> a
 [GblId, Arity=1, Caf=NoCafRefs, Str=<B,A>b, Unf=OtherCon []]
-T13143.$wf = \ (@ a) _ [Occ=Dead] -> T13143.$wf @ a GHC.Prim.void#
+T13143.$wf = \ (@a) _ [Occ=Dead] -> T13143.$wf @a GHC.Prim.void#
 end Rec }
 
 -- RHS size: {terms: 4, types: 4, coercions: 0, joins: 0/0}
@@ -20,8 +20,8 @@ f [InlPrag=NOUSERINLINE[0]] :: forall a. Int -> a
  Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True,
          Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=True)
-         Tmpl= \ (@ a) _ [Occ=Dead] -> T13143.$wf @ a GHC.Prim.void#}]
-f = \ (@ a) _ [Occ=Dead] -> T13143.$wf @ a GHC.Prim.void#
+         Tmpl= \ (@a) _ [Occ=Dead] -> T13143.$wf @a GHC.Prim.void#}]
+f = \ (@a) _ [Occ=Dead] -> T13143.$wf @a GHC.Prim.void#
 
 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0}
 T13143.$trModule4 :: GHC.Prim.Addr#
@@ -70,7 +70,7 @@ T13143.$trModule
 -- RHS size: {terms: 2, types: 1, coercions: 0, joins: 0/0}
 lvl :: Int
 [GblId, Str=b]
-lvl = T13143.$wf @ Int GHC.Prim.void#
+lvl = T13143.$wf @Int GHC.Prim.void#
 
 Rec {
 -- RHS size: {terms: 28, types: 7, coercions: 0, joins: 0/0}
diff --git a/testsuite/tests/simplCore/should_compile/T13156.stdout b/testsuite/tests/simplCore/should_compile/T13156.stdout
index 265d07b62b..a5594b95a5 100644
--- a/testsuite/tests/simplCore/should_compile/T13156.stdout
+++ b/testsuite/tests/simplCore/should_compile/T13156.stdout
@@ -1 +1 @@
-      case r @ GHC.Types.Any of { __DEFAULT -> r @ a }
+      case r @GHC.Types.Any of { __DEFAULT -> r @a }
diff --git a/testsuite/tests/simplCore/should_compile/T14978.stdout b/testsuite/tests/simplCore/should_compile/T14978.stdout
index 1b12ead299..8faf80b1cb 100644
--- a/testsuite/tests/simplCore/should_compile/T14978.stdout
+++ b/testsuite/tests/simplCore/should_compile/T14978.stdout
@@ -1,2 +1,2 @@
 foo :: Goof Int
-foo = T14978.Goof @ Int @~ <Co:1>
+foo = T14978.Goof @Int @~<Co:1>
diff --git a/testsuite/tests/simplCore/should_compile/T15631.stdout b/testsuite/tests/simplCore/should_compile/T15631.stdout
index 5a096f25f5..b1ada8b039 100644
--- a/testsuite/tests/simplCore/should_compile/T15631.stdout
+++ b/testsuite/tests/simplCore/should_compile/T15631.stdout
@@ -1,7 +1,7 @@
       case GHC.List.$wlenAcc
-      case GHC.List.$wlenAcc @ a w 0# of ww2 { __DEFAULT ->
-      case GHC.List.reverse1 @ a w (GHC.Types.[] @ a) of {
-        [] -> case Foo.f1 @ a of { GHC.Types.I# v1 -> GHC.Prim.+# ww2 v1 };
+      case GHC.List.$wlenAcc @a w 0# of ww2 { __DEFAULT ->
+      case GHC.List.reverse1 @a w (GHC.Types.[] @a) of {
+        [] -> case Foo.f1 @a of { GHC.Types.I# v1 -> GHC.Prim.+# ww2 v1 };
           case GHC.List.$wlenAcc
-                 case Foo.$wf @ a w of ww [Occ=Once] { __DEFAULT ->
-      case Foo.$wf @ a w of ww { __DEFAULT -> GHC.Types.I# ww }
+                 case Foo.$wf @a w of ww [Occ=Once] { __DEFAULT ->
+      case Foo.$wf @a w of ww { __DEFAULT -> GHC.Types.I# ww }
diff --git a/testsuite/tests/simplCore/should_compile/T17409.stdout b/testsuite/tests/simplCore/should_compile/T17409.stdout
index 50edd27281..0c6620849c 100644
--- a/testsuite/tests/simplCore/should_compile/T17409.stdout
+++ b/testsuite/tests/simplCore/should_compile/T17409.stdout
@@ -1,2 +1,2 @@
-      f = \ (x :: Bool) -> not (id @ Bool x); } in
-f = \ (x :: Bool) -> not (id @ Bool x)
+      f = \ (x :: Bool) -> not (id @Bool x); } in
+f = \ (x :: Bool) -> not (id @Bool x)
diff --git a/testsuite/tests/simplCore/should_compile/T4398.stderr b/testsuite/tests/simplCore/should_compile/T4398.stderr
index c9b89ca6b4..5ea3dd18fb 100644
--- a/testsuite/tests/simplCore/should_compile/T4398.stderr
+++ b/testsuite/tests/simplCore/should_compile/T4398.stderr
@@ -2,5 +2,5 @@
 T4398.hs:6:11: warning:
     Forall'd constraint ‘Ord a’ is not bound in RULE lhs
       Orig bndrs: [a, $dOrd, x, y]
-      Orig lhs: f @ a ((\ ($dOrd :: Ord a) -> x) $dOrd) y
-      optimised lhs: f @ a x y
+      Orig lhs: f @a ((\ ($dOrd :: Ord a) -> x) $dOrd) y
+      optimised lhs: f @a x y
diff --git a/testsuite/tests/simplCore/should_compile/T6056.stderr b/testsuite/tests/simplCore/should_compile/T6056.stderr
index e1c8aab26c..7706318b4d 100644
--- a/testsuite/tests/simplCore/should_compile/T6056.stderr
+++ b/testsuite/tests/simplCore/should_compile/T6056.stderr
@@ -1,5 +1,5 @@
-Rule fired: SPEC/T6056 $wsmallerAndRest @ Int (T6056)
-Rule fired: SPEC/T6056 $wsmallerAndRest @ Int (T6056)
+Rule fired: SPEC/T6056 $wsmallerAndRest @Int (T6056)
+Rule fired: SPEC/T6056 $wsmallerAndRest @Int (T6056)
 Rule fired: Class op < (BUILTIN)
-Rule fired: SPEC/T6056 $wsmallerAndRest @ Int (T6056)
-Rule fired: SPEC/T6056 $wsmallerAndRest @ Int (T6056)
+Rule fired: SPEC/T6056 $wsmallerAndRest @Int (T6056)
+Rule fired: SPEC/T6056 $wsmallerAndRest @Int (T6056)
diff --git a/testsuite/tests/simplCore/should_compile/T7360.stderr b/testsuite/tests/simplCore/should_compile/T7360.stderr
index 9c6dd2a01f..c68b9d6bf3 100644
--- a/testsuite/tests/simplCore/should_compile/T7360.stderr
+++ b/testsuite/tests/simplCore/should_compile/T7360.stderr
@@ -47,22 +47,22 @@ fun2 :: forall a. [a] -> ((), 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= \ (@ a) (x [Occ=Once!] :: [a]) ->
+         Tmpl= \ (@a) (x [Occ=Once!] :: [a]) ->
                  (T7360.fun5,
                   case x of wild [Occ=Once] {
                     [] -> T7360.fun4;
                     : _ [Occ=Dead] _ [Occ=Dead] ->
-                      case GHC.List.$wlenAcc @ a wild 0# of ww2 [Occ=Once] { __DEFAULT ->
+                      case GHC.List.$wlenAcc @a wild 0# of ww2 [Occ=Once] { __DEFAULT ->
                       GHC.Types.I# ww2
                       }
                   })}]
 fun2
-  = \ (@ a) (x :: [a]) ->
+  = \ (@a) (x :: [a]) ->
       (T7360.fun5,
        case x of wild {
          [] -> T7360.fun4;
          : ds ds1 ->
-           case GHC.List.$wlenAcc @ a wild 0# of ww2 { __DEFAULT ->
+           case GHC.List.$wlenAcc @a wild 0# of ww2 { __DEFAULT ->
            GHC.Types.I# ww2
            }
        })
@@ -116,7 +116,7 @@ $krep :: GHC.Types.KindRep
 [GblId, Caf=NoCafRefs, Str=m1, Unf=OtherCon []]
 $krep
   = GHC.Types.KindRepTyConApp
-      GHC.Types.$tcInt (GHC.Types.[] @ GHC.Types.KindRep)
+      GHC.Types.$tcInt (GHC.Types.[] @GHC.Types.KindRep)
 
 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0}
 T7360.$tcFoo2 :: GHC.Prim.Addr#
@@ -156,7 +156,7 @@ T7360.$tc'Foo4 [InlPrag=NOUSERINLINE[~]] :: GHC.Types.KindRep
 [GblId, Caf=NoCafRefs, Str=m1, Unf=OtherCon []]
 T7360.$tc'Foo4
   = GHC.Types.KindRepTyConApp
-      T7360.$tcFoo (GHC.Types.[] @ GHC.Types.KindRep)
+      T7360.$tcFoo (GHC.Types.[] @GHC.Types.KindRep)
 
 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0}
 T7360.$tc'Foo6 :: GHC.Prim.Addr#
diff --git a/testsuite/tests/simplCore/should_compile/T7785.stderr b/testsuite/tests/simplCore/should_compile/T7785.stderr
index 3fd78bd67f..f0187fe958 100644
--- a/testsuite/tests/simplCore/should_compile/T7785.stderr
+++ b/testsuite/tests/simplCore/should_compile/T7785.stderr
@@ -1,8 +1,8 @@
 
 ==================== Tidy Core rules ====================
-"SPEC shared @ []"
+"SPEC shared @[]"
     forall ($dMyFunctor :: MyFunctor []) (irred :: Domain [] Int).
-      shared @ [] $dMyFunctor irred
+      shared @[] $dMyFunctor irred
       = bar_$sshared
 
 
diff --git a/testsuite/tests/simplCore/should_compile/T8274.stdout b/testsuite/tests/simplCore/should_compile/T8274.stdout
index 12ab2439dc..45d84cd8e0 100644
--- a/testsuite/tests/simplCore/should_compile/T8274.stdout
+++ b/testsuite/tests/simplCore/should_compile/T8274.stdout
@@ -4,11 +4,11 @@ T8274.$trModule4 :: Addr#
 T8274.$trModule4 = "main"#
 T8274.$trModule2 :: Addr#
 T8274.$trModule2 = "T8274"#
-$krep = GHC.Types.KindRepTyConApp GHC.Types.$tcWord# (GHC.Types.[] @ GHC.Types.KindRep)
-$krep1 = GHC.Types.KindRepTyConApp GHC.Types.$tcChar# (GHC.Types.[] @ GHC.Types.KindRep)
-$krep2 = GHC.Types.KindRepTyConApp GHC.Types.$tcDouble# (GHC.Types.[] @ GHC.Types.KindRep)
-$krep3 = GHC.Types.KindRepTyConApp GHC.Types.$tcFloat# (GHC.Types.[] @ GHC.Types.KindRep)
-$krep4 = GHC.Types.KindRepTyConApp GHC.Types.$tcInt# (GHC.Types.[] @ GHC.Types.KindRep)
+$krep = GHC.Types.KindRepTyConApp GHC.Types.$tcWord# (GHC.Types.[] @GHC.Types.KindRep)
+$krep1 = GHC.Types.KindRepTyConApp GHC.Types.$tcChar# (GHC.Types.[] @GHC.Types.KindRep)
+$krep2 = GHC.Types.KindRepTyConApp GHC.Types.$tcDouble# (GHC.Types.[] @GHC.Types.KindRep)
+$krep3 = GHC.Types.KindRepTyConApp GHC.Types.$tcFloat# (GHC.Types.[] @GHC.Types.KindRep)
+$krep4 = GHC.Types.KindRepTyConApp GHC.Types.$tcInt# (GHC.Types.[] @GHC.Types.KindRep)
 T8274.$tcP2 :: Addr#
 T8274.$tcP2 = "P"#
 T8274.$tcP = GHC.Types.TyCon 7483823267324216774## 12197132127820124256## T8274.$trModule T8274.$tcP1 0# GHC.Types.krep$*
diff --git a/testsuite/tests/simplCore/should_compile/T8331.stderr b/testsuite/tests/simplCore/should_compile/T8331.stderr
index 322323be6c..030b175298 100644
--- a/testsuite/tests/simplCore/should_compile/T8331.stderr
+++ b/testsuite/tests/simplCore/should_compile/T8331.stderr
@@ -1,9 +1,9 @@
 
 ==================== Tidy Core rules ====================
 "SPEC useAbstractMonad"
-    forall (@ s)
+    forall (@s)
            ($dMonadAbstractIOST :: MonadAbstractIOST (ReaderT Int (ST s))).
-      useAbstractMonad @ (ReaderT Int (ST s)) $dMonadAbstractIOST
-      = useAbstractMonad_$suseAbstractMonad @ s
+      useAbstractMonad @(ReaderT Int (ST s)) $dMonadAbstractIOST
+      = useAbstractMonad_$suseAbstractMonad @s
 
 
diff --git a/testsuite/tests/simplCore/should_compile/T8848a.stderr b/testsuite/tests/simplCore/should_compile/T8848a.stderr
index f6f8b4f247..82d9815221 100644
--- a/testsuite/tests/simplCore/should_compile/T8848a.stderr
+++ b/testsuite/tests/simplCore/should_compile/T8848a.stderr
@@ -1,6 +1,6 @@
 
 ==================== Tidy Core rules ====================
 "SPEC f"
-    forall (@ b) ($dOrd :: Ord [Int]). f @ [Int] @ b $dOrd = f_$sf @ b
+    forall (@b) ($dOrd :: Ord [Int]). f @[Int] @b $dOrd = f_$sf @b
 
 
diff --git a/testsuite/tests/simplCore/should_compile/T9400.stderr b/testsuite/tests/simplCore/should_compile/T9400.stderr
index 521b862d57..ad14ae8e09 100644
--- a/testsuite/tests/simplCore/should_compile/T9400.stderr
+++ b/testsuite/tests/simplCore/should_compile/T9400.stderr
@@ -41,31 +41,31 @@ main :: IO ()
 [GblId]
 main
   = >>
-      @ IO
+      @IO
       GHC.Base.$fMonadIO
-      @ ()
-      @ ()
+      @()
+      @()
       (putStrLn (unpackCString# "c"#))
       (>>
-         @ IO
+         @IO
          GHC.Base.$fMonadIO
-         @ ()
-         @ ()
+         @()
+         @()
          (putStrLn (unpackCString# "x"#))
          (>>
-            @ IO
+            @IO
             GHC.Base.$fMonadIO
-            @ ()
-            @ ()
+            @()
+            @()
             (putStrLn (unpackCString# "z"#))
             (>>
-               @ IO
+               @IO
                GHC.Base.$fMonadIO
-               @ ()
-               @ ()
+               @()
+               @()
                (putStrLn (unpackCString# "efg"#))
                (Control.Exception.Base.patError
-                  @ 'LiftedRep @ (IO ()) "T9400.hs:(17,5)-(18,29)|case"#))))
+                  @'LiftedRep @(IO ()) "T9400.hs:(17,5)-(18,29)|case"#))))
 
 
 
diff --git a/testsuite/tests/simplCore/should_compile/T9509.stdout b/testsuite/tests/simplCore/should_compile/T9509.stdout
index c774c06096..5f272e47e1 100644
--- a/testsuite/tests/simplCore/should_compile/T9509.stdout
+++ b/testsuite/tests/simplCore/should_compile/T9509.stdout
@@ -1,2 +1,2 @@
-    Rule: SPEC/T9509 foo @ Int
-    Rule: SPEC/T9509 foo @ Int
+    Rule: SPEC/T9509 foo @Int
+    Rule: SPEC/T9509 foo @Int
diff --git a/testsuite/tests/simplCore/should_compile/par01.stderr b/testsuite/tests/simplCore/should_compile/par01.stderr
index bbcb9ef4fd..f85d96426f 100644
--- a/testsuite/tests/simplCore/should_compile/par01.stderr
+++ b/testsuite/tests/simplCore/should_compile/par01.stderr
@@ -7,11 +7,11 @@ Rec {
 -- RHS size: {terms: 7, types: 3, coercions: 0, joins: 0/0}
 Par01.depth [Occ=LoopBreaker] :: GHC.Types.Int -> GHC.Types.Int
 [GblId, Arity=1, Caf=NoCafRefs, Str=<L,U>, Unf=OtherCon []]
-Par01.depth =
-  \ (d :: GHC.Types.Int) ->
-    case GHC.Prim.par# @ GHC.Types.Int d of { __DEFAULT ->
-    Par01.depth d
-    }
+Par01.depth
+  = \ (d :: GHC.Types.Int) ->
+      case GHC.Prim.par# @GHC.Types.Int d of { __DEFAULT ->
+      Par01.depth d
+      }
 end Rec }
 
 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0}
@@ -37,8 +37,8 @@ Par01.$trModule1 = GHC.Types.TrNameS Par01.$trModule2
 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0}
 Par01.$trModule :: GHC.Types.Module
 [GblId, Caf=NoCafRefs, Str=m, Unf=OtherCon []]
-Par01.$trModule =
-  GHC.Types.Module Par01.$trModule3 Par01.$trModule1
+Par01.$trModule
+  = GHC.Types.Module Par01.$trModule3 Par01.$trModule1
 
 
 
diff --git a/testsuite/tests/simplCore/should_compile/simpl016.stderr b/testsuite/tests/simplCore/should_compile/simpl016.stderr
index 41480526d1..ff3a38a6a8 100644
--- a/testsuite/tests/simplCore/should_compile/simpl016.stderr
+++ b/testsuite/tests/simplCore/should_compile/simpl016.stderr
@@ -1,10 +1,10 @@
 
-simpl016.hs:7:1: Warning:
+simpl016.hs:7:1: warning:
     Forall'd constraint ‘Num b’ is not bound in RULE lhs
       Orig bndrs: [b, $dNum]
       Orig lhs: let {
                   $dEq :: Eq Int
                   [LclId]
                   $dEq = GHC.Classes.$fEqInt } in
-                delta' @ Int @ b $dEq
-      optimised lhs: delta' @ Int @ b $dEq
+                delta' @Int @b $dEq
+      optimised lhs: delta' @Int @b $dEq
diff --git a/testsuite/tests/simplCore/should_compile/spec-inline.stderr b/testsuite/tests/simplCore/should_compile/spec-inline.stderr
index 07b04c215e..8c615305d5 100644
--- a/testsuite/tests/simplCore/should_compile/spec-inline.stderr
+++ b/testsuite/tests/simplCore/should_compile/spec-inline.stderr
@@ -56,7 +56,7 @@ lvl = "spec-inline.hs:(19,5)-(29,25)|function go"#
 Roman.foo3 :: Int
 [GblId, Str=b]
 Roman.foo3
-  = Control.Exception.Base.patError @ 'GHC.Types.LiftedRep @ Int lvl
+  = Control.Exception.Base.patError @'GHC.Types.LiftedRep @Int lvl
 
 Rec {
 -- RHS size: {terms: 40, types: 5, coercions: 0, joins: 0/0}
@@ -149,7 +149,7 @@ Roman.foo1 :: Maybe Int
  Str=m2,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 20}]
-Roman.foo1 = GHC.Maybe.Just @ Int Roman.foo2
+Roman.foo1 = GHC.Maybe.Just @Int Roman.foo2
 
 -- RHS size: {terms: 11, types: 4, coercions: 0, joins: 0/0}
 foo :: Int -> Int
@@ -162,7 +162,7 @@ foo :: Int -> Int
          Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=False)
          Tmpl= \ (n [Occ=Once!] :: Int) ->
                  case n of n1 [Occ=Once] { GHC.Types.I# _ [Occ=Dead] ->
-                 Roman.foo_go (GHC.Maybe.Just @ Int n1) Roman.foo1
+                 Roman.foo_go (GHC.Maybe.Just @Int n1) Roman.foo1
                  }}]
 foo
   = \ (n :: Int) ->
@@ -174,8 +174,8 @@ foo
 ------ Local rules for imported ids --------
 "SC:$wgo0" [2]
     forall (sc :: GHC.Prim.Int#) (sc1 :: GHC.Prim.Int#).
-      Roman.$wgo (GHC.Maybe.Just @ Int (GHC.Types.I# sc1))
-                 (GHC.Maybe.Just @ Int (GHC.Types.I# sc))
+      Roman.$wgo (GHC.Maybe.Just @Int (GHC.Types.I# sc1))
+                 (GHC.Maybe.Just @Int (GHC.Types.I# sc))
       = Roman.foo_$s$wgo sc sc1
 
 
diff --git a/testsuite/tests/typecheck/should_compile/T13032.stderr b/testsuite/tests/typecheck/should_compile/T13032.stderr
index 0bbffd9876..ef5b574129 100644
--- a/testsuite/tests/typecheck/should_compile/T13032.stderr
+++ b/testsuite/tests/typecheck/should_compile/T13032.stderr
@@ -9,7 +9,7 @@ f :: forall a b. (a ~ b) => a -> b -> Bool
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True,
          Guidance=ALWAYS_IF(arity=3,unsat_ok=True,boring_ok=True)}]
-f = \ (@ a) (@ b) _ [Occ=Dead] _ [Occ=Dead] _ [Occ=Dead] ->
+f = \ (@a) (@b) _ [Occ=Dead] _ [Occ=Dead] _ [Occ=Dead] ->
       GHC.Types.True
 
 -- RHS size: {terms: 5, types: 0, coercions: 0, joins: 0/0}