From 4e5ff6a43888ef92428903071ec4e1e4b1f56dad Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alan.zimm@gmail.com>
Date: Sun, 26 Nov 2023 12:53:37 +0000
Subject: [PATCH] EPA: Remove SrcSpanAnn

Now that we only have a single constructor for EpAnn, And it uses a
SrcSpan for its location, we can do away with SrcSpanAnn completely.
It only existed to wrap the original SrcSpan in a location, and
provide a place for the exact print annotation.

For darwin only:
Metric Increase:
    MultiLayerModulesTH_OneShot

Updates haddock submodule
---
 compiler/GHC/Hs/Binds.hs                      |    2 +-
 compiler/GHC/Hs/Decls.hs                      |   18 +-
 compiler/GHC/Hs/Dump.hs                       |   18 +-
 compiler/GHC/Hs/Expr.hs                       |   14 +-
 compiler/GHC/Hs/Extension.hs                  |    2 +-
 compiler/GHC/Hs/Pat.hs                        |    2 +-
 compiler/GHC/Hs/Type.hs                       |   11 +-
 compiler/GHC/Hs/Utils.hs                      |   10 +-
 compiler/GHC/HsToCore/Docs.hs                 |    4 +-
 compiler/GHC/HsToCore/Monad.hs                |    2 +-
 compiler/GHC/Iface/Ext/Ast.hs                 |    8 +-
 compiler/GHC/Iface/Ext/Utils.hs               |    8 +-
 compiler/GHC/Parser.y                         |   38 +-
 compiler/GHC/Parser/Annotation.hs             |  206 +-
 compiler/GHC/Parser/PostProcess.hs            |   42 +-
 compiler/GHC/Parser/PostProcess/Haddock.hs    |    4 +-
 compiler/GHC/Parser/Types.hs                  |    2 +-
 compiler/GHC/Rename/Bind.hs                   |    4 +-
 compiler/GHC/Rename/Env.hs                    |   20 +-
 compiler/GHC/Rename/Names.hs                  |    4 +-
 compiler/GHC/Tc/Errors/Ppr.hs                 |    2 +-
 compiler/GHC/Tc/Gen/Head.hs                   |    4 +-
 compiler/GHC/Tc/Gen/Match.hs                  |    4 +-
 compiler/GHC/Tc/Utils/Monad.hs                |   10 +-
 compiler/GHC/Tc/Zonk/Type.hs                  |   14 +-
 .../tests/ghc-api/exactprint/T22919.stderr    |  106 +-
 .../tests/ghc-api/exactprint/Test20239.stderr |  336 +-
 .../ghc-api/exactprint/ZeroWidthSemi.stderr   |  116 +-
 .../should_compile_flag_haddock/T17544.stderr | 2748 ++++++++--------
 .../T17544_kw.stderr                          |  312 +-
 testsuite/tests/module/mod185.stderr          |  130 +-
 .../should_compile/DumpParsedAst.stderr       | 2244 +++++++-------
 .../DumpParsedAstComments.stderr              |  445 ++-
 .../should_compile/DumpRenamedAst.stderr      | 2750 ++++++++---------
 .../parser/should_compile/DumpSemis.stderr    | 2700 ++++++++--------
 .../should_compile/DumpTypecheckedAst.stderr  | 2432 ++++++++-------
 .../parser/should_compile/KindSigs.stderr     | 1886 ++++++-----
 .../tests/parser/should_compile/T14189.stderr |  320 +-
 .../tests/parser/should_compile/T15323.stderr |  274 +-
 .../tests/parser/should_compile/T20452.stderr |  640 ++--
 .../tests/parser/should_compile/T20718.stderr |  104 +-
 .../parser/should_compile/T20718b.stderr      |   12 +-
 .../tests/parser/should_compile/T20846.stderr |  156 +-
 .../should_compile/T23315/T23315.stderr       |   84 +-
 testsuite/tests/printer/T18791.stderr         |  120 +-
 testsuite/tests/printer/Test20297.stdout      |  750 +++--
 .../typecheck/should_compile/T15242.stderr    |  134 +-
 .../tests/typecheck/should_compile/all.T      |   10 +-
 utils/check-exact/ExactPrint.hs               |   96 +-
 utils/check-exact/Main.hs                     |   55 +-
 utils/check-exact/Transform.hs                |  130 +-
 utils/check-exact/Utils.hs                    |   12 +-
 utils/haddock                                 |    2 +-
 53 files changed, 9703 insertions(+), 9854 deletions(-)

diff --git a/compiler/GHC/Hs/Binds.hs b/compiler/GHC/Hs/Binds.hs
index 983585a3e693..30840ed25388 100644
--- a/compiler/GHC/Hs/Binds.hs
+++ b/compiler/GHC/Hs/Binds.hs
@@ -876,7 +876,7 @@ type instance Anno [LocatedN Id]      = SrcSpan
 
 type instance Anno (FixitySig (GhcPass p)) = SrcSpanAnnA
 
-type instance Anno StringLiteral = SrcAnn NoEpAnns
+type instance Anno StringLiteral = EpAnn NoEpAnns
 type instance Anno (LocatedN RdrName) = SrcSpan
 type instance Anno (LocatedN Name) = SrcSpan
 type instance Anno (LocatedN Id) = SrcSpan
diff --git a/compiler/GHC/Hs/Decls.hs b/compiler/GHC/Hs/Decls.hs
index b6c6ce280cf3..28e6541bfc04 100644
--- a/compiler/GHC/Hs/Decls.hs
+++ b/compiler/GHC/Hs/Decls.hs
@@ -1325,7 +1325,7 @@ type instance XCRoleAnnotDecl GhcTc = NoExtField
 
 type instance XXRoleAnnotDecl (GhcPass _) = DataConCantHappen
 
-type instance Anno (Maybe Role) = SrcAnn NoEpAnns
+type instance Anno (Maybe Role) = EpAnn NoEpAnns
 
 instance OutputableBndr (IdP (GhcPass p))
        => Outputable (RoleAnnotDecl (GhcPass p)) where
@@ -1351,15 +1351,15 @@ type instance Anno (HsDecl (GhcPass _)) = SrcSpanAnnA
 type instance Anno (SpliceDecl (GhcPass p)) = SrcSpanAnnA
 type instance Anno (TyClDecl (GhcPass p)) = SrcSpanAnnA
 type instance Anno (FunDep (GhcPass p)) = SrcSpanAnnA
-type instance Anno (FamilyResultSig (GhcPass p)) = SrcAnn NoEpAnns
+type instance Anno (FamilyResultSig (GhcPass p)) = EpAnn NoEpAnns
 type instance Anno (FamilyDecl (GhcPass p)) = SrcSpanAnnA
-type instance Anno (InjectivityAnn (GhcPass p)) = SrcAnn NoEpAnns
+type instance Anno (InjectivityAnn (GhcPass p)) = EpAnn NoEpAnns
 type instance Anno CType = SrcSpanAnnP
-type instance Anno (HsDerivingClause (GhcPass p)) = SrcAnn NoEpAnns
+type instance Anno (HsDerivingClause (GhcPass p)) = EpAnn NoEpAnns
 type instance Anno (DerivClauseTys (GhcPass _)) = SrcSpanAnnC
 type instance Anno (StandaloneKindSig (GhcPass p)) = SrcSpanAnnA
 type instance Anno (ConDecl (GhcPass p)) = SrcSpanAnnA
-type instance Anno Bool = SrcAnn NoEpAnns
+type instance Anno Bool = EpAnn NoEpAnns
 type instance Anno [LocatedA (ConDeclField (GhcPass _))] = SrcSpanAnnL
 type instance Anno (FamEqn p (LocatedA (HsType p))) = SrcSpanAnnA
 type instance Anno (TyFamInstDecl (GhcPass p)) = SrcSpanAnnA
@@ -1370,18 +1370,18 @@ type instance Anno (InstDecl (GhcPass p)) = SrcSpanAnnA
 type instance Anno (DocDecl (GhcPass p)) = SrcSpanAnnA
 type instance Anno (DerivDecl (GhcPass p)) = SrcSpanAnnA
 type instance Anno OverlapMode = SrcSpanAnnP
-type instance Anno (DerivStrategy (GhcPass p)) = SrcAnn NoEpAnns
+type instance Anno (DerivStrategy (GhcPass p)) = EpAnn NoEpAnns
 type instance Anno (DefaultDecl (GhcPass p)) = SrcSpanAnnA
 type instance Anno (ForeignDecl (GhcPass p)) = SrcSpanAnnA
 type instance Anno (RuleDecls (GhcPass p)) = SrcSpanAnnA
 type instance Anno (RuleDecl (GhcPass p)) = SrcSpanAnnA
-type instance Anno (SourceText, RuleName) = SrcAnn NoEpAnns
-type instance Anno (RuleBndr (GhcPass p)) = SrcAnn NoEpAnns
+type instance Anno (SourceText, RuleName) = EpAnn NoEpAnns
+type instance Anno (RuleBndr (GhcPass p)) = EpAnn NoEpAnns
 type instance Anno (WarnDecls (GhcPass p)) = SrcSpanAnnA
 type instance Anno (WarnDecl (GhcPass p)) = SrcSpanAnnA
 type instance Anno (AnnDecl (GhcPass p)) = SrcSpanAnnA
 type instance Anno (RoleAnnotDecl (GhcPass p)) = SrcSpanAnnA
-type instance Anno (Maybe Role) = SrcAnn NoEpAnns
+type instance Anno (Maybe Role) = EpAnn NoEpAnns
 type instance Anno CCallConv   = SrcSpan
 type instance Anno Safety      = SrcSpan
 type instance Anno CExportSpec = SrcSpan
diff --git a/compiler/GHC/Hs/Dump.hs b/compiler/GHC/Hs/Dump.hs
index 28b784e17525..9b8f384d0d03 100644
--- a/compiler/GHC/Hs/Dump.hs
+++ b/compiler/GHC/Hs/Dump.hs
@@ -275,32 +275,32 @@ showAstData bs ba a0 = blankLine $$ showAstData' a0
 
             -- -------------------------
 
-            srcSpanAnnA :: SrcSpanAnn' (EpAnn AnnListItem) -> SDoc
+            srcSpanAnnA :: EpAnn AnnListItem -> SDoc
             srcSpanAnnA = locatedAnn'' (text "SrcSpanAnnA")
 
-            srcSpanAnnL :: SrcSpanAnn' (EpAnn AnnList) -> SDoc
+            srcSpanAnnL :: EpAnn AnnList -> SDoc
             srcSpanAnnL = locatedAnn'' (text "SrcSpanAnnL")
 
-            srcSpanAnnP :: SrcSpanAnn' (EpAnn AnnPragma) -> SDoc
+            srcSpanAnnP :: EpAnn AnnPragma -> SDoc
             srcSpanAnnP = locatedAnn'' (text "SrcSpanAnnP")
 
-            srcSpanAnnC :: SrcSpanAnn' (EpAnn AnnContext) -> SDoc
+            srcSpanAnnC :: EpAnn AnnContext -> SDoc
             srcSpanAnnC = locatedAnn'' (text "SrcSpanAnnC")
 
-            srcSpanAnnN :: SrcSpanAnn' (EpAnn NameAnn) -> SDoc
+            srcSpanAnnN :: EpAnn NameAnn -> SDoc
             srcSpanAnnN = locatedAnn'' (text "SrcSpanAnnN")
 
             locatedAnn'' :: forall a. (Typeable a, Data a)
-              => SDoc -> SrcSpanAnn' a -> SDoc
+              => SDoc -> EpAnn a -> SDoc
             locatedAnn'' tag ss = parens $
               case cast ss of
-                Just ((SrcSpanAnn ann s) :: SrcSpanAnn' a) ->
+                Just (ann :: EpAnn a) ->
                   case ba of
                     BlankEpAnnotations
                       -> parens (text "blanked:" <+> tag)
                     NoBlankEpAnnotations
-                      -> text "SrcSpanAnn" <+> showAstData' ann
-                              <+> srcSpan s
+                      -> text (showConstr (toConstr ann))
+                                          $$ vcat (gmapQ showAstData' ann)
                 Nothing -> text "locatedAnn:unmatched" <+> tag
                            <+> (parens $ text (showConstr (toConstr ss)))
 
diff --git a/compiler/GHC/Hs/Expr.hs b/compiler/GHC/Hs/Expr.hs
index bfcba125b4e8..f0c07b634cf8 100644
--- a/compiler/GHC/Hs/Expr.hs
+++ b/compiler/GHC/Hs/Expr.hs
@@ -2189,27 +2189,27 @@ type instance Anno (HsCmd (GhcPass p)) = SrcSpanAnnA
 
 type instance Anno [LocatedA (StmtLR (GhcPass pl) (GhcPass pr) (LocatedA (HsCmd (GhcPass pr))))]
   = SrcSpanAnnL
-type instance Anno (HsCmdTop (GhcPass p)) = SrcAnn NoEpAnns
+type instance Anno (HsCmdTop (GhcPass p)) = EpAnn NoEpAnns
 type instance Anno [LocatedA (Match (GhcPass p) (LocatedA (HsExpr (GhcPass p))))] = SrcSpanAnnL
 type instance Anno [LocatedA (Match (GhcPass p) (LocatedA (HsCmd  (GhcPass p))))] = SrcSpanAnnL
 type instance Anno (Match (GhcPass p) (LocatedA (HsExpr (GhcPass p)))) = SrcSpanAnnA
 type instance Anno (Match (GhcPass p) (LocatedA (HsCmd  (GhcPass p)))) = SrcSpanAnnA
-type instance Anno (GRHS (GhcPass p) (LocatedA (HsExpr (GhcPass p)))) = SrcAnn NoEpAnns
-type instance Anno (GRHS (GhcPass p) (LocatedA (HsCmd  (GhcPass p)))) = SrcAnn NoEpAnns
+type instance Anno (GRHS (GhcPass p) (LocatedA (HsExpr (GhcPass p)))) = EpAnn NoEpAnns
+type instance Anno (GRHS (GhcPass p) (LocatedA (HsCmd  (GhcPass p)))) = EpAnn NoEpAnns
 type instance Anno (StmtLR (GhcPass pl) (GhcPass pr) (LocatedA (body (GhcPass pr)))) = SrcSpanAnnA
 
 type instance Anno (HsUntypedSplice (GhcPass p)) = SrcSpanAnnA
 
 type instance Anno [LocatedA (StmtLR (GhcPass pl) (GhcPass pr) (LocatedA (body (GhcPass pr))))] = SrcSpanAnnL
 
-type instance Anno (FieldLabelStrings (GhcPass p)) = SrcAnn NoEpAnns
+type instance Anno (FieldLabelStrings (GhcPass p)) = EpAnn NoEpAnns
 type instance Anno FieldLabelString                = SrcSpanAnnN
 
-type instance Anno FastString                      = SrcAnn NoEpAnns
+type instance Anno FastString                      = EpAnn NoEpAnns
   -- Used in HsQuasiQuote and perhaps elsewhere
 
-type instance Anno (DotFieldOcc (GhcPass p))       = SrcAnn NoEpAnns
+type instance Anno (DotFieldOcc (GhcPass p))       = EpAnn NoEpAnns
 
-instance (Anno a ~ SrcSpanAnn' (EpAnn an), NoAnn an)
+instance (HasAnnotation (Anno a))
    => WrapXRec (GhcPass p) a where
   wrapXRec = noLocA
diff --git a/compiler/GHC/Hs/Extension.hs b/compiler/GHC/Hs/Extension.hs
index 70d0677469f6..66c3d93929b0 100644
--- a/compiler/GHC/Hs/Extension.hs
+++ b/compiler/GHC/Hs/Extension.hs
@@ -107,7 +107,7 @@ type instance Anno RdrName = SrcSpanAnnN
 type instance Anno Name    = SrcSpanAnnN
 type instance Anno Id      = SrcSpanAnnN
 
-type IsSrcSpanAnn p a = ( Anno (IdGhcP p) ~ SrcSpanAnn' (EpAnn a),
+type IsSrcSpanAnn p a = ( Anno (IdGhcP p) ~ EpAnn a,
                           NoAnn a,
                           IsPass p)
 
diff --git a/compiler/GHC/Hs/Pat.hs b/compiler/GHC/Hs/Pat.hs
index 9055014089d6..7554f3612d00 100644
--- a/compiler/GHC/Hs/Pat.hs
+++ b/compiler/GHC/Hs/Pat.hs
@@ -850,7 +850,7 @@ collectEvVarsPat pat =
 -}
 
 type instance Anno (Pat (GhcPass p)) = SrcSpanAnnA
-type instance Anno (HsOverLit (GhcPass p)) = SrcAnn NoEpAnns
+type instance Anno (HsOverLit (GhcPass p)) = EpAnn NoEpAnns
 type instance Anno ConLike = SrcSpanAnnN
 type instance Anno (HsFieldBind lhs rhs) = SrcSpanAnnA
 type instance Anno RecFieldsDotDot = SrcSpan
diff --git a/compiler/GHC/Hs/Type.hs b/compiler/GHC/Hs/Type.hs
index 2936db9faa8c..0ac161bcdcc7 100644
--- a/compiler/GHC/Hs/Type.hs
+++ b/compiler/GHC/Hs/Type.hs
@@ -540,8 +540,7 @@ mkHsOpTy :: (Anno (IdGhcP p) ~ SrcSpanAnnN)
 mkHsOpTy prom ty1 op ty2 = HsOpTy noAnn prom ty1 op ty2
 
 mkHsAppTy :: LHsType (GhcPass p) -> LHsType (GhcPass p) -> LHsType (GhcPass p)
-mkHsAppTy t1 t2
-  = addCLocA t1 t2 (HsAppTy noExtField t1 t2)
+mkHsAppTy t1 t2 = addCLocA t1 t2 (HsAppTy noExtField t1 t2)
 
 mkHsAppTys :: LHsType (GhcPass p) -> [LHsType (GhcPass p)]
            -> LHsType (GhcPass p)
@@ -576,15 +575,15 @@ splitHsFunType ty = go ty
       = let
           (anns, cs, args, res) = splitHsFunType ty
           anns' = anns ++ annParen2AddEpAnn an
-          cs' = cs S.<> epAnnComments (ann l) S.<> epAnnComments an
+          cs' = cs S.<> epAnnComments l S.<> epAnnComments an
         in (anns', cs', args, res)
 
     go (L ll (HsFunTy (EpAnn _ _ cs) mult x y))
       | (anns, csy, args, res) <- splitHsFunType y
-      = (anns, csy S.<> epAnnComments (ann ll), HsScaled mult x':args, res)
+      = (anns, csy S.<> epAnnComments ll, HsScaled mult x':args, res)
       where
         L l t = x
-        x' = L (addCommentsToSrcAnn l cs) t
+        x' = L (addCommentsToEpAnn l cs) t
 
     go other = ([], emptyComments, [], other)
 
@@ -1434,7 +1433,7 @@ type instance Anno (HsTyVarBndr _flag GhcRn) = SrcSpanAnnA
 type instance Anno (HsTyVarBndr _flag GhcTc) = SrcSpanAnnA
 
 type instance Anno (HsOuterTyVarBndrs _ (GhcPass _)) = SrcSpanAnnA
-type instance Anno HsIPName = SrcAnn NoEpAnns
+type instance Anno HsIPName = EpAnn NoEpAnns
 type instance Anno (ConDeclField (GhcPass p)) = SrcSpanAnnA
 
 type instance Anno (FieldOcc (GhcPass p)) = SrcSpanAnnA
diff --git a/compiler/GHC/Hs/Utils.hs b/compiler/GHC/Hs/Utils.hs
index 0aded54bb962..e610e2daf8c3 100644
--- a/compiler/GHC/Hs/Utils.hs
+++ b/compiler/GHC/Hs/Utils.hs
@@ -184,7 +184,7 @@ mkHsPar e = L (getLoc e) (gHsPar e)
 mkSimpleMatch :: (Anno (Match (GhcPass p) (LocatedA (body (GhcPass p))))
                         ~ SrcSpanAnnA,
                   Anno (GRHS (GhcPass p) (LocatedA (body (GhcPass p))))
-                        ~ SrcAnn NoEpAnns)
+                        ~ EpAnn NoEpAnns)
               => HsMatchContext (GhcPass p)
               -> [LPat (GhcPass p)] -> LocatedA (body (GhcPass p))
               -> LMatch (GhcPass p) (LocatedA (body (GhcPass p)))
@@ -198,14 +198,14 @@ mkSimpleMatch ctxt pats rhs
                 (pat:_) -> combineSrcSpansA (getLoc pat) (getLoc rhs)
 
 unguardedGRHSs :: Anno (GRHS (GhcPass p) (LocatedA (body (GhcPass p))))
-                     ~ SrcAnn NoEpAnns
+                     ~ EpAnn NoEpAnns
                => SrcSpan -> LocatedA (body (GhcPass p)) -> EpAnn GrhsAnn
                -> GRHSs (GhcPass p) (LocatedA (body (GhcPass p)))
 unguardedGRHSs loc rhs an
   = GRHSs emptyComments (unguardedRHS an loc rhs) emptyLocalBinds
 
 unguardedRHS :: Anno (GRHS (GhcPass p) (LocatedA (body (GhcPass p))))
-                     ~ SrcAnn NoEpAnns
+                     ~ EpAnn NoEpAnns
              => EpAnn GrhsAnn -> SrcSpan -> LocatedA (body (GhcPass p))
              -> [LGRHS (GhcPass p) (LocatedA (body (GhcPass p)))]
 unguardedRHS an loc rhs = [L (noAnnSrcSpan loc) (GRHS an [] rhs)]
@@ -233,7 +233,7 @@ mkLamCaseMatchGroup origin lam_variant (L l matches)
   where fixCtxt (L a match) = L a match{m_ctxt = LamAlt lam_variant}
 
 mkLocatedList :: (Semigroup a, NoAnn an)
-  => [GenLocated (SrcAnn a) e2] -> LocatedAn an [GenLocated (SrcAnn a) e2]
+  => [GenLocated (EpAnn a) e2] -> LocatedAn an [GenLocated (EpAnn a) e2]
 mkLocatedList ms = case nonEmpty ms of
     Nothing -> noLocA []
     Just ms1 -> L (noAnnSrcSpan $ locA $ combineLocsA (NE.head ms1) (NE.last ms1)) ms
@@ -296,7 +296,7 @@ mkHsSyntaxApps _ NoSyntaxExprTc args = pprPanic "mkHsSyntaxApps" (ppr args)
 -- |A simple case alternative with a single pattern, no binds, no guards;
 -- pre-typechecking
 mkHsCaseAlt :: (Anno (GRHS (GhcPass p) (LocatedA (body (GhcPass p))))
-                     ~ SrcAnn NoEpAnns,
+                     ~ EpAnn NoEpAnns,
                  Anno (Match (GhcPass p) (LocatedA (body (GhcPass p))))
                         ~ SrcSpanAnnA)
             => LPat (GhcPass p) -> (LocatedA (body (GhcPass p)))
diff --git a/compiler/GHC/HsToCore/Docs.hs b/compiler/GHC/HsToCore/Docs.hs
index 8c3730ac4bc8..95fca01d6bf1 100644
--- a/compiler/GHC/HsToCore/Docs.hs
+++ b/compiler/GHC/HsToCore/Docs.hs
@@ -255,7 +255,7 @@ mkMaps env instances decls =
              -> ( [(Name, [HsDoc GhcRn])]
                 , [(Name, IntMap (HsDoc GhcRn))]
                 )
-    mappings (L (SrcSpanAnn _ (RealSrcSpan l _)) decl, doc) =
+    mappings (L (EpAnn (EpaSpan (RealSrcSpan l _)) _ _) decl, doc) =
            (dm, am)
       where
         args = declTypeDocs decl
@@ -269,7 +269,7 @@ mkMaps env instances decls =
         ns = names l decl
         dm = [(n, d) | (n, d) <- zip ns (repeat doc) ++ zip subNs subDocs, not $ all (isEmptyDocString . hsDocString) d]
         am = [(n, args) | n <- ns] ++ zip subNs subArgs
-    mappings (L (SrcSpanAnn _ (UnhelpfulSpan _)) _, _) = ([], [])
+    mappings (L (EpAnn _ _ _) _, _) = ([], [])
 
     instanceMap :: Map RealSrcSpan Name
     instanceMap = M.fromList [(l, n) | n <- instances, RealSrcSpan l _ <- [getSrcSpan n] ]
diff --git a/compiler/GHC/HsToCore/Monad.hs b/compiler/GHC/HsToCore/Monad.hs
index 11de4a41ae22..5b101f9560c9 100644
--- a/compiler/GHC/HsToCore/Monad.hs
+++ b/compiler/GHC/HsToCore/Monad.hs
@@ -445,7 +445,7 @@ putSrcSpanDs (UnhelpfulSpan {}) thing_inside
 putSrcSpanDs (RealSrcSpan real_span _) thing_inside
   = updLclEnv (\ env -> env {dsl_loc = real_span}) thing_inside
 
-putSrcSpanDsA :: SrcSpanAnn' ann -> DsM a -> DsM a
+putSrcSpanDsA :: EpAnn ann -> DsM a -> DsM a
 putSrcSpanDsA loc = putSrcSpanDs (locA loc)
 
 -- | Emit a diagnostic for the current source location. In case the diagnostic is a warning,
diff --git a/compiler/GHC/Iface/Ext/Ast.hs b/compiler/GHC/Iface/Ext/Ast.hs
index 26a7ea1127fb..4d44af04cd50 100644
--- a/compiler/GHC/Iface/Ext/Ast.hs
+++ b/compiler/GHC/Iface/Ext/Ast.hs
@@ -399,14 +399,14 @@ processGrp grp = concatM
       , toHie $ hs_docs grp
       ]
 
-getRealSpanA :: SrcSpanAnn' ann -> Maybe Span
+getRealSpanA :: EpAnn ann -> Maybe Span
 getRealSpanA la = getRealSpan (locA la)
 
 getRealSpan :: SrcSpan -> Maybe Span
 getRealSpan (RealSrcSpan sp _) = Just sp
 getRealSpan _ = Nothing
 
-grhss_span :: (Anno (GRHS (GhcPass p) (LocatedA (body (GhcPass p)))) ~ SrcAnn NoEpAnns)
+grhss_span :: (Anno (GRHS (GhcPass p) (LocatedA (body (GhcPass p)))) ~ EpAnn NoEpAnns)
            => GRHSs (GhcPass p) (LocatedA (body (GhcPass p))) -> SrcSpan
 grhss_span (GRHSs _ xs bs) = foldl' combineSrcSpans (spanHsLocaLBinds bs) (map getLocA xs)
 
@@ -594,7 +594,7 @@ instance (ToHie a) => ToHie (Maybe a) where
   toHie = maybe (pure []) toHie
 
 instance ToHie (IEContext (LocatedA ModuleName)) where
-  toHie (IEC c (L (SrcSpanAnn _ (RealSrcSpan span _)) mname)) = do
+  toHie (IEC c (L (EpAnn (EpaSpan (RealSrcSpan span _)) _ _) mname)) = do
       org <- ask
       pure $ [Node (mkSourcedNodeInfo org $ NodeInfo S.empty [] idents) span []]
     where details = mempty{identInfo = S.singleton (IEThing c)}
@@ -823,7 +823,7 @@ type AnnoBody p body
     , Anno [LocatedA (Match (GhcPass p) (LocatedA (body (GhcPass p))))]
                    ~ SrcSpanAnnL
     , Anno (GRHS (GhcPass p) (LocatedA (body (GhcPass p))))
-                   ~ SrcAnn NoEpAnns
+                   ~ EpAnn NoEpAnns
     , Anno (StmtLR (GhcPass p) (GhcPass p) (LocatedA (body (GhcPass p)))) ~ SrcSpanAnnA
 
     , Data (body (GhcPass p))
diff --git a/compiler/GHC/Iface/Ext/Utils.hs b/compiler/GHC/Iface/Ext/Utils.hs
index 4a77a9451790..f6efbaa278ec 100644
--- a/compiler/GHC/Iface/Ext/Utils.hs
+++ b/compiler/GHC/Iface/Ext/Utils.hs
@@ -527,7 +527,7 @@ locOnly (RealSrcSpan span _) = do
   pure [Node e span []]
 locOnly _ = pure []
 
-mkScopeA :: SrcSpanAnn' ann -> Scope
+mkScopeA :: EpAnn ann -> Scope
 mkScopeA l = mkScope (locA l)
 
 mkScope :: SrcSpan -> Scope
@@ -537,7 +537,7 @@ mkScope _ = NoScope
 mkLScope :: Located a -> Scope
 mkLScope = mkScope . getLoc
 
-mkLScopeA :: GenLocated (SrcSpanAnn' a) e -> Scope
+mkLScopeA :: GenLocated (EpAnn a) e -> Scope
 mkLScopeA = mkScope . locA . getLoc
 
 mkLScopeN :: LocatedN a -> Scope
@@ -557,8 +557,8 @@ mkSourcedNodeInfo org ni = SourcedNodeInfo $ M.singleton org ni
 {-# INLINEABLE makeNodeA #-}
 makeNodeA
   :: (Monad m, Data a)
-  => a                       -- ^ helps fill in 'nodeAnnotations' (with 'Data')
-  -> SrcSpanAnn' ann         -- ^ return an empty list if this is unhelpful
+  => a                 -- ^ helps fill in 'nodeAnnotations' (with 'Data')
+  -> EpAnn ann         -- ^ return an empty list if this is unhelpful
   -> ReaderT NodeOrigin m [HieAST b]
 makeNodeA x spn = makeNode x (locA spn)
 
diff --git a/compiler/GHC/Parser.y b/compiler/GHC/Parser.y
index a394ae5dab9d..3fc8d32e54c9 100644
--- a/compiler/GHC/Parser.y
+++ b/compiler/GHC/Parser.y
@@ -4382,8 +4382,7 @@ amsrp a@(L l _) bs = do
 amsrn :: MonadP m => Located a -> NameAnn -> m (LocatedN a)
 amsrn (L l a) an = do
   cs <- getCommentsFor l
-  let ann = (EpAnn (spanAsAnchor l) an cs)
-  return (L (SrcSpanAnn ann l) a)
+  return (L (EpAnn (spanAsAnchor l) an cs) a)
 
 -- |Synonyms for AddEpAnn versions of AnnOpen and AnnClose
 mo,mc :: Located Token -> AddEpAnn
@@ -4441,8 +4440,8 @@ parseModule = parseModuleNoHaddock >>= addHaddockToModule
 parseSignature :: P (Located (HsModule GhcPs))
 parseSignature = parseSignatureNoHaddock >>= addHaddockToModule
 
-commentsA :: (NoAnn ann) => SrcSpan -> EpAnnComments -> SrcSpanAnn' (EpAnn ann)
-commentsA loc cs = SrcSpanAnn (EpAnn (EpaSpan loc) noAnn cs) loc
+commentsA :: (NoAnn ann) => SrcSpan -> EpAnnComments -> EpAnn ann
+commentsA loc cs = EpAnn (EpaSpan loc) noAnn cs
 
 -- | Instead of getting the *enclosed* comments, this includes the
 -- *preceding* ones.  It is used at the top level to get comments
@@ -4450,7 +4449,7 @@ commentsA loc cs = SrcSpanAnn (EpAnn (EpaSpan loc) noAnn cs) loc
 commentsPA :: (NoAnn ann) => LocatedAn ann a -> P (LocatedAn ann a)
 commentsPA la@(L l a) = do
   cs <- getPriorCommentsFor (getLocA la)
-  return (L (addCommentsToSrcAnn l cs) a)
+  return (L (addCommentsToEpAnn l cs) a)
 
 rs :: SrcSpan -> RealSrcSpan
 rs (RealSrcSpan l _) = l
@@ -4501,15 +4500,14 @@ addTrailingCommaA :: MonadP m => LocatedA a -> SrcSpan -> m (LocatedA a)
 addTrailingCommaA  la span = addTrailingAnnA la span AddCommaAnn
 
 addTrailingAnnA :: MonadP m => LocatedA a -> SrcSpan -> (EpaLocation -> TrailingAnn) -> m (LocatedA a)
-addTrailingAnnA (L (SrcSpanAnn anns l) a) ss ta = do
-  -- cs <- getCommentsFor l
+addTrailingAnnA (L anns a) ss ta = do
   let cs = emptyComments
   -- AZ:TODO: generalise updating comments into an annotation
   let
     anns' = if isZeroWidthSpan ss
               then anns
-              else addTrailingAnnToA l (ta (srcSpan2e ss)) cs anns
-  return (L (SrcSpanAnn anns' l) a)
+              else addTrailingAnnToA (ta (srcSpan2e ss)) cs anns
+  return (L anns' a)
 
 -- -------------------------------------
 
@@ -4520,22 +4518,22 @@ addTrailingCommaL :: MonadP m => LocatedL a -> SrcSpan -> m (LocatedL a)
 addTrailingCommaL  la span = addTrailingAnnL la (AddCommaAnn (srcSpan2e span))
 
 addTrailingAnnL :: MonadP m => LocatedL a -> TrailingAnn -> m (LocatedL a)
-addTrailingAnnL (L (SrcSpanAnn anns l) a) ta = do
-  cs <- getCommentsFor l
-  let anns' = addTrailingAnnToL l ta cs anns
-  return (L (SrcSpanAnn anns' l) a)
+addTrailingAnnL (L anns a) ta = do
+  cs <- getCommentsFor (locA anns)
+  let anns' = addTrailingAnnToL ta cs anns
+  return (L anns' a)
 
 -- -------------------------------------
 
 -- Mostly use to add AnnComma, special case it to NOP if adding a zero-width annotation
 addTrailingCommaN :: MonadP m => LocatedN a -> SrcSpan -> m (LocatedN a)
-addTrailingCommaN (L (SrcSpanAnn anns l) a) span = do
+addTrailingCommaN (L anns a) span = do
   let cs = emptyComments
   -- AZ:TODO: generalise updating comments into an annotation
   let anns' = if isZeroWidthSpan span
                 then anns
-                else addTrailingCommaToN l anns (srcSpan2e span)
-  return (L (SrcSpanAnn anns' l) a)
+                else addTrailingCommaToN anns (srcSpan2e span)
+  return (L anns' a)
 
 addTrailingCommaS :: Located StringLiteral -> EpaLocation -> Located StringLiteral
 addTrailingCommaS (L l sl) span = L l (sl { sl_tc = Just (epaLocationRealSrcSpan span) })
@@ -4543,10 +4541,10 @@ addTrailingCommaS (L l sl) span = L l (sl { sl_tc = Just (epaLocationRealSrcSpan
 -- -------------------------------------
 
 addTrailingDarrowC :: LocatedC a -> Located Token -> EpAnnComments -> LocatedC a
-addTrailingDarrowC (L (SrcSpanAnn (EpAnn lr (AnnContext _ o c) csc) l) a) lt cs =
+addTrailingDarrowC (L (EpAnn lr (AnnContext _ o c) csc) a) lt cs =
   let
     u = if (isUnicode lt) then UnicodeSyntax else NormalSyntax
-  in L (SrcSpanAnn (EpAnn lr (AnnContext (Just (u,glAA lt)) o c) (cs Semi.<> csc)) l) a
+  in L (EpAnn lr (AnnContext (Just (u,glAA lt)) o c) (cs Semi.<> csc)) a
 
 -- -------------------------------------
 
@@ -4562,6 +4560,6 @@ combineHasLocs :: (HasLoc a, HasLoc b) => a -> b -> SrcSpan
 combineHasLocs a b = combineSrcSpans (getHasLoc a) (getHasLoc b)
 
 fromTrailingN :: SrcSpanAnnN -> SrcSpanAnnA
-fromTrailingN (SrcSpanAnn (EpAnn anc ann cs) l)
-    = SrcSpanAnn (EpAnn anc (AnnListItem (nann_trailing ann)) cs) l
+fromTrailingN (EpAnn anc ann cs)
+    = EpAnn anc (AnnListItem (nann_trailing ann)) cs
 }
diff --git a/compiler/GHC/Parser/Annotation.hs b/compiler/GHC/Parser/Annotation.hs
index 90ae153cdee2..60f3eef0806f 100644
--- a/compiler/GHC/Parser/Annotation.hs
+++ b/compiler/GHC/Parser/Annotation.hs
@@ -13,14 +13,14 @@ module GHC.Parser.Annotation (
 
   -- * In-tree Exact Print Annotations
   AddEpAnn(..),
-  EpaLocation(..), epaLocationRealSrcSpan, epaLocationFromSrcAnn,
+  EpaLocation(..), epaLocationRealSrcSpan,
   TokenLocation(..),
   getTokenSrcSpan,
   DeltaPos(..), deltaPos, getDeltaLine,
 
   EpAnn(..), Anchor,
   anchor,
-  spanAsAnchor, realSpanAsAnchor, spanFromAnchor,
+  spanAsAnchor, realSpanAsAnchor,
   noSpanAnchor,
   NoAnn(..),
 
@@ -33,7 +33,6 @@ module GHC.Parser.Annotation (
   -- ** Annotations in 'GenLocated'
   LocatedA, LocatedL, LocatedC, LocatedN, LocatedAn, LocatedP,
   SrcSpanAnnA, SrcSpanAnnL, SrcSpanAnnP, SrcSpanAnnC, SrcSpanAnnN,
-  SrcSpanAnn'(..), SrcAnn,
 
   -- ** Annotation data types used in 'GenLocated'
 
@@ -56,19 +55,17 @@ module GHC.Parser.Annotation (
   reLoc,
   HasLoc(..), getHasLocList,
 
-  srcSpan2e, la2e, realSrcSpan,
+  srcSpan2e, realSrcSpan,
 
   -- ** Building up annotations
-  extraToAnnList, reAnn,
   reAnnL, reAnnC,
-  addAnns, addAnnsA, widenSpan, widenAnchor, widenAnchorR, widenAnchorS, widenLocatedAn,
+  addAnns, addAnnsA, widenSpan, widenAnchor, widenAnchorS, widenLocatedAn,
 
   -- ** Querying annotations
   getLocAnn,
-  epAnnAnns, epAnnAnnsL,
+  epAnnAnns,
   annParen2AddEpAnn,
   epAnnComments,
-  s_comments, s_entry,
 
   -- ** Working with locations of annotations
   sortLocatedA,
@@ -86,8 +83,7 @@ module GHC.Parser.Annotation (
   noSrcSpanA,
 
   -- ** Working with comments in annotations
-  noComments, comment, addCommentsToSrcAnn, setCommentsSrcAnn,
-  addCommentsToEpAnn, setCommentsEpAnn,
+  noComments, comment, addCommentsToEpAnn, setCommentsEpAnn,
   transferAnnsA, transferAnnsOnlyA, transferCommentsOnlyA,
   transferPriorCommentsA, transferFollowingA,
   commentsOnlyA, removeCommentsA,
@@ -458,9 +454,6 @@ epaLocationRealSrcSpan :: EpaLocation -> RealSrcSpan
 epaLocationRealSrcSpan (EpaSpan (RealSrcSpan r _)) = r
 epaLocationRealSrcSpan _ = panic "epaLocationRealSrcSpan"
 
-epaLocationFromSrcAnn :: SrcAnn ann -> EpaLocation
-epaLocationFromSrcAnn (SrcSpanAnn (EpAnn anc _ _) _) = anc
-
 instance Outputable EpaLocation where
   ppr (EpaSpan r) = text "EpaSpan" <+> ppr r
   ppr (EpaDelta d cs) = text "EpaDelta" <+> ppr d <+> ppr cs
@@ -513,6 +506,7 @@ data EpAnn ann
               -- this `EpAnn` is attached to
            }
         deriving (Data, Eq, Functor)
+-- See Note [XRec and Anno in the AST]
 
 -- | An 'Anchor' records the base location for the start of the
 -- syntactic element holding the annotations, and is used as the point
@@ -533,10 +527,6 @@ spanAsAnchor ss  = EpaSpan ss
 realSpanAsAnchor :: RealSrcSpan -> Anchor
 realSpanAsAnchor s = EpaSpan (RealSrcSpan s Strict.Nothing)
 
-spanFromAnchor :: Anchor -> SrcSpan
-spanFromAnchor (EpaSpan ss) = ss
-spanFromAnchor (EpaDelta _ _) = UnhelpfulSpan (UnhelpfulOther (fsLit "spanFromAnchor"))
-
 noSpanAnchor :: Anchor
 noSpanAnchor =  EpaDelta (SameLine 0) []
 
@@ -565,19 +555,6 @@ emptyComments = EpaComments []
 -- Annotations attached to a 'SrcSpan'.
 -- ---------------------------------------------------------------------
 
--- | The 'SrcSpanAnn\'' type wraps a normal 'SrcSpan', together with
--- an extra annotation type. This is mapped to a specific `GenLocated`
--- usage in the AST through the `XRec` and `Anno` type families.
-
--- Important that the fields are strict as these live inside L nodes which
--- are live for a long time.
-data SrcSpanAnn' a = SrcSpanAnn { ann :: !a, locAn :: !SrcSpan }
-        deriving (Data, Eq)
--- See Note [XRec and Anno in the AST]
-
--- | We mostly use 'SrcSpanAnn\'' with an 'EpAnn\''
-type SrcAnn ann = SrcSpanAnn' (EpAnn ann)
-
 type LocatedA = GenLocated SrcSpanAnnA
 type LocatedN = GenLocated SrcSpanAnnN
 
@@ -585,16 +562,16 @@ type LocatedL = GenLocated SrcSpanAnnL
 type LocatedP = GenLocated SrcSpanAnnP
 type LocatedC = GenLocated SrcSpanAnnC
 
-type SrcSpanAnnA = SrcAnn AnnListItem
-type SrcSpanAnnN = SrcAnn NameAnn
+type SrcSpanAnnA = EpAnn AnnListItem
+type SrcSpanAnnN = EpAnn NameAnn
 
-type SrcSpanAnnL = SrcAnn AnnList
-type SrcSpanAnnP = SrcAnn AnnPragma
-type SrcSpanAnnC = SrcAnn AnnContext
+type SrcSpanAnnL = EpAnn AnnList
+type SrcSpanAnnP = EpAnn AnnPragma
+type SrcSpanAnnC = EpAnn AnnContext
 
 -- | General representation of a 'GenLocated' type carrying a
 -- parameterised annotation type.
-type LocatedAn an = GenLocated (SrcAnn an)
+type LocatedAn an = GenLocated (EpAnn an)
 
 {-
 Note [XRec and Anno in the AST]
@@ -922,9 +899,9 @@ trailingAnnToAddEpAnn (AddDarrowAnn ss)  = AddEpAnn AnnDarrow ss
 
 -- | Helper function used in the parser to add a 'TrailingAnn' items
 -- to an existing annotation.
-addTrailingAnnToL :: SrcSpan -> TrailingAnn -> EpAnnComments
+addTrailingAnnToL :: TrailingAnn -> EpAnnComments
                   -> EpAnn AnnList -> EpAnn AnnList
-addTrailingAnnToL _ t cs n = n { anns = addTrailing (anns n)
+addTrailingAnnToL t cs n = n { anns = addTrailing (anns n)
                                , comments = comments n <> cs }
   where
     -- See Note [list append in addTrailing*]
@@ -932,9 +909,9 @@ addTrailingAnnToL _ t cs n = n { anns = addTrailing (anns n)
 
 -- | Helper function used in the parser to add a 'TrailingAnn' items
 -- to an existing annotation.
-addTrailingAnnToA :: SrcSpan -> TrailingAnn -> EpAnnComments
+addTrailingAnnToA :: TrailingAnn -> EpAnnComments
                   -> EpAnn AnnListItem -> EpAnn AnnListItem
-addTrailingAnnToA _ t cs n = n { anns = addTrailing (anns n)
+addTrailingAnnToA t cs n = n { anns = addTrailing (anns n)
                                , comments = comments n <> cs }
   where
     -- See Note [list append in addTrailing*]
@@ -942,16 +919,15 @@ addTrailingAnnToA _ t cs n = n { anns = addTrailing (anns n)
 
 -- | Helper function used in the parser to add a comma location to an
 -- existing annotation.
-addTrailingCommaToN :: SrcSpan -> EpAnn NameAnn -> EpaLocation -> EpAnn NameAnn
-addTrailingCommaToN _ n l = n { anns = addTrailing (anns n) l }
+addTrailingCommaToN :: EpAnn NameAnn -> EpaLocation -> EpAnn NameAnn
+addTrailingCommaToN  n l = n { anns = addTrailing (anns n) l }
   where
     -- See Note [list append in addTrailing*]
     addTrailing :: NameAnn -> EpaLocation -> NameAnn
     addTrailing n l = n { nann_trailing = nann_trailing n ++ [AddCommaAnn l]}
 
 noTrailingN :: SrcSpanAnnN -> SrcSpanAnnN
-noTrailingN (SrcSpanAnn s l)
-    = SrcSpanAnn (s { anns = (anns s) { nann_trailing = [] } }) l
+noTrailingN s = s { anns = (anns s) { nann_trailing = [] } }
 
 {-
 Note [list append in addTrailing*]
@@ -1004,13 +980,10 @@ instance HasAnnotation (SrcSpan) where
 instance (NoAnn ann) => HasAnnotation (EpAnn ann) where
   noAnnSrcSpan l = EpAnn (spanAsAnchor l) noAnn emptyComments
 
-instance (NoAnn ann) => HasAnnotation (SrcSpanAnn' (EpAnn ann)) where
-  noAnnSrcSpan l = SrcSpanAnn (EpAnn (spanAsAnchor l) noAnn emptyComments) l
-
 noLocA :: (HasAnnotation e) => a -> GenLocated e a
 noLocA = L (noAnnSrcSpan noSrcSpan)
 
-getLocA :: GenLocated (SrcSpanAnn' a) e -> SrcSpan
+getLocA :: (HasLoc a) => GenLocated a e -> SrcSpan
 getLocA = getHasLoc
 
 noSrcSpanA :: (HasAnnotation e) => e
@@ -1034,13 +1007,14 @@ instance (HasLoc l) => HasLoc (GenLocated l a) where
 instance HasLoc SrcSpan where
   getHasLoc l = l
 
-instance HasLoc (SrcSpanAnn' a) where
-  getHasLoc (SrcSpanAnn _ l) = l
-
 instance (HasLoc a) => (HasLoc (Maybe a)) where
   getHasLoc (Just a) = getHasLoc a
   getHasLoc Nothing = noSrcSpan
 
+instance HasLoc (EpAnn a) where
+  getHasLoc (EpAnn (EpaSpan l) _ _) = l
+  getHasLoc (EpAnn (EpaDelta _ _) _ _) = noSrcSpan
+
 getHasLocList :: HasLoc a => [a] -> SrcSpan
 getHasLocList [] = noSrcSpan
 getHasLocList xs = foldl1' combineSrcSpans $ map getHasLoc xs
@@ -1057,23 +1031,14 @@ srcSpan2e :: SrcSpan -> EpaLocation
 srcSpan2e ss@(RealSrcSpan _ _) = EpaSpan ss
 srcSpan2e span = EpaSpan (RealSrcSpan (realSrcSpan span) Strict.Nothing)
 
-la2e :: SrcSpanAnn' a -> EpaLocation
-la2e = srcSpan2e . locA
-
-extraToAnnList :: AnnList -> [AddEpAnn] -> AnnList
-extraToAnnList (AnnList a o c e t) as = AnnList a o c (e++as) t
-
-reAnn :: [TrailingAnn] -> EpAnnComments -> Located a -> LocatedA a
-reAnn anns cs (L l a) = L (SrcSpanAnn (EpAnn (spanAsAnchor l) (AnnListItem anns) cs) l) a
-
 reAnnC :: AnnContext -> EpAnnComments -> Located a -> LocatedC a
-reAnnC anns cs (L l a) = L (SrcSpanAnn (EpAnn (spanAsAnchor l) anns cs) l) a
+reAnnC anns cs (L l a) = L (EpAnn (spanAsAnchor l) anns cs) a
 
-reAnnL :: ann -> EpAnnComments -> Located e -> GenLocated (SrcAnn ann) e
-reAnnL anns cs (L l a) = L (SrcSpanAnn (EpAnn (spanAsAnchor l) anns cs) l) a
+reAnnL :: ann -> EpAnnComments -> Located e -> GenLocated (EpAnn ann) e
+reAnnL anns cs (L l a) = L (EpAnn (spanAsAnchor l) anns cs) a
 
 getLocAnn :: Located a  -> SrcSpanAnnA
-getLocAnn (L l _) = SrcSpanAnn noAnn l
+getLocAnn (L l _) = noAnnSrcSpan l
 
 addAnns :: EpAnn [AddEpAnn] -> [AddEpAnn] -> EpAnnComments -> EpAnn [AddEpAnn]
 addAnns (EpAnn l as1 cs) as2 cs2
@@ -1081,8 +1046,8 @@ addAnns (EpAnn l as1 cs) as2 cs2
 
 -- AZ:TODO use widenSpan here too
 addAnnsA :: SrcSpanAnnA -> [TrailingAnn] -> EpAnnComments -> SrcSpanAnnA
-addAnnsA (SrcSpanAnn (EpAnn l as1 cs) loc) as2 cs2
-  = SrcSpanAnn (EpAnn l (AnnListItem (lann_trailing as1 ++ as2)) (cs <> cs2)) loc
+addAnnsA (EpAnn l as1 cs) as2 cs2
+  = EpAnn l (AnnListItem (lann_trailing as1 ++ as2)) (cs <> cs2)
 
 -- | The annotations need to all come after the anchor.  Make sure
 -- this is the case.
@@ -1131,11 +1096,6 @@ widenAnchor a@(EpaDelta _ _) as = case (realSpanFromAnns as) of
                                     Strict.Nothing -> a
                                     Strict.Just r -> EpaSpan (RealSrcSpan r Strict.Nothing)
 
-widenAnchorR :: Anchor -> RealSrcSpan -> Anchor
-widenAnchorR (EpaSpan (RealSrcSpan s _)) r = EpaSpan (RealSrcSpan (combineRealSrcSpans s r) Strict.Nothing)
-widenAnchorR (EpaSpan _) r = EpaSpan (RealSrcSpan r Strict.Nothing)
-widenAnchorR (EpaDelta _ _) r = EpaSpan (RealSrcSpan r Strict.Nothing)
-
 widenAnchorS :: Anchor -> SrcSpan -> Anchor
 widenAnchorS (EpaSpan (RealSrcSpan s mbe)) (RealSrcSpan r mbr)
   = EpaSpan (RealSrcSpan (combineRealSrcSpans s r) (liftA2 combineBufSpans mbe mbr))
@@ -1143,14 +1103,11 @@ widenAnchorS (EpaSpan us) _ = EpaSpan us
 widenAnchorS (EpaDelta _ _) (RealSrcSpan r mb) = EpaSpan (RealSrcSpan r mb)
 widenAnchorS anc _ = anc
 
-widenLocatedAn :: SrcAnn an -> [AddEpAnn] -> SrcAnn an
-widenLocatedAn (SrcSpanAnn (EpAnn _ a cs) l) as = SrcSpanAnn (EpAnn (spanAsAnchor l') a cs) l'
+widenLocatedAn :: EpAnn an -> [AddEpAnn] -> EpAnn an
+widenLocatedAn (EpAnn (EpaSpan l) a cs) as = EpAnn (spanAsAnchor l') a cs
   where
     l' = widenSpan l as
-
-
-epAnnAnnsL :: EpAnn a -> [a]
-epAnnAnnsL (EpAnn _ anns _) = [anns]
+widenLocatedAn (EpAnn anc a cs) _as = EpAnn anc a cs
 
 epAnnAnns :: EpAnn [AddEpAnn] -> [AddEpAnn]
 epAnnAnns (EpAnn _ anns _) = anns
@@ -1164,31 +1121,19 @@ annParen2AddEpAnn (EpAnn _ (AnnParen pt o c) _)
 epAnnComments :: EpAnn an -> EpAnnComments
 epAnnComments (EpAnn _ _ cs) = cs
 
--- Forward compatibility
-s_comments :: SrcAnn ann -> EpAnnComments
-s_comments (SrcSpanAnn an _) = epAnnComments an
-
-s_entry :: SrcAnn ann -> EpaLocation
-s_entry = epaLocationFromSrcAnn
-
 -- ---------------------------------------------------------------------
--- sortLocatedA :: [LocatedA a] -> [LocatedA a]
-sortLocatedA :: [GenLocated (SrcSpanAnn' a) e] -> [GenLocated (SrcSpanAnn' a) e]
+sortLocatedA :: (HasLoc (EpAnn a)) => [GenLocated (EpAnn a) e] -> [GenLocated (EpAnn a) e]
 sortLocatedA = sortBy (leftmost_smallest `on` getLocA)
 
-mapLocA :: (NoAnn ann) => (a -> b) -> GenLocated SrcSpan a -> GenLocated (SrcAnn ann) b
+mapLocA :: (NoAnn ann) => (a -> b) -> GenLocated SrcSpan a -> GenLocated (EpAnn ann) b
 mapLocA f (L l a) = L (noAnnSrcSpan l) (f a)
 
 -- AZ:TODO: move this somewhere sane
-
-combineLocsA :: Semigroup a => GenLocated (SrcAnn a) e1 -> GenLocated (SrcAnn a) e2 -> SrcAnn a
+combineLocsA :: Semigroup a => GenLocated (EpAnn a) e1 -> GenLocated (EpAnn a) e2 -> EpAnn a
 combineLocsA (L a _) (L b _) = combineSrcSpansA a b
 
-combineSrcSpansA :: Semigroup a => SrcAnn a -> SrcAnn a -> SrcAnn a
-combineSrcSpansA (SrcSpanAnn aa la) (SrcSpanAnn ab lb)
-  = case SrcSpanAnn (aa <> ab) (combineSrcSpans la lb) of
-      SrcSpanAnn (EpAnn anc an cs) l ->
-        SrcSpanAnn (EpAnn (widenAnchorR anc (realSrcSpan l)) an cs) l
+combineSrcSpansA :: Semigroup a => EpAnn a -> EpAnn a -> EpAnn a
+combineSrcSpansA aa ab = aa <> ab
 
 -- | Combine locations from two 'Located' things and add them to a third thing
 addCLocA :: (HasLoc a, HasLoc b, HasAnnotation l)
@@ -1234,45 +1179,27 @@ comment loc cs = EpAnn (EpaSpan (RealSrcSpan loc Strict.Nothing)) NoEpAnns cs
 -- Utilities for managing comments in an `EpAnn a` structure.
 -- ---------------------------------------------------------------------
 
--- | Add additional comments to a 'SrcAnn', used for manipulating the
--- AST prior to exact printing the changed one.
-addCommentsToSrcAnn :: (NoAnn ann) => SrcAnn ann -> EpAnnComments -> SrcAnn ann
-addCommentsToSrcAnn (SrcSpanAnn (EpAnn a an cs) loc) cs'
-  = SrcSpanAnn (EpAnn a an (cs <> cs')) loc
-
--- | Replace any existing comments on a 'SrcAnn', used for manipulating the
+-- | Add additional comments to a 'EpAnn', used for manipulating the
 -- AST prior to exact printing the changed one.
-setCommentsSrcAnn :: (NoAnn ann) => SrcAnn ann -> EpAnnComments -> SrcAnn ann
-setCommentsSrcAnn (SrcSpanAnn (EpAnn a an _) loc) cs
-  = SrcSpanAnn (EpAnn a an cs) loc
+addCommentsToEpAnn :: (NoAnn ann) => EpAnn ann -> EpAnnComments -> EpAnn ann
+addCommentsToEpAnn (EpAnn a an cs) cs' = EpAnn a an (cs <> cs')
 
--- | Add additional comments, used for manipulating the
+-- | Replace any existing comments on a 'EpAnn', used for manipulating the
 -- AST prior to exact printing the changed one.
-addCommentsToEpAnn :: (NoAnn a)
-  => SrcSpan -> EpAnn a -> EpAnnComments -> EpAnn a
-addCommentsToEpAnn _ (EpAnn a an ocs) ncs = EpAnn a an (ocs <> ncs)
-
--- | Replace any existing comments, used for manipulating the
--- AST prior to exact printing the changed one.
-setCommentsEpAnn :: (NoAnn a)
-  => SrcSpan -> EpAnn a -> EpAnnComments -> EpAnn a
-setCommentsEpAnn _ (EpAnn a an _) cs = EpAnn a an cs
+setCommentsEpAnn :: (NoAnn ann) => EpAnn ann -> EpAnnComments -> EpAnn ann
+setCommentsEpAnn (EpAnn a an _) cs = (EpAnn a an cs)
 
 -- | Transfer comments and trailing items from the annotations in the
 -- first 'SrcSpanAnnA' argument to those in the second.
 transferAnnsA :: SrcSpanAnnA -> SrcSpanAnnA -> (SrcSpanAnnA,  SrcSpanAnnA)
-transferAnnsA (SrcSpanAnn (EpAnn a an cs) l) to
-  = ((SrcSpanAnn (EpAnn a noAnn emptyComments) l), to')
-  where
-    to' = case to of
-      (SrcSpanAnn (EpAnn a an' cs') loc)
-        -> SrcSpanAnn (EpAnn a (an' <> an) (cs' <> cs)) loc
+transferAnnsA (EpAnn a an cs) (EpAnn a' an' cs')
+  = (EpAnn a noAnn emptyComments, EpAnn a' (an' <> an) (cs' <> cs))
 
 -- | Transfer trailing items but not comments from the annotations in the
 -- first 'SrcSpanAnnA' argument to those in the second.
 transferFollowingA :: SrcSpanAnnA -> SrcSpanAnnA -> (SrcSpanAnnA,  SrcSpanAnnA)
-transferFollowingA (SrcSpanAnn (EpAnn a1 an1 cs1) l1) (SrcSpanAnn (EpAnn a2 an2 cs2) l2)
-  = (SrcSpanAnn (EpAnn a1 noAnn cs1') l1, SrcSpanAnn (EpAnn a2 (an1 <> an2) cs2') l2)
+transferFollowingA (EpAnn a1 an1 cs1) (EpAnn a2 an2 cs2)
+  = (EpAnn a1 noAnn cs1', EpAnn a2 (an1 <> an2) cs2')
   where
     pc = priorComments cs1
     fc = getFollowingComments cs1
@@ -1282,20 +1209,20 @@ transferFollowingA (SrcSpanAnn (EpAnn a1 an1 cs1) l1) (SrcSpanAnn (EpAnn a2 an2
 -- | Transfer trailing items from the annotations in the
 -- first 'SrcSpanAnnA' argument to those in the second.
 transferAnnsOnlyA :: SrcSpanAnnA -> SrcSpanAnnA -> (SrcSpanAnnA,  SrcSpanAnnA)
-transferAnnsOnlyA (SrcSpanAnn (EpAnn a an cs) l) (SrcSpanAnn (EpAnn a' an' cs') l')
-  = (SrcSpanAnn (EpAnn a noAnn cs) l, SrcSpanAnn (EpAnn a' (an' <> an) cs') l')
+transferAnnsOnlyA (EpAnn a an cs) (EpAnn a' an' cs')
+  = (EpAnn a noAnn cs, EpAnn a' (an' <> an) cs')
 
 -- | Transfer comments from the annotations in the
 -- first 'SrcSpanAnnA' argument to those in the second.
 transferCommentsOnlyA :: SrcSpanAnnA -> SrcSpanAnnA -> (SrcSpanAnnA,  SrcSpanAnnA)
-transferCommentsOnlyA (SrcSpanAnn (EpAnn a an cs) l) (SrcSpanAnn (EpAnn a' an' cs') l')
-  = (SrcSpanAnn (EpAnn a an emptyComments) l, SrcSpanAnn (EpAnn a' an' (cs <> cs')) l')
+transferCommentsOnlyA (EpAnn a an cs) (EpAnn a' an' cs')
+  = (EpAnn a an emptyComments, EpAnn a' an' (cs <> cs'))
 
 -- | Transfer prior comments only from the annotations in the
 -- first 'SrcSpanAnnA' argument to those in the second.
 transferPriorCommentsA :: SrcSpanAnnA -> SrcSpanAnnA -> (SrcSpanAnnA,  SrcSpanAnnA)
-transferPriorCommentsA (SrcSpanAnn (EpAnn a1 an1 cs1) l1) (SrcSpanAnn (EpAnn a2 an2 cs2) l2)
-  = (SrcSpanAnn (EpAnn a1 an1 cs1') l1,  SrcSpanAnn (EpAnn a2 an2 cs2') l2)
+transferPriorCommentsA (EpAnn a1 an1 cs1) (EpAnn a2 an2 cs2)
+  = (EpAnn a1 an1 cs1', EpAnn a2 an2 cs2')
   where
     pc = priorComments cs1
     fc = getFollowingComments cs1
@@ -1305,24 +1232,17 @@ transferPriorCommentsA (SrcSpanAnn (EpAnn a1 an1 cs1) l1) (SrcSpanAnn (EpAnn a2
 
 -- | Remove the exact print annotations payload, leaving only the
 -- anchor and comments.
-commentsOnlyA :: NoAnn ann => SrcAnn ann -> SrcAnn ann
-commentsOnlyA (SrcSpanAnn (EpAnn a _ cs) loc) = (SrcSpanAnn (EpAnn a noAnn cs) loc)
+commentsOnlyA :: NoAnn ann => EpAnn ann -> EpAnn ann
+commentsOnlyA (EpAnn a _ cs) = EpAnn a noAnn cs
 
 -- | Remove the comments, leaving the exact print annotations payload
-removeCommentsA :: SrcAnn ann -> SrcAnn ann
-removeCommentsA (SrcSpanAnn (EpAnn a an _) loc)
-  = (SrcSpanAnn (EpAnn a an emptyComments) loc)
+removeCommentsA :: EpAnn ann -> EpAnn ann
+removeCommentsA (EpAnn a an _) = EpAnn a an emptyComments
 
 -- ---------------------------------------------------------------------
 -- Semigroup instances, to allow easy combination of annotaion elements
 -- ---------------------------------------------------------------------
 
-instance (Semigroup an) => Semigroup (SrcSpanAnn' an) where
-  (SrcSpanAnn a1 l1) <> (SrcSpanAnn a2 l2) = SrcSpanAnn (a1 <> a2) (combineSrcSpans l1 l2)
-   -- The critical part about the location is its left edge, and all
-   -- annotations must follow it. So we combine them which yields the
-   -- largest span
-
 instance (Semigroup a) => Semigroup (EpAnn a) where
   (EpAnn l1 a1 b1) <> (EpAnn l2 a2 b2) = EpAnn (l1 <> l2) (a1 <> a2) (b1 <> b2)
    -- The critical part about the anchor is its left edge, and all
@@ -1439,18 +1359,16 @@ instance Outputable tag => Outputable (AnnSortKey tag) where
 instance Outputable IsUnicodeSyntax where
   ppr = text . show
 
-instance (Outputable a) => Outputable (SrcSpanAnn' a) where
-  ppr (SrcSpanAnn a l) = text "SrcSpanAnn" <+> ppr a <+> ppr l
-
 instance (Outputable a, Outputable e)
-     => Outputable (GenLocated (SrcSpanAnn' a) e) where
+     => Outputable (GenLocated (EpAnn a) e) where
   ppr = pprLocated
 
 instance (Outputable a, OutputableBndr e)
-     => OutputableBndr (GenLocated (SrcSpanAnn' a) e) where
+     => OutputableBndr (GenLocated (EpAnn a) e) where
   pprInfixOcc = pprInfixOcc . unLoc
   pprPrefixOcc = pprPrefixOcc . unLoc
 
+
 instance Outputable AnnListItem where
   ppr (AnnListItem ts) = text "AnnListItem" <+> ppr ts
 
diff --git a/compiler/GHC/Parser/PostProcess.hs b/compiler/GHC/Parser/PostProcess.hs
index 029541f77542..849e95b71cb6 100644
--- a/compiler/GHC/Parser/PostProcess.hs
+++ b/compiler/GHC/Parser/PostProcess.hs
@@ -405,15 +405,15 @@ mkSpliceDecl :: LHsExpr GhcPs -> P (LHsDecl GhcPs)
 mkSpliceDecl lexpr@(L loc expr)
   | HsUntypedSplice _ splice@(HsUntypedSpliceExpr {}) <- expr = do
     cs <- getCommentsFor (locA loc)
-    return $ L (addCommentsToSrcAnn loc cs) $ SpliceD noExtField (SpliceDecl noExtField (L loc splice) DollarSplice)
+    return $ L (addCommentsToEpAnn loc cs) $ SpliceD noExtField (SpliceDecl noExtField (L loc splice) DollarSplice)
 
   | HsUntypedSplice _ splice@(HsQuasiQuote {}) <- expr = do
     cs <- getCommentsFor (locA loc)
-    return $ L (addCommentsToSrcAnn loc cs) $ SpliceD noExtField (SpliceDecl noExtField (L loc splice) DollarSplice)
+    return $ L (addCommentsToEpAnn loc cs) $ SpliceD noExtField (SpliceDecl noExtField (L loc splice) DollarSplice)
 
   | otherwise = do
     cs <- getCommentsFor (locA loc)
-    return $ L (addCommentsToSrcAnn loc cs) $ SpliceD noExtField (SpliceDecl noExtField
+    return $ L (addCommentsToEpAnn loc cs) $ SpliceD noExtField (SpliceDecl noExtField
                                  (L loc (HsUntypedSpliceExpr noAnn lexpr))
                                        BareSplice)
 
@@ -815,16 +815,16 @@ mkGadtDecl loc names dcol ty = do
 
   (args, res_ty, annsa, csa) <-
     case body_ty of
-     L ll (HsFunTy af hsArr (L loc' (HsRecTy an rf)) res_ty) -> do
-       let an' = addCommentsToEpAnn (locA loc') an (comments af)
+     L ll (HsFunTy af hsArr (L _loc' (HsRecTy an rf)) res_ty) -> do
+       let an' = addCommentsToEpAnn an (comments af)
        arr <- case hsArr of
          HsUnrestrictedArrow arr -> return arr
          _ -> do addError $ mkPlainErrorMsgEnvelope (getLocA body_ty) $
                                  (PsErrIllegalGadtRecordMultiplicity hsArr)
                  return noHsUniTok
 
-       return ( RecConGADT (L (SrcSpanAnn an' (locA loc')) rf) arr, res_ty
-              , [], epAnnComments (ann ll))
+       return ( RecConGADT (L an' rf) arr, res_ty
+              , [], epAnnComments ll)
      _ -> do
        let (anns, cs, arg_types, res_type) = splitHsFunType body_ty
        return (PrefixConGADT arg_types, res_type, anns, cs)
@@ -833,7 +833,7 @@ mkGadtDecl loc names dcol ty = do
 
   let bndrs_loc = case outer_bndrs of
         HsOuterImplicit{} -> getLoc ty
-        HsOuterExplicit an' _ -> SrcSpanAnn (EpAnn (entry an') noAnn emptyComments) (spanFromAnchor (entry an'))
+        HsOuterExplicit an _ -> EpAnn (entry an) noAnn emptyComments
 
   pure $ L l ConDeclGADT
                      { con_g_ext  = an
@@ -1103,11 +1103,11 @@ checkTyClHdr is_cls ty
     -- Combine the annotations from the HsParTy and HsStarTy into a
     -- new one for the LocatedN RdrName
     newAnns :: SrcSpanAnnA -> EpAnn AnnParen -> SrcSpanAnnN
-    newAnns (SrcSpanAnn (EpAnn ap (AnnListItem ta) csp) l) (EpAnn as (AnnParen _ o c) cs) =
+    newAnns (EpAnn ap (AnnListItem ta) csp) (EpAnn as (AnnParen _ o c) cs) =
       let
         lr = RealSrcSpan (combineRealSrcSpans (anchor ap) (anchor as)) Strict.Nothing
-        an = EpAnn (EpaSpan lr) (NameAnn NameParens o (srcSpan2e l) c ta) (csp Semi.<> cs)
-      in SrcSpanAnn an lr
+      in
+        EpAnn (EpaSpan lr) (NameAnn NameParens o ap c ta) (csp Semi.<> cs)
 
 -- | Yield a parse error if we have a function applied directly to a do block
 -- etc. and BlockArguments is not enabled.
@@ -1150,7 +1150,7 @@ checkCmdBlockArguments :: LHsCmd GhcPs -> PV ()
 --     (((Eq a)))           -->  [Eq a]
 -- @
 checkContext :: LHsType GhcPs -> P (LHsContext GhcPs)
-checkContext orig_t@(L (SrcSpanAnn _ l) _orig_t) =
+checkContext orig_t@(L (EpAnn l _ _) _orig_t) =
   check ([],[],emptyComments) orig_t
  where
   check :: ([EpaLocation],[EpaLocation],EpAnnComments)
@@ -1162,9 +1162,9 @@ checkContext orig_t@(L (SrcSpanAnn _ l) _orig_t) =
     = do
         let (op,cp,cs') = case ann' of
               EpAnn _ (AnnParen _ o c) cs -> ([o],[c],cs)
-        return (L (SrcSpanAnn (EpAnn (spanAsAnchor l)
-                              -- Append parens so that the original order in the source is maintained
-                               (AnnContext Nothing (oparens ++ op) (cp ++ cparens)) (cs Semi.<> cs')) l) ts)
+        return (L (EpAnn l
+                          -- Append parens so that the original order in the source is maintained
+                           (AnnContext Nothing (oparens ++ op) (cp ++ cparens)) (cs Semi.<> cs')) ts)
 
   check (opi,cpi,csi) (L _lp1 (HsParTy ann' ty))
                                   -- to be sure HsParTy doesn't get into the way
@@ -1175,7 +1175,7 @@ checkContext orig_t@(L (SrcSpanAnn _ l) _orig_t) =
 
   -- No need for anns, returning original
   check (_opi,_cpi,_csi) _t =
-                 return (L (SrcSpanAnn (EpAnn (spanAsAnchor l) (AnnContext Nothing [] []) emptyComments) l) [orig_t])
+                 return (L (EpAnn l (AnnContext Nothing [] []) emptyComments) [orig_t])
 
 checkImportDecl :: Maybe EpaLocation
                 -> Maybe EpaLocation
@@ -1262,7 +1262,7 @@ checkAPat loc e0 = do
            (EpAnn anc _ cs)
                      | nPlusKPatterns && (plus == plus_RDR)
                      -> return (mkNPlusKPat (L nloc n) (L (l2l lloc) lit)
-                                (EpAnn anc (epaLocationFromSrcAnn l) cs))
+                                (EpAnn anc (entry l) cs))
 
    -- Improve error messages for the @-operator when the user meant an @-pattern
    PatBuilderOpApp _ op _ _ | opIsAt (unLoc op) -> do
@@ -1533,7 +1533,7 @@ instance DisambInfixOp RdrName where
   mkHsInfixHolePV l _ = addFatalError $ mkPlainErrorMsgEnvelope l $ PsErrInvalidInfixHole
 
 type AnnoBody b
-  = ( Anno (GRHS GhcPs (LocatedA (Body b GhcPs))) ~ SrcAnn NoEpAnns
+  = ( Anno (GRHS GhcPs (LocatedA (Body b GhcPs))) ~ EpAnn NoEpAnns
     , Anno [LocatedA (Match GhcPs (LocatedA (Body b GhcPs)))] ~ SrcSpanAnnL
     , Anno (Match GhcPs (LocatedA (Body b GhcPs))) ~ SrcSpanAnnA
     , Anno (StmtLR GhcPs GhcPs (LocatedA (Body (Body b GhcPs) GhcPs))) ~ SrcSpanAnnA
@@ -2037,8 +2037,8 @@ dataConBuilderDetails :: DataConBuilder -> HsConDeclH98Details GhcPs
 -- Detect when the record syntax is used:
 --   data T = MkT { ... }
 dataConBuilderDetails (PrefixDataConBuilder flds _)
-  | [L l_t (HsRecTy an fields)] <- toList flds
-  = RecCon (L (SrcSpanAnn an (locA l_t)) fields)
+  | [L _ (HsRecTy an fields)] <- toList flds
+  = RecCon (L an fields)
 
 -- Normal prefix constructor, e.g.  data T = MkT A B C
 dataConBuilderDetails (PrefixDataConBuilder flds _)
@@ -2922,7 +2922,7 @@ checkImportSpec ie@(L _ specs) =
 mkImpExpSubSpec :: [LocatedA ImpExpQcSpec] -> P ([AddEpAnn], ImpExpSubSpec)
 mkImpExpSubSpec [] = return ([], ImpExpList [])
 mkImpExpSubSpec [L la ImpExpQcWildcard] =
-  return ([AddEpAnn AnnDotdot (la2e la)], ImpExpAll)
+  return ([AddEpAnn AnnDotdot (entry la)], ImpExpAll)
 mkImpExpSubSpec xs =
   if (any (isImpExpQcWildcard . unLoc) xs)
     then return $ ([], ImpExpAllWith xs)
diff --git a/compiler/GHC/Parser/PostProcess/Haddock.hs b/compiler/GHC/Parser/PostProcess/Haddock.hs
index 706423c09961..2282076b8881 100644
--- a/compiler/GHC/Parser/PostProcess/Haddock.hs
+++ b/compiler/GHC/Parser/PostProcess/Haddock.hs
@@ -1155,7 +1155,7 @@ registerLocHdkA l = HdkA (getBufSpan l) (pure ())
 -- A small wrapper over registerLocHdkA.
 --
 -- See Note [Adding Haddock comments to the syntax tree].
-registerHdkA :: GenLocated (SrcSpanAnn' a) e -> HdkA ()
+registerHdkA :: GenLocated (EpAnn a) e -> HdkA ()
 registerHdkA a = registerLocHdkA (getLocA a)
 
 -- Modify the action of a HdkA computation.
@@ -1517,7 +1517,7 @@ flattenBindsAndSigs (all_bs, all_ss, all_ts, all_tfis, all_dfis, all_docs) =
     mapLL (\d -> DocD noExtField d) all_docs
   ]
 
-cmpBufSpanA :: GenLocated (SrcSpanAnn' a1) a2 -> GenLocated (SrcSpanAnn' a3) a2 -> Ordering
+cmpBufSpanA :: GenLocated (EpAnn a1) a2 -> GenLocated (EpAnn a3) a2 -> Ordering
 cmpBufSpanA (L la a) (L lb b) = cmpBufSpan (L (locA la) a) (L (locA lb) b)
 
 {- *********************************************************************
diff --git a/compiler/GHC/Parser/Types.hs b/compiler/GHC/Parser/Types.hs
index bd8a3a6b866e..505719e0c0ec 100644
--- a/compiler/GHC/Parser/Types.hs
+++ b/compiler/GHC/Parser/Types.hs
@@ -62,7 +62,7 @@ data PatBuilder p
   | PatBuilderOverLit (HsOverLit GhcPs)
 
 -- These instances are here so that they are not orphans
-type instance Anno (GRHS GhcPs (LocatedA (PatBuilder GhcPs)))             = SrcAnn NoEpAnns
+type instance Anno (GRHS GhcPs (LocatedA (PatBuilder GhcPs)))             = EpAnn NoEpAnns
 type instance Anno [LocatedA (Match GhcPs (LocatedA (PatBuilder GhcPs)))] = SrcSpanAnnL
 type instance Anno (Match GhcPs (LocatedA (PatBuilder GhcPs)))            = SrcSpanAnnA
 type instance Anno (StmtLR GhcPs GhcPs (LocatedA (PatBuilder GhcPs)))     = SrcSpanAnnA
diff --git a/compiler/GHC/Rename/Bind.hs b/compiler/GHC/Rename/Bind.hs
index 5238ca1bb64b..04c2ed97557f 100644
--- a/compiler/GHC/Rename/Bind.hs
+++ b/compiler/GHC/Rename/Bind.hs
@@ -1242,8 +1242,8 @@ type AnnoBody body
     , Anno [LocatedA (Match GhcPs (LocatedA (body GhcPs)))] ~ SrcSpanAnnL
     , Anno (Match GhcRn (LocatedA (body GhcRn))) ~ SrcSpanAnnA
     , Anno (Match GhcPs (LocatedA (body GhcPs))) ~ SrcSpanAnnA
-    , Anno (GRHS GhcRn (LocatedA (body GhcRn))) ~ SrcAnn NoEpAnns
-    , Anno (GRHS GhcPs (LocatedA (body GhcPs))) ~ SrcAnn NoEpAnns
+    , Anno (GRHS GhcRn (LocatedA (body GhcRn))) ~ EpAnn NoEpAnns
+    , Anno (GRHS GhcPs (LocatedA (body GhcPs))) ~ EpAnn NoEpAnns
     , Outputable (body GhcPs)
     )
 
diff --git a/compiler/GHC/Rename/Env.hs b/compiler/GHC/Rename/Env.hs
index beaac9c857b5..99dc8c4ee73f 100644
--- a/compiler/GHC/Rename/Env.hs
+++ b/compiler/GHC/Rename/Env.hs
@@ -987,20 +987,20 @@ we'll miss the fact that the qualified import is redundant.
 -}
 
 
-lookupLocatedOccRn :: GenLocated (SrcSpanAnn' ann) RdrName
-                   -> TcRn (GenLocated (SrcSpanAnn' ann) Name)
+lookupLocatedOccRn :: GenLocated (EpAnn ann) RdrName
+                   -> TcRn (GenLocated (EpAnn ann) Name)
 lookupLocatedOccRn = wrapLocMA lookupOccRn
 
-lookupLocatedOccRnConstr :: GenLocated (SrcSpanAnn' ann) RdrName
-                         -> TcRn (GenLocated (SrcSpanAnn' ann) Name)
+lookupLocatedOccRnConstr :: GenLocated (EpAnn ann) RdrName
+                         -> TcRn (GenLocated (EpAnn ann) Name)
 lookupLocatedOccRnConstr = wrapLocMA lookupOccRnConstr
 
-lookupLocatedOccRnRecField :: GenLocated (SrcSpanAnn' ann) RdrName
-                           -> TcRn (GenLocated (SrcSpanAnn' ann) Name)
+lookupLocatedOccRnRecField :: GenLocated (EpAnn ann) RdrName
+                           -> TcRn (GenLocated (EpAnn ann) Name)
 lookupLocatedOccRnRecField = wrapLocMA lookupOccRnRecField
 
-lookupLocatedOccRnNone :: GenLocated (SrcSpanAnn' ann) RdrName
-                       -> TcRn (GenLocated (SrcSpanAnn' ann) Name)
+lookupLocatedOccRnNone :: GenLocated (EpAnn ann) RdrName
+                       -> TcRn (GenLocated (EpAnn ann) Name)
 lookupLocatedOccRnNone = wrapLocMA lookupOccRnNone
 
 lookupLocalOccRn_maybe :: RdrName -> RnM (Maybe Name)
@@ -2063,8 +2063,8 @@ lookupSigOccRnN ctxt sig = lookupSigCtxtOccRn ctxt (hsSigDoc sig)
 lookupSigCtxtOccRn :: HsSigCtxt
                    -> SDoc         -- ^ description of thing we're looking up,
                                    -- like "type family"
-                   -> GenLocated (SrcSpanAnn' ann) RdrName
-                   -> RnM (GenLocated (SrcSpanAnn' ann) Name)
+                   -> GenLocated (EpAnn ann) RdrName
+                   -> RnM (GenLocated (EpAnn ann) Name)
 lookupSigCtxtOccRn ctxt what
   = wrapLocMA $ \ rdr_name ->
     do { let also_try_tycons = False
diff --git a/compiler/GHC/Rename/Names.hs b/compiler/GHC/Rename/Names.hs
index ad5e6f4e9a9a..1b123287a1a7 100644
--- a/compiler/GHC/Rename/Names.hs
+++ b/compiler/GHC/Rename/Names.hs
@@ -2133,13 +2133,13 @@ printMinimalImports hsc_src imports_w_usage
 
 to_ie_post_rn_var :: LocatedA (IdP GhcRn) -> LIEWrappedName GhcRn
 to_ie_post_rn_var (L l n)
-  | isDataOcc $ occName n = L l (IEPattern (la2e l)   (L (l2l l) n))
+  | isDataOcc $ occName n = L l (IEPattern (entry l)   (L (l2l l) n))
   | otherwise             = L l (IEName    noExtField (L (l2l l) n))
 
 
 to_ie_post_rn :: LocatedA (IdP GhcRn) -> LIEWrappedName GhcRn
 to_ie_post_rn (L l n)
-  | isTcOcc occ && isSymOcc occ = L l (IEType (la2e l)   (L (l2l l) n))
+  | isTcOcc occ && isSymOcc occ = L l (IEType (entry l)   (L (l2l l) n))
   | otherwise                   = L l (IEName noExtField (L (l2l l) n))
   where occ = occName n
 
diff --git a/compiler/GHC/Tc/Errors/Ppr.hs b/compiler/GHC/Tc/Errors/Ppr.hs
index 1fd5c45aed47..a27cc513cd3e 100644
--- a/compiler/GHC/Tc/Errors/Ppr.hs
+++ b/compiler/GHC/Tc/Errors/Ppr.hs
@@ -355,7 +355,7 @@ instance Diagnostic TcRnMessage where
                2 (vcat $ map pprLBind . bagToList $ binds)
           where
             pprLoc loc = parens (text "defined at" <+> ppr loc)
-            pprLBind :: CollectPass GhcRn => GenLocated (SrcSpanAnn' a) (HsBindLR GhcRn idR) -> SDoc
+            pprLBind :: CollectPass GhcRn => GenLocated (EpAnn a) (HsBindLR GhcRn idR) -> SDoc
             pprLBind (L loc bind) = pprWithCommas ppr (collectHsBindBinders CollNoDictBinders bind)
                                         <+> pprLoc (locA loc)
     TcRnPartialTypeSigTyVarMismatch n1 n2 fn_name hs_ty
diff --git a/compiler/GHC/Tc/Gen/Head.hs b/compiler/GHC/Tc/Gen/Head.hs
index f771a0b84db5..99645fcec1bf 100644
--- a/compiler/GHC/Tc/Gen/Head.hs
+++ b/compiler/GHC/Tc/Gen/Head.hs
@@ -341,11 +341,11 @@ splitHsApps e = go e (top_ctxt 0 e) []
 
     go e ctxt args = pure ((e,ctxt), args)
 
-    set :: SrcAnn ann -> AppCtxt -> AppCtxt
+    set :: EpAnn ann -> AppCtxt -> AppCtxt
     set l (VACall f n _)        = VACall f n (locA l)
     set l (VAExpansion orig ol _) = VAExpansion orig ol (locA l)
 
-    dec :: SrcAnn ann -> AppCtxt -> AppCtxt
+    dec :: EpAnn ann -> AppCtxt -> AppCtxt
     dec l (VACall f n _)        = VACall f (n-1) (locA l)
     dec l (VAExpansion orig ol _) = VAExpansion orig ol (locA l)
 
diff --git a/compiler/GHC/Tc/Gen/Match.hs b/compiler/GHC/Tc/Gen/Match.hs
index 9a466618b146..7c433f556043 100644
--- a/compiler/GHC/Tc/Gen/Match.hs
+++ b/compiler/GHC/Tc/Gen/Match.hs
@@ -203,8 +203,8 @@ type AnnoBody body
     , Anno (Match GhcTc (LocatedA (body GhcTc))) ~ SrcSpanAnnA
     , Anno [LocatedA (Match GhcRn (LocatedA (body GhcRn)))] ~ SrcSpanAnnL
     , Anno [LocatedA (Match GhcTc (LocatedA (body GhcTc)))] ~ SrcSpanAnnL
-    , Anno (GRHS GhcRn (LocatedA (body GhcRn))) ~ SrcAnn NoEpAnns
-    , Anno (GRHS GhcTc (LocatedA (body GhcTc))) ~ SrcAnn NoEpAnns
+    , Anno (GRHS GhcRn (LocatedA (body GhcRn))) ~ EpAnn NoEpAnns
+    , Anno (GRHS GhcTc (LocatedA (body GhcTc))) ~ EpAnn NoEpAnns
     , Anno (StmtLR GhcRn GhcRn (LocatedA (body GhcRn))) ~ SrcSpanAnnA
     , Anno (StmtLR GhcTc GhcTc (LocatedA (body GhcTc))) ~ SrcSpanAnnA
     )
diff --git a/compiler/GHC/Tc/Utils/Monad.hs b/compiler/GHC/Tc/Utils/Monad.hs
index a9bcbbe8edb2..b03f64e7f722 100644
--- a/compiler/GHC/Tc/Utils/Monad.hs
+++ b/compiler/GHC/Tc/Utils/Monad.hs
@@ -992,13 +992,13 @@ setInGeneratedCode :: TcRn a -> TcRn a
 setInGeneratedCode thing_inside =
   updLclCtxt (\env -> env { tcl_in_gen_code = True }) thing_inside
 
-setSrcSpanA :: SrcSpanAnn' ann -> TcRn a -> TcRn a
+setSrcSpanA :: EpAnn ann -> TcRn a -> TcRn a
 setSrcSpanA l = setSrcSpan (locA l)
 
 addLocM :: (a -> TcM b) -> Located a -> TcM b
 addLocM fn (L loc a) = setSrcSpan loc $ fn a
 
-addLocMA :: (a -> TcM b) -> GenLocated (SrcSpanAnn' ann) a -> TcM b
+addLocMA :: (a -> TcM b) -> GenLocated (EpAnn ann) a -> TcM b
 addLocMA fn (L loc a) = setSrcSpanA loc $ fn a
 
 wrapLocM :: (a -> TcM b) -> Located a -> TcM (Located b)
@@ -1008,7 +1008,7 @@ wrapLocM fn (L loc a) = setSrcSpan loc $ do { b <- fn a
 wrapLocAM :: (a -> TcM b) -> LocatedAn an a -> TcM (Located b)
 wrapLocAM fn a = wrapLocM fn (reLoc a)
 
-wrapLocMA :: (a -> TcM b) -> GenLocated (SrcSpanAnn' ann) a -> TcRn (GenLocated (SrcSpanAnn' ann) b)
+wrapLocMA :: (a -> TcM b) -> GenLocated (EpAnn ann) a -> TcRn (GenLocated (EpAnn ann) b)
 wrapLocMA fn (L loc a) = setSrcSpanA loc $ do { b <- fn a
                                               ; return (L loc b) }
 
@@ -1023,7 +1023,7 @@ wrapLocFstM fn (L loc a) =
 --    wrapLocFstMA :: (a -> TcM (b,c)) -> LocatedN    a -> TcM (LocatedN    b, c)
 --    wrapLocFstMA :: (a -> TcM (b,c)) -> LocatedAn t a -> TcM (LocatedAn t b, c)
 -- and so on.
-wrapLocFstMA :: (a -> TcM (b,c)) -> GenLocated (SrcSpanAnn' ann) a -> TcM (GenLocated (SrcSpanAnn' ann) b, c)
+wrapLocFstMA :: (a -> TcM (b,c)) -> GenLocated (EpAnn ann) a -> TcM (GenLocated (EpAnn ann) b, c)
 wrapLocFstMA fn (L loc a) =
   setSrcSpanA loc $ do
     (b,c) <- fn a
@@ -1040,7 +1040,7 @@ wrapLocSndM fn (L loc a) =
 --    wrapLocSndMA :: (a -> TcM (b, c)) -> LocatedN    a -> TcM (b, LocatedN    c)
 --    wrapLocSndMA :: (a -> TcM (b, c)) -> LocatedAn t a -> TcM (b, LocatedAn t c)
 -- and so on.
-wrapLocSndMA :: (a -> TcM (b, c)) -> GenLocated (SrcSpanAnn' ann) a -> TcM (b, GenLocated (SrcSpanAnn' ann) c)
+wrapLocSndMA :: (a -> TcM (b, c)) -> GenLocated (EpAnn ann) a -> TcM (b, GenLocated (EpAnn ann) c)
 wrapLocSndMA fn (L loc a) =
   setSrcSpanA loc $ do
     (b,c) <- fn a
diff --git a/compiler/GHC/Tc/Zonk/Type.hs b/compiler/GHC/Tc/Zonk/Type.hs
index 36d9b5a2fd5a..74bda6e14788 100644
--- a/compiler/GHC/Tc/Zonk/Type.hs
+++ b/compiler/GHC/Tc/Zonk/Type.hs
@@ -329,15 +329,15 @@ type ZonkTcM = ZonkT TcM
 -- See Note [Zonking to Type].
 type ZonkBndrTcM = ZonkBndrT TcM
 
-wrapLocZonkMA :: (a -> ZonkTcM b) -> GenLocated (SrcSpanAnn' ann) a
-              -> ZonkTcM (GenLocated (SrcSpanAnn' ann) b)
+wrapLocZonkMA :: (a -> ZonkTcM b) -> GenLocated (EpAnn ann) a
+              -> ZonkTcM (GenLocated (EpAnn ann) b)
 wrapLocZonkMA fn (L loc a) = ZonkT $ \ ze ->
   setSrcSpanA loc $
   do { b <- runZonkT (fn a) ze
      ; return (L loc b) }
 
-wrapLocZonkBndrMA :: (a -> ZonkBndrTcM b) -> GenLocated (SrcSpanAnn' ann) a
-                  -> ZonkBndrTcM (GenLocated (SrcSpanAnn' ann) b)
+wrapLocZonkBndrMA :: (a -> ZonkBndrTcM b) -> GenLocated (EpAnn ann) a
+                  -> ZonkBndrTcM (GenLocated (EpAnn ann) b)
 wrapLocZonkBndrMA fn (L loc a) = ZonkBndrT $ \ k -> ZonkT $ \ ze ->
   setSrcSpanA loc $
   runZonkT ( runZonkBndrT (fn a) $ \ b -> k (L loc b) ) ze
@@ -850,7 +850,7 @@ zonkLTcSpecPrags ps
 ************************************************************************
 -}
 
-zonkMatchGroup :: Anno (GRHS GhcTc (LocatedA (body GhcTc))) ~ SrcAnn NoEpAnns
+zonkMatchGroup :: Anno (GRHS GhcTc (LocatedA (body GhcTc))) ~ EpAnn NoEpAnns
                => (LocatedA (body GhcTc) -> ZonkTcM (LocatedA (body GhcTc)))
                -> MatchGroup GhcTc (LocatedA (body GhcTc))
                -> ZonkTcM (MatchGroup GhcTc (LocatedA (body GhcTc)))
@@ -864,7 +864,7 @@ zonkMatchGroup zBody (MG { mg_alts = L l ms
                      , mg_ext = MatchGroupTc arg_tys' res_ty' origin
                      }) }
 
-zonkMatch :: Anno (GRHS GhcTc (LocatedA (body GhcTc))) ~ SrcAnn NoEpAnns
+zonkMatch :: Anno (GRHS GhcTc (LocatedA (body GhcTc))) ~ EpAnn NoEpAnns
           => (LocatedA (body GhcTc) -> ZonkTcM (LocatedA (body GhcTc)))
           -> LMatch GhcTc (LocatedA (body GhcTc))
           -> ZonkTcM (LMatch GhcTc (LocatedA (body GhcTc)))
@@ -875,7 +875,7 @@ zonkMatch zBody (L loc match@(Match { m_pats = pats
       ; return (L loc (match { m_pats = new_pats, m_grhss = new_grhss })) }
 
 -------------------------------------------------------------------------
-zonkGRHSs :: Anno (GRHS GhcTc (LocatedA (body GhcTc))) ~ SrcAnn NoEpAnns
+zonkGRHSs :: Anno (GRHS GhcTc (LocatedA (body GhcTc))) ~ EpAnn NoEpAnns
           => (LocatedA (body GhcTc) -> ZonkTcM (LocatedA (body GhcTc)))
           -> GRHSs GhcTc (LocatedA (body GhcTc))
           -> ZonkTcM (GRHSs GhcTc (LocatedA (body GhcTc)))
diff --git a/testsuite/tests/ghc-api/exactprint/T22919.stderr b/testsuite/tests/ghc-api/exactprint/T22919.stderr
index 464b8576a62d..3c9dbaaca850 100644
--- a/testsuite/tests/ghc-api/exactprint/T22919.stderr
+++ b/testsuite/tests/ghc-api/exactprint/T22919.stderr
@@ -29,55 +29,55 @@
    (Nothing))
   (Just
    (L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T22919.hs:1:8-13 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T22919.hs:1:8-13 })
+    (EpAnn
+     (EpaSpan { T22919.hs:1:8-13 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     {ModuleName: T22919}))
   (Nothing)
   []
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T22919.hs:2:1-9 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T22919.hs:2:1-9 })
+    (EpAnn
+     (EpaSpan { T22919.hs:2:1-9 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T22919.hs:2:1-3 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T22919.hs:2:1-3 })
+       (EpAnn
+        (EpaSpan { T22919.hs:2:1-3 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: foo}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T22919.hs:2:1-9 })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { T22919.hs:2:1-9 })
+        (EpAnn
+         (EpaSpan { T22919.hs:2:1-9 })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T22919.hs:2:1-9 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T22919.hs:2:1-9 })
+          (EpAnn
+           (EpaSpan { T22919.hs:2:1-9 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { T22919.hs:2:1-9 })
@@ -86,12 +86,12 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { T22919.hs:2:1-3 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { T22919.hs:2:1-3 })
+             (EpAnn
+              (EpaSpan { T22919.hs:2:1-3 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: foo}))
             (Prefix)
@@ -101,13 +101,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { T22919.hs:2:5-9 })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { T22919.hs:2:5-9 })
+              (EpAnn
+               (EpaSpan { T22919.hs:2:5-9 })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { T22919.hs:2:5-9 })
@@ -118,12 +116,12 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T22919.hs:2:7-9 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { T22919.hs:2:7-9 })
+                (EpAnn
+                 (EpaSpan { T22919.hs:2:7-9 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsLit
                  (EpAnn
                   (EpaSpan { T22919.hs:2:7-9 })
@@ -135,3 +133,5 @@
                   ('s'))))))]
             (EmptyLocalBinds
              (NoExtField)))))])))))]))
+
+
diff --git a/testsuite/tests/ghc-api/exactprint/Test20239.stderr b/testsuite/tests/ghc-api/exactprint/Test20239.stderr
index 25d4e32658f0..909a51637ac6 100644
--- a/testsuite/tests/ghc-api/exactprint/Test20239.stderr
+++ b/testsuite/tests/ghc-api/exactprint/Test20239.stderr
@@ -29,33 +29,33 @@
    (Nothing))
   (Just
    (L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { Test20239.hs:1:8-16 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { Test20239.hs:1:8-16 })
+    (EpAnn
+     (EpaSpan { Test20239.hs:1:8-16 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     {ModuleName: Test20239}))
   (Nothing)
   []
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { Test20239.hs:(5,1)-(7,86) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [(L
-                    (EpaSpan { Test20239.hs:3:1-28 })
-                    (EpaComment
-                     (EpaLineComment
-                      "-- | Leading Haddock Comment")
-                     { Test20239.hs:1:18-22 }))
-                  ,(L
-                    (EpaSpan { Test20239.hs:4:1-25 })
-                    (EpaComment
-                     (EpaLineComment
-                      "-- Running over two lines")
-                     { Test20239.hs:3:1-28 }))])) { Test20239.hs:(5,1)-(7,86) })
+    (EpAnn
+     (EpaSpan { Test20239.hs:(5,1)-(7,86) })
+     (AnnListItem
+      [])
+     (EpaComments
+      [(L
+        (EpaSpan { Test20239.hs:3:1-28 })
+        (EpaComment
+         (EpaLineComment
+          "-- | Leading Haddock Comment")
+         { Test20239.hs:1:18-22 }))
+      ,(L
+        (EpaSpan { Test20239.hs:4:1-25 })
+        (EpaComment
+         (EpaLineComment
+          "-- Running over two lines")
+         { Test20239.hs:3:1-28 }))]))
     (InstD
      (NoExtField)
      (DataFamInstD
@@ -75,24 +75,24 @@
               "-- ^ Run a query against the database")
              { Test20239.hs:5:51-55 }))]))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { Test20239.hs:5:15-20 })
-                      (NameAnnTrailing
-                       [])
-                      (EpaComments
-                       [])) { Test20239.hs:5:15-20 })
+         (EpAnn
+          (EpaSpan { Test20239.hs:5:15-20 })
+          (NameAnnTrailing
+           [])
+          (EpaComments
+           []))
          (Unqual
           {OccName: Method}))
         (HsOuterImplicit
          (NoExtField))
         [(HsValArg
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { Test20239.hs:5:22-32 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { Test20239.hs:5:22-32 })
+           (EpAnn
+            (EpaSpan { Test20239.hs:5:22-32 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsTyVar
             (EpAnn
              (EpaSpan { Test20239.hs:5:22-32 })
@@ -101,12 +101,12 @@
               []))
             (NotPromoted)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { Test20239.hs:5:22-32 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { Test20239.hs:5:22-32 })
+             (EpAnn
+              (EpaSpan { Test20239.hs:5:22-32 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: PGMigration})))))]
         (Prefix)
@@ -118,13 +118,13 @@
          (DataTypeCons
           (False)
           [(L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { Test20239.hs:5:36-55 })
-                         (AnnListItem
-                          [(AddVbarAnn
-                            (EpaSpan { Test20239.hs:7:34 }))])
-                         (EpaComments
-                          [])) { Test20239.hs:5:36-55 })
+            (EpAnn
+             (EpaSpan { Test20239.hs:5:36-55 })
+             (AnnListItem
+              [(AddVbarAnn
+                (EpaSpan { Test20239.hs:7:34 }))])
+             (EpaComments
+              []))
             (ConDeclH98
              (EpAnn
               (EpaSpan { Test20239.hs:5:36-55 })
@@ -132,12 +132,12 @@
               (EpaComments
                []))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { Test20239.hs:5:36-49 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { Test20239.hs:5:36-49 })
+              (EpAnn
+               (EpaSpan { Test20239.hs:5:36-49 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: MigrationQuery}))
              (False)
@@ -155,12 +155,12 @@
                    (NoTokenLoc)
                    (HsNormalTok))))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { Test20239.hs:5:51-55 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { Test20239.hs:5:51-55 })
+                 (EpAnn
+                  (EpaSpan { Test20239.hs:5:51-55 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsTyVar
                   (EpAnn
                    (EpaSpan { Test20239.hs:5:51-55 })
@@ -169,22 +169,22 @@
                     []))
                   (NotPromoted)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { Test20239.hs:5:51-55 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { Test20239.hs:5:51-55 })
+                   (EpAnn
+                    (EpaSpan { Test20239.hs:5:51-55 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    (Unqual
                     {OccName: Query})))))])
              (Nothing)))
           ,(L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { Test20239.hs:7:36-86 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { Test20239.hs:7:36-86 })
+            (EpAnn
+             (EpaSpan { Test20239.hs:7:36-86 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (ConDeclH98
              (EpAnn
               (EpaSpan { Test20239.hs:7:36-86 })
@@ -192,12 +192,12 @@
               (EpaComments
                []))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { Test20239.hs:7:36-48 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { Test20239.hs:7:36-48 })
+              (EpAnn
+               (EpaSpan { Test20239.hs:7:36-48 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: MigrationCode}))
              (False)
@@ -215,12 +215,12 @@
                    (NoTokenLoc)
                    (HsNormalTok))))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { Test20239.hs:7:50-86 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { Test20239.hs:7:50-86 })
+                 (EpAnn
+                  (EpaSpan { Test20239.hs:7:50-86 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsParTy
                   (EpAnn
                    (EpaSpan { Test20239.hs:7:50-86 })
@@ -231,12 +231,12 @@
                    (EpaComments
                     []))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { Test20239.hs:7:51-85 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { Test20239.hs:7:51-85 })
+                   (EpAnn
+                    (EpaSpan { Test20239.hs:7:51-85 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsFunTy
                     (EpAnn
                      (EpaSpan { Test20239.hs:7:51-85 })
@@ -249,12 +249,12 @@
                        (EpaSpan { Test20239.hs:7:62-63 }))
                       (HsNormalTok)))
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { Test20239.hs:7:51-60 })
-                                  (AnnListItem
-                                   [])
-                                  (EpaComments
-                                   [])) { Test20239.hs:7:51-60 })
+                     (EpAnn
+                      (EpaSpan { Test20239.hs:7:51-60 })
+                      (AnnListItem
+                       [])
+                      (EpaComments
+                       []))
                      (HsTyVar
                       (EpAnn
                        (EpaSpan { Test20239.hs:7:51-60 })
@@ -263,30 +263,30 @@
                         []))
                       (NotPromoted)
                       (L
-                       (SrcSpanAnn (EpAnn
-                                    (EpaSpan { Test20239.hs:7:51-60 })
-                                    (NameAnnTrailing
-                                     [])
-                                    (EpaComments
-                                     [])) { Test20239.hs:7:51-60 })
+                       (EpAnn
+                        (EpaSpan { Test20239.hs:7:51-60 })
+                        (NameAnnTrailing
+                         [])
+                        (EpaComments
+                         []))
                        (Unqual
                         {OccName: Connection}))))
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { Test20239.hs:7:65-85 })
-                                  (AnnListItem
-                                   [])
-                                  (EpaComments
-                                   [])) { Test20239.hs:7:65-85 })
+                     (EpAnn
+                      (EpaSpan { Test20239.hs:7:65-85 })
+                      (AnnListItem
+                       [])
+                      (EpaComments
+                       []))
                      (HsAppTy
                       (NoExtField)
                       (L
-                       (SrcSpanAnn (EpAnn
-                                    (EpaSpan { Test20239.hs:7:65-66 })
-                                    (AnnListItem
-                                     [])
-                                    (EpaComments
-                                     [])) { Test20239.hs:7:65-66 })
+                       (EpAnn
+                        (EpaSpan { Test20239.hs:7:65-66 })
+                        (AnnListItem
+                         [])
+                        (EpaComments
+                         []))
                        (HsTyVar
                         (EpAnn
                          (EpaSpan { Test20239.hs:7:65-66 })
@@ -295,21 +295,21 @@
                           []))
                         (NotPromoted)
                         (L
-                         (SrcSpanAnn (EpAnn
-                                      (EpaSpan { Test20239.hs:7:65-66 })
-                                      (NameAnnTrailing
-                                       [])
-                                      (EpaComments
-                                       [])) { Test20239.hs:7:65-66 })
+                         (EpAnn
+                          (EpaSpan { Test20239.hs:7:65-66 })
+                          (NameAnnTrailing
+                           [])
+                          (EpaComments
+                           []))
                          (Unqual
                           {OccName: IO}))))
                       (L
-                       (SrcSpanAnn (EpAnn
-                                    (EpaSpan { Test20239.hs:7:68-85 })
-                                    (AnnListItem
-                                     [])
-                                    (EpaComments
-                                     [])) { Test20239.hs:7:68-85 })
+                       (EpAnn
+                        (EpaSpan { Test20239.hs:7:68-85 })
+                        (AnnListItem
+                         [])
+                        (EpaComments
+                         []))
                        (HsParTy
                         (EpAnn
                          (EpaSpan { Test20239.hs:7:68-85 })
@@ -320,30 +320,30 @@
                          (EpaComments
                           []))
                         (L
-                         (SrcSpanAnn (EpAnn
-                                      (EpaSpan { Test20239.hs:7:69-84 })
-                                      (AnnListItem
-                                       [])
-                                      (EpaComments
-                                       [])) { Test20239.hs:7:69-84 })
+                         (EpAnn
+                          (EpaSpan { Test20239.hs:7:69-84 })
+                          (AnnListItem
+                           [])
+                          (EpaComments
+                           []))
                          (HsAppTy
                           (NoExtField)
                           (L
-                           (SrcSpanAnn (EpAnn
-                                        (EpaSpan { Test20239.hs:7:69-81 })
-                                        (AnnListItem
-                                         [])
-                                        (EpaComments
-                                         [])) { Test20239.hs:7:69-81 })
+                           (EpAnn
+                            (EpaSpan { Test20239.hs:7:69-81 })
+                            (AnnListItem
+                             [])
+                            (EpaComments
+                             []))
                            (HsAppTy
                             (NoExtField)
                             (L
-                             (SrcSpanAnn (EpAnn
-                                          (EpaSpan { Test20239.hs:7:69-74 })
-                                          (AnnListItem
-                                           [])
-                                          (EpaComments
-                                           [])) { Test20239.hs:7:69-74 })
+                             (EpAnn
+                              (EpaSpan { Test20239.hs:7:69-74 })
+                              (AnnListItem
+                               [])
+                              (EpaComments
+                               []))
                              (HsTyVar
                               (EpAnn
                                (EpaSpan { Test20239.hs:7:69-74 })
@@ -352,21 +352,21 @@
                                 []))
                               (NotPromoted)
                               (L
-                               (SrcSpanAnn (EpAnn
-                                            (EpaSpan { Test20239.hs:7:69-74 })
-                                            (NameAnnTrailing
-                                             [])
-                                            (EpaComments
-                                             [])) { Test20239.hs:7:69-74 })
+                               (EpAnn
+                                (EpaSpan { Test20239.hs:7:69-74 })
+                                (NameAnnTrailing
+                                 [])
+                                (EpaComments
+                                 []))
                                (Unqual
                                 {OccName: Either}))))
                             (L
-                             (SrcSpanAnn (EpAnn
-                                          (EpaSpan { Test20239.hs:7:76-81 })
-                                          (AnnListItem
-                                           [])
-                                          (EpaComments
-                                           [])) { Test20239.hs:7:76-81 })
+                             (EpAnn
+                              (EpaSpan { Test20239.hs:7:76-81 })
+                              (AnnListItem
+                               [])
+                              (EpaComments
+                               []))
                              (HsTyVar
                               (EpAnn
                                (EpaSpan { Test20239.hs:7:76-81 })
@@ -375,21 +375,21 @@
                                 []))
                               (NotPromoted)
                               (L
-                               (SrcSpanAnn (EpAnn
-                                            (EpaSpan { Test20239.hs:7:76-81 })
-                                            (NameAnnTrailing
-                                             [])
-                                            (EpaComments
-                                             [])) { Test20239.hs:7:76-81 })
+                               (EpAnn
+                                (EpaSpan { Test20239.hs:7:76-81 })
+                                (NameAnnTrailing
+                                 [])
+                                (EpaComments
+                                 []))
                                (Unqual
                                 {OccName: String}))))))
                           (L
-                           (SrcSpanAnn (EpAnn
-                                        (EpaSpan { Test20239.hs:7:83-84 })
-                                        (AnnListItem
-                                         [])
-                                        (EpaComments
-                                         [])) { Test20239.hs:7:83-84 })
+                           (EpAnn
+                            (EpaSpan { Test20239.hs:7:83-84 })
+                            (AnnListItem
+                             [])
+                            (EpaComments
+                             []))
                            (HsTupleTy
                             (EpAnn
                              (EpaSpan { Test20239.hs:7:83-84 })
diff --git a/testsuite/tests/ghc-api/exactprint/ZeroWidthSemi.stderr b/testsuite/tests/ghc-api/exactprint/ZeroWidthSemi.stderr
index 7764bef02033..b7ef2e2c9659 100644
--- a/testsuite/tests/ghc-api/exactprint/ZeroWidthSemi.stderr
+++ b/testsuite/tests/ghc-api/exactprint/ZeroWidthSemi.stderr
@@ -34,60 +34,60 @@
    (Nothing))
   (Just
    (L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { ZeroWidthSemi.hs:1:8-20 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { ZeroWidthSemi.hs:1:8-20 })
+    (EpAnn
+     (EpaSpan { ZeroWidthSemi.hs:1:8-20 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     {ModuleName: ZeroWidthSemi}))
   (Nothing)
   []
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { ZeroWidthSemi.hs:6:1-5 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [(L
-                    (EpaSpan { ZeroWidthSemi.hs:5:1-19 })
-                    (EpaComment
-                     (EpaLineComment
-                      "-- Function comment")
-                     { ZeroWidthSemi.hs:3:1-19 }))])) { ZeroWidthSemi.hs:6:1-5 })
+    (EpAnn
+     (EpaSpan { ZeroWidthSemi.hs:6:1-5 })
+     (AnnListItem
+      [])
+     (EpaComments
+      [(L
+        (EpaSpan { ZeroWidthSemi.hs:5:1-19 })
+        (EpaComment
+         (EpaLineComment
+          "-- Function comment")
+         { ZeroWidthSemi.hs:3:1-19 }))]))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { ZeroWidthSemi.hs:6:1 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { ZeroWidthSemi.hs:6:1 })
+       (EpAnn
+        (EpaSpan { ZeroWidthSemi.hs:6:1 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: a}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { ZeroWidthSemi.hs:6:1-5 })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { ZeroWidthSemi.hs:6:1-5 })
+        (EpAnn
+         (EpaSpan { ZeroWidthSemi.hs:6:1-5 })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { ZeroWidthSemi.hs:6:1-5 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { ZeroWidthSemi.hs:6:1-5 })
+          (EpAnn
+           (EpaSpan { ZeroWidthSemi.hs:6:1-5 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { ZeroWidthSemi.hs:6:1-5 })
@@ -96,12 +96,12 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { ZeroWidthSemi.hs:6:1 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { ZeroWidthSemi.hs:6:1 })
+             (EpAnn
+              (EpaSpan { ZeroWidthSemi.hs:6:1 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: a}))
             (Prefix)
@@ -111,13 +111,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { ZeroWidthSemi.hs:6:3-5 })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { ZeroWidthSemi.hs:6:3-5 })
+              (EpAnn
+               (EpaSpan { ZeroWidthSemi.hs:6:3-5 })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { ZeroWidthSemi.hs:6:3-5 })
@@ -128,12 +126,12 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { ZeroWidthSemi.hs:6:5 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { ZeroWidthSemi.hs:6:5 })
+                (EpAnn
+                 (EpaSpan { ZeroWidthSemi.hs:6:5 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsOverLit
                  (EpAnn
                   (EpaSpan { ZeroWidthSemi.hs:6:5 })
@@ -149,3 +147,5 @@
                     (0))))))))]
             (EmptyLocalBinds
              (NoExtField)))))])))))]))
+
+
diff --git a/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
index adc67ea6aadf..6cdc3ebec860 100644
--- a/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
@@ -24,22 +24,22 @@
    (Nothing))
   (Just
    (L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544.hs:3:8-13 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544.hs:3:8-13 })
+    (EpAnn
+     (EpaSpan { T17544.hs:3:8-13 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     {ModuleName: T17544}))
   (Nothing)
   []
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544.hs:(5,1)-(6,16) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544.hs:(5,1)-(6,16) })
+    (EpAnn
+     (EpaSpan { T17544.hs:(5,1)-(6,16) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (ClassDecl
@@ -55,23 +55,23 @@
        (3))
       (Nothing)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T17544.hs:5:7-8 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T17544.hs:5:7-8 })
+       (EpAnn
+        (EpaSpan { T17544.hs:5:7-8 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: C1}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T17544.hs:5:10 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T17544.hs:5:10 })
+         (EpAnn
+          (EpaSpan { T17544.hs:5:10 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (UserTyVar
           (EpAnn
            (EpaSpan { T17544.hs:5:10 })
@@ -80,23 +80,23 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T17544.hs:5:10 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T17544.hs:5:10 })
+           (EpAnn
+            (EpaSpan { T17544.hs:5:10 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: a}))))])
       (Prefix)
       []
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T17544.hs:6:3-16 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T17544.hs:6:3-16 })
+        (EpAnn
+         (EpaSpan { T17544.hs:6:3-16 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (ClassOpSig
          (EpAnn
           (EpaSpan { T17544.hs:6:3-16 })
@@ -107,32 +107,32 @@
            []))
          (False)
          [(L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T17544.hs:6:3-4 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T17544.hs:6:3-4 })
+           (EpAnn
+            (EpaSpan { T17544.hs:6:3-4 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: f1}))]
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T17544.hs:6:9-16 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T17544.hs:6:9-16 })
+          (EpAnn
+           (EpaSpan { T17544.hs:6:9-16 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsSig
            (NoExtField)
            (HsOuterImplicit
             (NoExtField))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:6:9-16 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:6:9-16 })
+            (EpAnn
+             (EpaSpan { T17544.hs:6:9-16 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsFunTy
              (EpAnn
               (EpaSpan { T17544.hs:6:9-16 })
@@ -145,12 +145,12 @@
                 (EpaSpan { T17544.hs:6:11-12 }))
                (HsNormalTok)))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:6:9 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:6:9 })
+              (EpAnn
+               (EpaSpan { T17544.hs:6:9 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { T17544.hs:6:9 })
@@ -159,21 +159,21 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T17544.hs:6:9 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { T17544.hs:6:9 })
+                (EpAnn
+                 (EpaSpan { T17544.hs:6:9 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: a}))))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:6:14-16 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:6:14-16 })
+              (EpAnn
+               (EpaSpan { T17544.hs:6:14-16 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsDocTy
                (EpAnn
                 (EpaDelta (SameLine 0) [])
@@ -181,12 +181,12 @@
                 (EpaComments
                  []))
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T17544.hs:6:14-16 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { T17544.hs:6:14-16 })
+                (EpAnn
+                 (EpaSpan { T17544.hs:6:14-16 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsTyVar
                  (EpAnn
                   (EpaSpan { T17544.hs:6:14-16 })
@@ -195,12 +195,12 @@
                    []))
                  (NotPromoted)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { T17544.hs:6:14-16 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { T17544.hs:6:14-16 })
+                  (EpAnn
+                   (EpaSpan { T17544.hs:6:14-16 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: Int}))))
                (L
@@ -221,12 +221,12 @@
       []
       [])))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544.hs:(9,1)-(10,16) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544.hs:(9,1)-(10,16) })
+    (EpAnn
+     (EpaSpan { T17544.hs:(9,1)-(10,16) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (ClassDecl
@@ -242,23 +242,23 @@
        (3))
       (Nothing)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T17544.hs:9:7-8 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T17544.hs:9:7-8 })
+       (EpAnn
+        (EpaSpan { T17544.hs:9:7-8 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: C2}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T17544.hs:9:10 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T17544.hs:9:10 })
+         (EpAnn
+          (EpaSpan { T17544.hs:9:10 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (UserTyVar
           (EpAnn
            (EpaSpan { T17544.hs:9:10 })
@@ -267,23 +267,23 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T17544.hs:9:10 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T17544.hs:9:10 })
+           (EpAnn
+            (EpaSpan { T17544.hs:9:10 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: a}))))])
       (Prefix)
       []
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T17544.hs:10:3-16 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T17544.hs:10:3-16 })
+        (EpAnn
+         (EpaSpan { T17544.hs:10:3-16 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (ClassOpSig
          (EpAnn
           (EpaSpan { T17544.hs:10:3-16 })
@@ -294,32 +294,32 @@
            []))
          (False)
          [(L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T17544.hs:10:3-4 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T17544.hs:10:3-4 })
+           (EpAnn
+            (EpaSpan { T17544.hs:10:3-4 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: f2}))]
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T17544.hs:10:9-16 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T17544.hs:10:9-16 })
+          (EpAnn
+           (EpaSpan { T17544.hs:10:9-16 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsSig
            (NoExtField)
            (HsOuterImplicit
             (NoExtField))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:10:9-16 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:10:9-16 })
+            (EpAnn
+             (EpaSpan { T17544.hs:10:9-16 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsFunTy
              (EpAnn
               (EpaSpan { T17544.hs:10:9-16 })
@@ -332,12 +332,12 @@
                 (EpaSpan { T17544.hs:10:11-12 }))
                (HsNormalTok)))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:10:9 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:10:9 })
+              (EpAnn
+               (EpaSpan { T17544.hs:10:9 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { T17544.hs:10:9 })
@@ -346,21 +346,21 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T17544.hs:10:9 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { T17544.hs:10:9 })
+                (EpAnn
+                 (EpaSpan { T17544.hs:10:9 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: a}))))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:10:14-16 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:10:14-16 })
+              (EpAnn
+               (EpaSpan { T17544.hs:10:14-16 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { T17544.hs:10:14-16 })
@@ -369,12 +369,12 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T17544.hs:10:14-16 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { T17544.hs:10:14-16 })
+                (EpAnn
+                 (EpaSpan { T17544.hs:10:14-16 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: Int}))))))))))]
       {Bag(LocatedA (HsBind GhcPs)):
@@ -382,12 +382,12 @@
       []
       []
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T17544.hs:11:3-20 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T17544.hs:11:3-20 })
+        (EpAnn
+         (EpaSpan { T17544.hs:11:3-20 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (DocCommentPrev
          (L
           { T17544.hs:11:3-20 }
@@ -402,12 +402,12 @@
              []))
            []))))])))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544.hs:(13,1)-(14,16) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544.hs:(13,1)-(14,16) })
+    (EpAnn
+     (EpaSpan { T17544.hs:(13,1)-(14,16) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (ClassDecl
@@ -423,23 +423,23 @@
        (3))
       (Nothing)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T17544.hs:13:7-8 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T17544.hs:13:7-8 })
+       (EpAnn
+        (EpaSpan { T17544.hs:13:7-8 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: C3}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T17544.hs:13:10 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T17544.hs:13:10 })
+         (EpAnn
+          (EpaSpan { T17544.hs:13:10 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (UserTyVar
           (EpAnn
            (EpaSpan { T17544.hs:13:10 })
@@ -448,23 +448,23 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T17544.hs:13:10 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T17544.hs:13:10 })
+           (EpAnn
+            (EpaSpan { T17544.hs:13:10 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: a}))))])
       (Prefix)
       []
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T17544.hs:14:3-16 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T17544.hs:14:3-16 })
+        (EpAnn
+         (EpaSpan { T17544.hs:14:3-16 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (ClassOpSig
          (EpAnn
           (EpaSpan { T17544.hs:14:3-16 })
@@ -475,32 +475,32 @@
            []))
          (False)
          [(L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T17544.hs:14:3-4 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T17544.hs:14:3-4 })
+           (EpAnn
+            (EpaSpan { T17544.hs:14:3-4 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: f3}))]
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T17544.hs:14:9-16 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T17544.hs:14:9-16 })
+          (EpAnn
+           (EpaSpan { T17544.hs:14:9-16 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsSig
            (NoExtField)
            (HsOuterImplicit
             (NoExtField))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:14:9-16 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:14:9-16 })
+            (EpAnn
+             (EpaSpan { T17544.hs:14:9-16 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsFunTy
              (EpAnn
               (EpaSpan { T17544.hs:14:9-16 })
@@ -513,12 +513,12 @@
                 (EpaSpan { T17544.hs:14:11-12 }))
                (HsNormalTok)))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:14:9 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:14:9 })
+              (EpAnn
+               (EpaSpan { T17544.hs:14:9 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { T17544.hs:14:9 })
@@ -527,21 +527,21 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T17544.hs:14:9 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { T17544.hs:14:9 })
+                (EpAnn
+                 (EpaSpan { T17544.hs:14:9 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: a}))))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:14:14-16 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:14:14-16 })
+              (EpAnn
+               (EpaSpan { T17544.hs:14:14-16 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { T17544.hs:14:14-16 })
@@ -550,12 +550,12 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T17544.hs:14:14-16 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { T17544.hs:14:14-16 })
+                (EpAnn
+                 (EpaSpan { T17544.hs:14:14-16 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: Int}))))))))))]
       {Bag(LocatedA (HsBind GhcPs)):
@@ -564,12 +564,12 @@
       []
       [])))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544.hs:15:1-18 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544.hs:15:1-18 })
+    (EpAnn
+     (EpaSpan { T17544.hs:15:1-18 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (DocD
      (NoExtField)
      (DocCommentPrev
@@ -586,12 +586,12 @@
           []))
         [])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544.hs:(17,1)-(20,16) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544.hs:(17,1)-(20,16) })
+    (EpAnn
+     (EpaSpan { T17544.hs:(17,1)-(20,16) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (ClassDecl
@@ -607,23 +607,23 @@
        (3))
       (Nothing)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T17544.hs:17:7-8 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T17544.hs:17:7-8 })
+       (EpAnn
+        (EpaSpan { T17544.hs:17:7-8 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: C4}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T17544.hs:17:10 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T17544.hs:17:10 })
+         (EpAnn
+          (EpaSpan { T17544.hs:17:10 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (UserTyVar
           (EpAnn
            (EpaSpan { T17544.hs:17:10 })
@@ -632,23 +632,23 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T17544.hs:17:10 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T17544.hs:17:10 })
+           (EpAnn
+            (EpaSpan { T17544.hs:17:10 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: a}))))])
       (Prefix)
       []
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T17544.hs:18:3-16 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T17544.hs:18:3-16 })
+        (EpAnn
+         (EpaSpan { T17544.hs:18:3-16 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (ClassOpSig
          (EpAnn
           (EpaSpan { T17544.hs:18:3-16 })
@@ -659,32 +659,32 @@
            []))
          (False)
          [(L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T17544.hs:18:3-4 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T17544.hs:18:3-4 })
+           (EpAnn
+            (EpaSpan { T17544.hs:18:3-4 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: f4}))]
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T17544.hs:18:9-16 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T17544.hs:18:9-16 })
+          (EpAnn
+           (EpaSpan { T17544.hs:18:9-16 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsSig
            (NoExtField)
            (HsOuterImplicit
             (NoExtField))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:18:9-16 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:18:9-16 })
+            (EpAnn
+             (EpaSpan { T17544.hs:18:9-16 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsFunTy
              (EpAnn
               (EpaSpan { T17544.hs:18:9-16 })
@@ -697,12 +697,12 @@
                 (EpaSpan { T17544.hs:18:11-12 }))
                (HsNormalTok)))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:18:9 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:18:9 })
+              (EpAnn
+               (EpaSpan { T17544.hs:18:9 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { T17544.hs:18:9 })
@@ -711,21 +711,21 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T17544.hs:18:9 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { T17544.hs:18:9 })
+                (EpAnn
+                 (EpaSpan { T17544.hs:18:9 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: a}))))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:18:14-16 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:18:14-16 })
+              (EpAnn
+               (EpaSpan { T17544.hs:18:14-16 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { T17544.hs:18:14-16 })
@@ -734,21 +734,21 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T17544.hs:18:14-16 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { T17544.hs:18:14-16 })
+                (EpAnn
+                 (EpaSpan { T17544.hs:18:14-16 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: Int}))))))))))
       ,(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T17544.hs:20:3-16 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T17544.hs:20:3-16 })
+        (EpAnn
+         (EpaSpan { T17544.hs:20:3-16 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (ClassOpSig
          (EpAnn
           (EpaSpan { T17544.hs:20:3-16 })
@@ -759,32 +759,32 @@
            []))
          (False)
          [(L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T17544.hs:20:3-4 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T17544.hs:20:3-4 })
+           (EpAnn
+            (EpaSpan { T17544.hs:20:3-4 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: g4}))]
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T17544.hs:20:9-16 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T17544.hs:20:9-16 })
+          (EpAnn
+           (EpaSpan { T17544.hs:20:9-16 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsSig
            (NoExtField)
            (HsOuterImplicit
             (NoExtField))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:20:9-16 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:20:9-16 })
+            (EpAnn
+             (EpaSpan { T17544.hs:20:9-16 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsFunTy
              (EpAnn
               (EpaSpan { T17544.hs:20:9-16 })
@@ -797,12 +797,12 @@
                 (EpaSpan { T17544.hs:20:11-12 }))
                (HsNormalTok)))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:20:9 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:20:9 })
+              (EpAnn
+               (EpaSpan { T17544.hs:20:9 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { T17544.hs:20:9 })
@@ -811,21 +811,21 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T17544.hs:20:9 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { T17544.hs:20:9 })
+                (EpAnn
+                 (EpaSpan { T17544.hs:20:9 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: a}))))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:20:14-16 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:20:14-16 })
+              (EpAnn
+               (EpaSpan { T17544.hs:20:14-16 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { T17544.hs:20:14-16 })
@@ -834,12 +834,12 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T17544.hs:20:14-16 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { T17544.hs:20:14-16 })
+                (EpAnn
+                 (EpaSpan { T17544.hs:20:14-16 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: Int}))))))))))]
       {Bag(LocatedA (HsBind GhcPs)):
@@ -848,12 +848,12 @@
       []
       [])))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544.hs:22:1-30 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544.hs:22:1-30 })
+    (EpAnn
+     (EpaSpan { T17544.hs:22:1-30 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (ClassDecl
@@ -878,23 +878,23 @@
         (HsTok)))
       (Nothing)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T17544.hs:22:7-8 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T17544.hs:22:7-8 })
+       (EpAnn
+        (EpaSpan { T17544.hs:22:7-8 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: C5}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T17544.hs:22:10 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T17544.hs:22:10 })
+         (EpAnn
+          (EpaSpan { T17544.hs:22:10 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (UserTyVar
           (EpAnn
            (EpaSpan { T17544.hs:22:10 })
@@ -903,12 +903,12 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T17544.hs:22:10 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T17544.hs:22:10 })
+           (EpAnn
+            (EpaSpan { T17544.hs:22:10 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: a}))))])
       (Prefix)
@@ -917,12 +917,12 @@
       {Bag(LocatedA (HsBind GhcPs)):
        []}
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T17544.hs:22:20-28 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T17544.hs:22:20-28 })
+        (EpAnn
+         (EpaSpan { T17544.hs:22:20-28 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (FamilyDecl
          (EpAnn
           (EpaSpan { T17544.hs:22:20-28 })
@@ -932,23 +932,23 @@
          (DataFamily)
          (NotTopLevel)
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T17544.hs:22:25-26 })
-                       (NameAnnTrailing
-                        [])
-                       (EpaComments
-                        [])) { T17544.hs:22:25-26 })
+          (EpAnn
+           (EpaSpan { T17544.hs:22:25-26 })
+           (NameAnnTrailing
+            [])
+           (EpaComments
+            []))
           (Unqual
            {OccName: D5}))
          (HsQTvs
           (NoExtField)
           [(L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:22:28 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:22:28 })
+            (EpAnn
+             (EpaSpan { T17544.hs:22:28 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (UserTyVar
              (EpAnn
               (EpaSpan { T17544.hs:22:28 })
@@ -957,35 +957,33 @@
                []))
              (HsBndrRequired)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:22:28 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:22:28 })
+              (EpAnn
+               (EpaSpan { T17544.hs:22:28 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: a}))))])
          (Prefix)
          (L
-          (SrcSpanAnn
-           (EpAnn
-            (EpaSpan { <no location info> })
-            (NoEpAnns)
-            (EpaComments
-             []))
-           { <no location info> })
+          (EpAnn
+           (EpaSpan { <no location info> })
+           (NoEpAnns)
+           (EpaComments
+            []))
           (NoSig
            (NoExtField)))
          (Nothing)))]
       []
       [])))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544.hs:(23,1)-(25,18) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544.hs:(23,1)-(25,18) })
+    (EpAnn
+     (EpaSpan { T17544.hs:(23,1)-(25,18) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (InstD
      (NoExtField)
      (ClsInstD
@@ -1001,32 +999,32 @@
           []))
         (NoAnnSortKey))
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T17544.hs:23:10-15 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T17544.hs:23:10-15 })
+        (EpAnn
+         (EpaSpan { T17544.hs:23:10-15 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (HsSig
          (NoExtField)
          (HsOuterImplicit
           (NoExtField))
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T17544.hs:23:10-15 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T17544.hs:23:10-15 })
+          (EpAnn
+           (EpaSpan { T17544.hs:23:10-15 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsAppTy
            (NoExtField)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:23:10-11 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:23:10-11 })
+            (EpAnn
+             (EpaSpan { T17544.hs:23:10-11 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { T17544.hs:23:10-11 })
@@ -1035,21 +1033,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:23:10-11 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:23:10-11 })
+              (EpAnn
+               (EpaSpan { T17544.hs:23:10-11 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: C5}))))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:23:13-15 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:23:13-15 })
+            (EpAnn
+             (EpaSpan { T17544.hs:23:13-15 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { T17544.hs:23:13-15 })
@@ -1058,12 +1056,12 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:23:13-15 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:23:13-15 })
+              (EpAnn
+               (EpaSpan { T17544.hs:23:13-15 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: Int}))))))))
        {Bag(LocatedA (HsBind GhcPs)):
@@ -1071,12 +1069,12 @@
        []
        []
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T17544.hs:(24,3)-(25,18) })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T17544.hs:(24,3)-(25,18) })
+         (EpAnn
+          (EpaSpan { T17544.hs:(24,3)-(25,18) })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (DataFamInstDecl
           (FamEqn
            (EpAnn
@@ -1086,24 +1084,24 @@
             (EpaComments
              []))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:24:8-9 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:24:8-9 })
+            (EpAnn
+             (EpaSpan { T17544.hs:24:8-9 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: D5}))
            (HsOuterImplicit
             (NoExtField))
            [(HsValArg
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:24:11-13 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:24:11-13 })
+              (EpAnn
+               (EpaSpan { T17544.hs:24:11-13 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { T17544.hs:24:11-13 })
@@ -1112,12 +1110,12 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T17544.hs:24:11-13 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { T17544.hs:24:11-13 })
+                (EpAnn
+                 (EpaSpan { T17544.hs:24:11-13 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: Int})))))]
            (Prefix)
@@ -1129,12 +1127,12 @@
             (DataTypeCons
              (False)
              [(L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { T17544.hs:25:5-18 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { T17544.hs:25:5-18 })
+               (EpAnn
+                (EpaSpan { T17544.hs:25:5-18 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (ConDeclGADT
                 (EpAnn
                  (EpaSpan { T17544.hs:25:5-18 })
@@ -1143,12 +1141,12 @@
                   []))
                 (:|
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { T17544.hs:25:5-8 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { T17544.hs:25:5-8 })
+                  (EpAnn
+                   (EpaSpan { T17544.hs:25:5-8 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: MkD5}))
                  [])
@@ -1157,33 +1155,33 @@
                   (EpaSpan { T17544.hs:25:10-11 }))
                  (HsNormalTok))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { T17544.hs:25:13-18 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { T17544.hs:25:13-18 })
+                 (EpAnn
+                  (EpaSpan { T17544.hs:25:13-18 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsOuterImplicit
                   (NoExtField)))
                 (Nothing)
                 (PrefixConGADT
                  [])
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { T17544.hs:25:13-18 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { T17544.hs:25:13-18 })
+                 (EpAnn
+                  (EpaSpan { T17544.hs:25:13-18 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsAppTy
                   (NoExtField)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { T17544.hs:25:13-14 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { T17544.hs:25:13-14 })
+                   (EpAnn
+                    (EpaSpan { T17544.hs:25:13-14 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { T17544.hs:25:13-14 })
@@ -1192,21 +1190,21 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { T17544.hs:25:13-14 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { T17544.hs:25:13-14 })
+                     (EpAnn
+                      (EpaSpan { T17544.hs:25:13-14 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: D5}))))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { T17544.hs:25:16-18 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { T17544.hs:25:16-18 })
+                   (EpAnn
+                    (EpaSpan { T17544.hs:25:16-18 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { T17544.hs:25:16-18 })
@@ -1215,24 +1213,24 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { T17544.hs:25:16-18 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { T17544.hs:25:16-18 })
+                     (EpAnn
+                      (EpaSpan { T17544.hs:25:16-18 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: Int}))))))
                 (Nothing)))])
             []))))]
        (Nothing)))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544.hs:28:1-30 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544.hs:28:1-30 })
+    (EpAnn
+     (EpaSpan { T17544.hs:28:1-30 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (ClassDecl
@@ -1257,23 +1255,23 @@
         (HsTok)))
       (Nothing)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T17544.hs:28:7-8 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T17544.hs:28:7-8 })
+       (EpAnn
+        (EpaSpan { T17544.hs:28:7-8 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: C6}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T17544.hs:28:10 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T17544.hs:28:10 })
+         (EpAnn
+          (EpaSpan { T17544.hs:28:10 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (UserTyVar
           (EpAnn
            (EpaSpan { T17544.hs:28:10 })
@@ -1282,12 +1280,12 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T17544.hs:28:10 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T17544.hs:28:10 })
+           (EpAnn
+            (EpaSpan { T17544.hs:28:10 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: a}))))])
       (Prefix)
@@ -1296,12 +1294,12 @@
       {Bag(LocatedA (HsBind GhcPs)):
        []}
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T17544.hs:28:20-28 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T17544.hs:28:20-28 })
+        (EpAnn
+         (EpaSpan { T17544.hs:28:20-28 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (FamilyDecl
          (EpAnn
           (EpaSpan { T17544.hs:28:20-28 })
@@ -1311,23 +1309,23 @@
          (DataFamily)
          (NotTopLevel)
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T17544.hs:28:25-26 })
-                       (NameAnnTrailing
-                        [])
-                       (EpaComments
-                        [])) { T17544.hs:28:25-26 })
+          (EpAnn
+           (EpaSpan { T17544.hs:28:25-26 })
+           (NameAnnTrailing
+            [])
+           (EpaComments
+            []))
           (Unqual
            {OccName: D6}))
          (HsQTvs
           (NoExtField)
           [(L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:28:28 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:28:28 })
+            (EpAnn
+             (EpaSpan { T17544.hs:28:28 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (UserTyVar
              (EpAnn
               (EpaSpan { T17544.hs:28:28 })
@@ -1336,35 +1334,33 @@
                []))
              (HsBndrRequired)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:28:28 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:28:28 })
+              (EpAnn
+               (EpaSpan { T17544.hs:28:28 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: a}))))])
          (Prefix)
          (L
-          (SrcSpanAnn
-           (EpAnn
-            (EpaSpan { <no location info> })
-            (NoEpAnns)
-            (EpaComments
-             []))
-           { <no location info> })
+          (EpAnn
+           (EpaSpan { <no location info> })
+           (NoEpAnns)
+           (EpaComments
+            []))
           (NoSig
            (NoExtField)))
          (Nothing)))]
       []
       [])))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544.hs:(29,1)-(31,18) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544.hs:(29,1)-(31,18) })
+    (EpAnn
+     (EpaSpan { T17544.hs:(29,1)-(31,18) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (InstD
      (NoExtField)
      (ClsInstD
@@ -1380,32 +1376,32 @@
           []))
         (NoAnnSortKey))
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T17544.hs:29:10-15 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T17544.hs:29:10-15 })
+        (EpAnn
+         (EpaSpan { T17544.hs:29:10-15 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (HsSig
          (NoExtField)
          (HsOuterImplicit
           (NoExtField))
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T17544.hs:29:10-15 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T17544.hs:29:10-15 })
+          (EpAnn
+           (EpaSpan { T17544.hs:29:10-15 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsAppTy
            (NoExtField)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:29:10-11 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:29:10-11 })
+            (EpAnn
+             (EpaSpan { T17544.hs:29:10-11 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { T17544.hs:29:10-11 })
@@ -1414,21 +1410,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:29:10-11 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:29:10-11 })
+              (EpAnn
+               (EpaSpan { T17544.hs:29:10-11 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: C6}))))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:29:13-15 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:29:13-15 })
+            (EpAnn
+             (EpaSpan { T17544.hs:29:13-15 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { T17544.hs:29:13-15 })
@@ -1437,12 +1433,12 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:29:13-15 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:29:13-15 })
+              (EpAnn
+               (EpaSpan { T17544.hs:29:13-15 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: Int}))))))))
        {Bag(LocatedA (HsBind GhcPs)):
@@ -1450,12 +1446,12 @@
        []
        []
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T17544.hs:(30,3)-(31,18) })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T17544.hs:(30,3)-(31,18) })
+         (EpAnn
+          (EpaSpan { T17544.hs:(30,3)-(31,18) })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (DataFamInstDecl
           (FamEqn
            (EpAnn
@@ -1465,24 +1461,24 @@
             (EpaComments
              []))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:30:8-9 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:30:8-9 })
+            (EpAnn
+             (EpaSpan { T17544.hs:30:8-9 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: D6}))
            (HsOuterImplicit
             (NoExtField))
            [(HsValArg
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:30:11-13 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:30:11-13 })
+              (EpAnn
+               (EpaSpan { T17544.hs:30:11-13 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { T17544.hs:30:11-13 })
@@ -1491,12 +1487,12 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T17544.hs:30:11-13 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { T17544.hs:30:11-13 })
+                (EpAnn
+                 (EpaSpan { T17544.hs:30:11-13 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: Int})))))]
            (Prefix)
@@ -1508,12 +1504,12 @@
             (DataTypeCons
              (False)
              [(L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { T17544.hs:31:5-18 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { T17544.hs:31:5-18 })
+               (EpAnn
+                (EpaSpan { T17544.hs:31:5-18 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (ConDeclGADT
                 (EpAnn
                  (EpaSpan { T17544.hs:31:5-18 })
@@ -1522,12 +1518,12 @@
                   []))
                 (:|
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { T17544.hs:31:5-8 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { T17544.hs:31:5-8 })
+                  (EpAnn
+                   (EpaSpan { T17544.hs:31:5-8 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: MkD6}))
                  [])
@@ -1536,33 +1532,33 @@
                   (EpaSpan { T17544.hs:31:10-11 }))
                  (HsNormalTok))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { T17544.hs:31:13-18 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { T17544.hs:31:13-18 })
+                 (EpAnn
+                  (EpaSpan { T17544.hs:31:13-18 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsOuterImplicit
                   (NoExtField)))
                 (Nothing)
                 (PrefixConGADT
                  [])
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { T17544.hs:31:13-18 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { T17544.hs:31:13-18 })
+                 (EpAnn
+                  (EpaSpan { T17544.hs:31:13-18 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsAppTy
                   (NoExtField)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { T17544.hs:31:13-14 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { T17544.hs:31:13-14 })
+                   (EpAnn
+                    (EpaSpan { T17544.hs:31:13-14 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { T17544.hs:31:13-14 })
@@ -1571,21 +1567,21 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { T17544.hs:31:13-14 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { T17544.hs:31:13-14 })
+                     (EpAnn
+                      (EpaSpan { T17544.hs:31:13-14 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: D6}))))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { T17544.hs:31:16-18 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { T17544.hs:31:16-18 })
+                   (EpAnn
+                    (EpaSpan { T17544.hs:31:16-18 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { T17544.hs:31:16-18 })
@@ -1594,24 +1590,24 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { T17544.hs:31:16-18 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { T17544.hs:31:16-18 })
+                     (EpAnn
+                      (EpaSpan { T17544.hs:31:16-18 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: Int}))))))
                 (Nothing)))])
             []))))]
        (Nothing)))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544.hs:34:1-30 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544.hs:34:1-30 })
+    (EpAnn
+     (EpaSpan { T17544.hs:34:1-30 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (ClassDecl
@@ -1636,23 +1632,23 @@
         (HsTok)))
       (Nothing)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T17544.hs:34:7-8 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T17544.hs:34:7-8 })
+       (EpAnn
+        (EpaSpan { T17544.hs:34:7-8 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: C7}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T17544.hs:34:10 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T17544.hs:34:10 })
+         (EpAnn
+          (EpaSpan { T17544.hs:34:10 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (UserTyVar
           (EpAnn
            (EpaSpan { T17544.hs:34:10 })
@@ -1661,12 +1657,12 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T17544.hs:34:10 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T17544.hs:34:10 })
+           (EpAnn
+            (EpaSpan { T17544.hs:34:10 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: a}))))])
       (Prefix)
@@ -1675,12 +1671,12 @@
       {Bag(LocatedA (HsBind GhcPs)):
        []}
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T17544.hs:34:20-28 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T17544.hs:34:20-28 })
+        (EpAnn
+         (EpaSpan { T17544.hs:34:20-28 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (FamilyDecl
          (EpAnn
           (EpaSpan { T17544.hs:34:20-28 })
@@ -1690,23 +1686,23 @@
          (DataFamily)
          (NotTopLevel)
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T17544.hs:34:25-26 })
-                       (NameAnnTrailing
-                        [])
-                       (EpaComments
-                        [])) { T17544.hs:34:25-26 })
+          (EpAnn
+           (EpaSpan { T17544.hs:34:25-26 })
+           (NameAnnTrailing
+            [])
+           (EpaComments
+            []))
           (Unqual
            {OccName: D7}))
          (HsQTvs
           (NoExtField)
           [(L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:34:28 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:34:28 })
+            (EpAnn
+             (EpaSpan { T17544.hs:34:28 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (UserTyVar
              (EpAnn
               (EpaSpan { T17544.hs:34:28 })
@@ -1715,35 +1711,33 @@
                []))
              (HsBndrRequired)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:34:28 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:34:28 })
+              (EpAnn
+               (EpaSpan { T17544.hs:34:28 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: a}))))])
          (Prefix)
          (L
-          (SrcSpanAnn
-           (EpAnn
-            (EpaSpan { <no location info> })
-            (NoEpAnns)
-            (EpaComments
-             []))
-           { <no location info> })
+          (EpAnn
+           (EpaSpan { <no location info> })
+           (NoEpAnns)
+           (EpaComments
+            []))
           (NoSig
            (NoExtField)))
          (Nothing)))]
       []
       [])))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544.hs:(35,1)-(37,18) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544.hs:(35,1)-(37,18) })
+    (EpAnn
+     (EpaSpan { T17544.hs:(35,1)-(37,18) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (InstD
      (NoExtField)
      (ClsInstD
@@ -1759,32 +1753,32 @@
           []))
         (NoAnnSortKey))
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T17544.hs:35:10-15 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T17544.hs:35:10-15 })
+        (EpAnn
+         (EpaSpan { T17544.hs:35:10-15 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (HsSig
          (NoExtField)
          (HsOuterImplicit
           (NoExtField))
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T17544.hs:35:10-15 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T17544.hs:35:10-15 })
+          (EpAnn
+           (EpaSpan { T17544.hs:35:10-15 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsAppTy
            (NoExtField)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:35:10-11 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:35:10-11 })
+            (EpAnn
+             (EpaSpan { T17544.hs:35:10-11 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { T17544.hs:35:10-11 })
@@ -1793,21 +1787,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:35:10-11 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:35:10-11 })
+              (EpAnn
+               (EpaSpan { T17544.hs:35:10-11 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: C7}))))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:35:13-15 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:35:13-15 })
+            (EpAnn
+             (EpaSpan { T17544.hs:35:13-15 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { T17544.hs:35:13-15 })
@@ -1816,12 +1810,12 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:35:13-15 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:35:13-15 })
+              (EpAnn
+               (EpaSpan { T17544.hs:35:13-15 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: Int}))))))))
        {Bag(LocatedA (HsBind GhcPs)):
@@ -1829,12 +1823,12 @@
        []
        []
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T17544.hs:(36,3)-(37,18) })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T17544.hs:(36,3)-(37,18) })
+         (EpAnn
+          (EpaSpan { T17544.hs:(36,3)-(37,18) })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (DataFamInstDecl
           (FamEqn
            (EpAnn
@@ -1844,24 +1838,24 @@
             (EpaComments
              []))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:36:8-9 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:36:8-9 })
+            (EpAnn
+             (EpaSpan { T17544.hs:36:8-9 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: D7}))
            (HsOuterImplicit
             (NoExtField))
            [(HsValArg
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:36:11-13 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:36:11-13 })
+              (EpAnn
+               (EpaSpan { T17544.hs:36:11-13 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { T17544.hs:36:11-13 })
@@ -1870,12 +1864,12 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T17544.hs:36:11-13 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { T17544.hs:36:11-13 })
+                (EpAnn
+                 (EpaSpan { T17544.hs:36:11-13 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: Int})))))]
            (Prefix)
@@ -1887,12 +1881,12 @@
             (DataTypeCons
              (False)
              [(L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { T17544.hs:37:5-18 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { T17544.hs:37:5-18 })
+               (EpAnn
+                (EpaSpan { T17544.hs:37:5-18 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (ConDeclGADT
                 (EpAnn
                  (EpaSpan { T17544.hs:37:5-18 })
@@ -1901,12 +1895,12 @@
                   []))
                 (:|
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { T17544.hs:37:5-8 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { T17544.hs:37:5-8 })
+                  (EpAnn
+                   (EpaSpan { T17544.hs:37:5-8 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: MkD7}))
                  [])
@@ -1915,33 +1909,33 @@
                   (EpaSpan { T17544.hs:37:10-11 }))
                  (HsNormalTok))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { T17544.hs:37:13-18 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { T17544.hs:37:13-18 })
+                 (EpAnn
+                  (EpaSpan { T17544.hs:37:13-18 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsOuterImplicit
                   (NoExtField)))
                 (Nothing)
                 (PrefixConGADT
                  [])
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { T17544.hs:37:13-18 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { T17544.hs:37:13-18 })
+                 (EpAnn
+                  (EpaSpan { T17544.hs:37:13-18 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsAppTy
                   (NoExtField)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { T17544.hs:37:13-14 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { T17544.hs:37:13-14 })
+                   (EpAnn
+                    (EpaSpan { T17544.hs:37:13-14 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { T17544.hs:37:13-14 })
@@ -1950,21 +1944,21 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { T17544.hs:37:13-14 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { T17544.hs:37:13-14 })
+                     (EpAnn
+                      (EpaSpan { T17544.hs:37:13-14 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: D7}))))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { T17544.hs:37:16-18 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { T17544.hs:37:16-18 })
+                   (EpAnn
+                    (EpaSpan { T17544.hs:37:16-18 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { T17544.hs:37:16-18 })
@@ -1973,24 +1967,24 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { T17544.hs:37:16-18 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { T17544.hs:37:16-18 })
+                     (EpAnn
+                      (EpaSpan { T17544.hs:37:16-18 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: Int}))))))
                 (Nothing)))])
             []))))]
        (Nothing)))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544.hs:40:1-30 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544.hs:40:1-30 })
+    (EpAnn
+     (EpaSpan { T17544.hs:40:1-30 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (ClassDecl
@@ -2015,23 +2009,23 @@
         (HsTok)))
       (Nothing)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T17544.hs:40:7-8 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T17544.hs:40:7-8 })
+       (EpAnn
+        (EpaSpan { T17544.hs:40:7-8 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: C8}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T17544.hs:40:10 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T17544.hs:40:10 })
+         (EpAnn
+          (EpaSpan { T17544.hs:40:10 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (UserTyVar
           (EpAnn
            (EpaSpan { T17544.hs:40:10 })
@@ -2040,12 +2034,12 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T17544.hs:40:10 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T17544.hs:40:10 })
+           (EpAnn
+            (EpaSpan { T17544.hs:40:10 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: a}))))])
       (Prefix)
@@ -2054,12 +2048,12 @@
       {Bag(LocatedA (HsBind GhcPs)):
        []}
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T17544.hs:40:20-28 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T17544.hs:40:20-28 })
+        (EpAnn
+         (EpaSpan { T17544.hs:40:20-28 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (FamilyDecl
          (EpAnn
           (EpaSpan { T17544.hs:40:20-28 })
@@ -2069,23 +2063,23 @@
          (DataFamily)
          (NotTopLevel)
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T17544.hs:40:25-26 })
-                       (NameAnnTrailing
-                        [])
-                       (EpaComments
-                        [])) { T17544.hs:40:25-26 })
+          (EpAnn
+           (EpaSpan { T17544.hs:40:25-26 })
+           (NameAnnTrailing
+            [])
+           (EpaComments
+            []))
           (Unqual
            {OccName: D8}))
          (HsQTvs
           (NoExtField)
           [(L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:40:28 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:40:28 })
+            (EpAnn
+             (EpaSpan { T17544.hs:40:28 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (UserTyVar
              (EpAnn
               (EpaSpan { T17544.hs:40:28 })
@@ -2094,35 +2088,33 @@
                []))
              (HsBndrRequired)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:40:28 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:40:28 })
+              (EpAnn
+               (EpaSpan { T17544.hs:40:28 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: a}))))])
          (Prefix)
          (L
-          (SrcSpanAnn
-           (EpAnn
-            (EpaSpan { <no location info> })
-            (NoEpAnns)
-            (EpaComments
-             []))
-           { <no location info> })
+          (EpAnn
+           (EpaSpan { <no location info> })
+           (NoEpAnns)
+           (EpaComments
+            []))
           (NoSig
            (NoExtField)))
          (Nothing)))]
       []
       [])))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544.hs:(41,1)-(43,18) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544.hs:(41,1)-(43,18) })
+    (EpAnn
+     (EpaSpan { T17544.hs:(41,1)-(43,18) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (InstD
      (NoExtField)
      (ClsInstD
@@ -2138,32 +2130,32 @@
           []))
         (NoAnnSortKey))
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T17544.hs:41:10-15 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T17544.hs:41:10-15 })
+        (EpAnn
+         (EpaSpan { T17544.hs:41:10-15 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (HsSig
          (NoExtField)
          (HsOuterImplicit
           (NoExtField))
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T17544.hs:41:10-15 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T17544.hs:41:10-15 })
+          (EpAnn
+           (EpaSpan { T17544.hs:41:10-15 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsAppTy
            (NoExtField)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:41:10-11 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:41:10-11 })
+            (EpAnn
+             (EpaSpan { T17544.hs:41:10-11 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { T17544.hs:41:10-11 })
@@ -2172,21 +2164,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:41:10-11 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:41:10-11 })
+              (EpAnn
+               (EpaSpan { T17544.hs:41:10-11 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: C8}))))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:41:13-15 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:41:13-15 })
+            (EpAnn
+             (EpaSpan { T17544.hs:41:13-15 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { T17544.hs:41:13-15 })
@@ -2195,12 +2187,12 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:41:13-15 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:41:13-15 })
+              (EpAnn
+               (EpaSpan { T17544.hs:41:13-15 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: Int}))))))))
        {Bag(LocatedA (HsBind GhcPs)):
@@ -2208,12 +2200,12 @@
        []
        []
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T17544.hs:(42,3)-(43,18) })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T17544.hs:(42,3)-(43,18) })
+         (EpAnn
+          (EpaSpan { T17544.hs:(42,3)-(43,18) })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (DataFamInstDecl
           (FamEqn
            (EpAnn
@@ -2223,24 +2215,24 @@
             (EpaComments
              []))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:42:8-9 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:42:8-9 })
+            (EpAnn
+             (EpaSpan { T17544.hs:42:8-9 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: D8}))
            (HsOuterImplicit
             (NoExtField))
            [(HsValArg
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:42:11-13 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:42:11-13 })
+              (EpAnn
+               (EpaSpan { T17544.hs:42:11-13 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { T17544.hs:42:11-13 })
@@ -2249,12 +2241,12 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T17544.hs:42:11-13 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { T17544.hs:42:11-13 })
+                (EpAnn
+                 (EpaSpan { T17544.hs:42:11-13 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: Int})))))]
            (Prefix)
@@ -2266,12 +2258,12 @@
             (DataTypeCons
              (False)
              [(L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { T17544.hs:43:5-18 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { T17544.hs:43:5-18 })
+               (EpAnn
+                (EpaSpan { T17544.hs:43:5-18 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (ConDeclGADT
                 (EpAnn
                  (EpaSpan { T17544.hs:43:5-18 })
@@ -2280,12 +2272,12 @@
                   []))
                 (:|
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { T17544.hs:43:5-8 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { T17544.hs:43:5-8 })
+                  (EpAnn
+                   (EpaSpan { T17544.hs:43:5-8 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: MkD8}))
                  [])
@@ -2294,33 +2286,33 @@
                   (EpaSpan { T17544.hs:43:10-11 }))
                  (HsNormalTok))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { T17544.hs:43:13-18 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { T17544.hs:43:13-18 })
+                 (EpAnn
+                  (EpaSpan { T17544.hs:43:13-18 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsOuterImplicit
                   (NoExtField)))
                 (Nothing)
                 (PrefixConGADT
                  [])
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { T17544.hs:43:13-18 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { T17544.hs:43:13-18 })
+                 (EpAnn
+                  (EpaSpan { T17544.hs:43:13-18 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsAppTy
                   (NoExtField)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { T17544.hs:43:13-14 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { T17544.hs:43:13-14 })
+                   (EpAnn
+                    (EpaSpan { T17544.hs:43:13-14 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { T17544.hs:43:13-14 })
@@ -2329,21 +2321,21 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { T17544.hs:43:13-14 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { T17544.hs:43:13-14 })
+                     (EpAnn
+                      (EpaSpan { T17544.hs:43:13-14 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: D8}))))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { T17544.hs:43:16-18 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { T17544.hs:43:16-18 })
+                   (EpAnn
+                    (EpaSpan { T17544.hs:43:16-18 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { T17544.hs:43:16-18 })
@@ -2352,24 +2344,24 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { T17544.hs:43:16-18 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { T17544.hs:43:16-18 })
+                     (EpAnn
+                      (EpaSpan { T17544.hs:43:16-18 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: Int}))))))
                 (Nothing)))])
             []))))]
        (Nothing)))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544.hs:46:1-30 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544.hs:46:1-30 })
+    (EpAnn
+     (EpaSpan { T17544.hs:46:1-30 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (ClassDecl
@@ -2394,23 +2386,23 @@
         (HsTok)))
       (Nothing)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T17544.hs:46:7-8 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T17544.hs:46:7-8 })
+       (EpAnn
+        (EpaSpan { T17544.hs:46:7-8 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: C9}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T17544.hs:46:10 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T17544.hs:46:10 })
+         (EpAnn
+          (EpaSpan { T17544.hs:46:10 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (UserTyVar
           (EpAnn
            (EpaSpan { T17544.hs:46:10 })
@@ -2419,12 +2411,12 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T17544.hs:46:10 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T17544.hs:46:10 })
+           (EpAnn
+            (EpaSpan { T17544.hs:46:10 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: a}))))])
       (Prefix)
@@ -2433,12 +2425,12 @@
       {Bag(LocatedA (HsBind GhcPs)):
        []}
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T17544.hs:46:20-28 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T17544.hs:46:20-28 })
+        (EpAnn
+         (EpaSpan { T17544.hs:46:20-28 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (FamilyDecl
          (EpAnn
           (EpaSpan { T17544.hs:46:20-28 })
@@ -2448,23 +2440,23 @@
          (DataFamily)
          (NotTopLevel)
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T17544.hs:46:25-26 })
-                       (NameAnnTrailing
-                        [])
-                       (EpaComments
-                        [])) { T17544.hs:46:25-26 })
+          (EpAnn
+           (EpaSpan { T17544.hs:46:25-26 })
+           (NameAnnTrailing
+            [])
+           (EpaComments
+            []))
           (Unqual
            {OccName: D9}))
          (HsQTvs
           (NoExtField)
           [(L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:46:28 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:46:28 })
+            (EpAnn
+             (EpaSpan { T17544.hs:46:28 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (UserTyVar
              (EpAnn
               (EpaSpan { T17544.hs:46:28 })
@@ -2473,35 +2465,33 @@
                []))
              (HsBndrRequired)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:46:28 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:46:28 })
+              (EpAnn
+               (EpaSpan { T17544.hs:46:28 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: a}))))])
          (Prefix)
          (L
-          (SrcSpanAnn
-           (EpAnn
-            (EpaSpan { <no location info> })
-            (NoEpAnns)
-            (EpaComments
-             []))
-           { <no location info> })
+          (EpAnn
+           (EpaSpan { <no location info> })
+           (NoEpAnns)
+           (EpaComments
+            []))
           (NoSig
            (NoExtField)))
          (Nothing)))]
       []
       [])))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544.hs:(47,1)-(49,18) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544.hs:(47,1)-(49,18) })
+    (EpAnn
+     (EpaSpan { T17544.hs:(47,1)-(49,18) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (InstD
      (NoExtField)
      (ClsInstD
@@ -2517,32 +2507,32 @@
           []))
         (NoAnnSortKey))
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T17544.hs:47:10-15 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T17544.hs:47:10-15 })
+        (EpAnn
+         (EpaSpan { T17544.hs:47:10-15 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (HsSig
          (NoExtField)
          (HsOuterImplicit
           (NoExtField))
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T17544.hs:47:10-15 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T17544.hs:47:10-15 })
+          (EpAnn
+           (EpaSpan { T17544.hs:47:10-15 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsAppTy
            (NoExtField)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:47:10-11 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:47:10-11 })
+            (EpAnn
+             (EpaSpan { T17544.hs:47:10-11 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { T17544.hs:47:10-11 })
@@ -2551,21 +2541,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:47:10-11 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:47:10-11 })
+              (EpAnn
+               (EpaSpan { T17544.hs:47:10-11 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: C9}))))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:47:13-15 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:47:13-15 })
+            (EpAnn
+             (EpaSpan { T17544.hs:47:13-15 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { T17544.hs:47:13-15 })
@@ -2574,12 +2564,12 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:47:13-15 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:47:13-15 })
+              (EpAnn
+               (EpaSpan { T17544.hs:47:13-15 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: Int}))))))))
        {Bag(LocatedA (HsBind GhcPs)):
@@ -2587,12 +2577,12 @@
        []
        []
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T17544.hs:(48,3)-(49,18) })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T17544.hs:(48,3)-(49,18) })
+         (EpAnn
+          (EpaSpan { T17544.hs:(48,3)-(49,18) })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (DataFamInstDecl
           (FamEqn
            (EpAnn
@@ -2602,24 +2592,24 @@
             (EpaComments
              []))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:48:8-9 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:48:8-9 })
+            (EpAnn
+             (EpaSpan { T17544.hs:48:8-9 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: D9}))
            (HsOuterImplicit
             (NoExtField))
            [(HsValArg
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:48:11-13 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:48:11-13 })
+              (EpAnn
+               (EpaSpan { T17544.hs:48:11-13 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { T17544.hs:48:11-13 })
@@ -2628,12 +2618,12 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T17544.hs:48:11-13 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { T17544.hs:48:11-13 })
+                (EpAnn
+                 (EpaSpan { T17544.hs:48:11-13 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: Int})))))]
            (Prefix)
@@ -2645,12 +2635,12 @@
             (DataTypeCons
              (False)
              [(L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { T17544.hs:49:5-18 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { T17544.hs:49:5-18 })
+               (EpAnn
+                (EpaSpan { T17544.hs:49:5-18 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (ConDeclGADT
                 (EpAnn
                  (EpaSpan { T17544.hs:49:5-18 })
@@ -2659,12 +2649,12 @@
                   []))
                 (:|
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { T17544.hs:49:5-8 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { T17544.hs:49:5-8 })
+                  (EpAnn
+                   (EpaSpan { T17544.hs:49:5-8 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: MkD9}))
                  [])
@@ -2673,33 +2663,33 @@
                   (EpaSpan { T17544.hs:49:10-11 }))
                  (HsNormalTok))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { T17544.hs:49:13-18 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { T17544.hs:49:13-18 })
+                 (EpAnn
+                  (EpaSpan { T17544.hs:49:13-18 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsOuterImplicit
                   (NoExtField)))
                 (Nothing)
                 (PrefixConGADT
                  [])
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { T17544.hs:49:13-18 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { T17544.hs:49:13-18 })
+                 (EpAnn
+                  (EpaSpan { T17544.hs:49:13-18 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsAppTy
                   (NoExtField)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { T17544.hs:49:13-14 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { T17544.hs:49:13-14 })
+                   (EpAnn
+                    (EpaSpan { T17544.hs:49:13-14 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { T17544.hs:49:13-14 })
@@ -2708,21 +2698,21 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { T17544.hs:49:13-14 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { T17544.hs:49:13-14 })
+                     (EpAnn
+                      (EpaSpan { T17544.hs:49:13-14 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: D9}))))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { T17544.hs:49:16-18 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { T17544.hs:49:16-18 })
+                   (EpAnn
+                    (EpaSpan { T17544.hs:49:16-18 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { T17544.hs:49:16-18 })
@@ -2731,24 +2721,24 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { T17544.hs:49:16-18 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { T17544.hs:49:16-18 })
+                     (EpAnn
+                      (EpaSpan { T17544.hs:49:16-18 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: Int}))))))
                 (Nothing)))])
             []))))]
        (Nothing)))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544.hs:52:1-32 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544.hs:52:1-32 })
+    (EpAnn
+     (EpaSpan { T17544.hs:52:1-32 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (ClassDecl
@@ -2773,23 +2763,23 @@
         (HsTok)))
       (Nothing)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T17544.hs:52:7-9 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T17544.hs:52:7-9 })
+       (EpAnn
+        (EpaSpan { T17544.hs:52:7-9 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: C10}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T17544.hs:52:11 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T17544.hs:52:11 })
+         (EpAnn
+          (EpaSpan { T17544.hs:52:11 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (UserTyVar
           (EpAnn
            (EpaSpan { T17544.hs:52:11 })
@@ -2798,12 +2788,12 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T17544.hs:52:11 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T17544.hs:52:11 })
+           (EpAnn
+            (EpaSpan { T17544.hs:52:11 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: a}))))])
       (Prefix)
@@ -2812,12 +2802,12 @@
       {Bag(LocatedA (HsBind GhcPs)):
        []}
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T17544.hs:52:21-30 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T17544.hs:52:21-30 })
+        (EpAnn
+         (EpaSpan { T17544.hs:52:21-30 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (FamilyDecl
          (EpAnn
           (EpaSpan { T17544.hs:52:21-30 })
@@ -2827,23 +2817,23 @@
          (DataFamily)
          (NotTopLevel)
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T17544.hs:52:26-28 })
-                       (NameAnnTrailing
-                        [])
-                       (EpaComments
-                        [])) { T17544.hs:52:26-28 })
+          (EpAnn
+           (EpaSpan { T17544.hs:52:26-28 })
+           (NameAnnTrailing
+            [])
+           (EpaComments
+            []))
           (Unqual
            {OccName: D10}))
          (HsQTvs
           (NoExtField)
           [(L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:52:30 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:52:30 })
+            (EpAnn
+             (EpaSpan { T17544.hs:52:30 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (UserTyVar
              (EpAnn
               (EpaSpan { T17544.hs:52:30 })
@@ -2852,35 +2842,33 @@
                []))
              (HsBndrRequired)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:52:30 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:52:30 })
+              (EpAnn
+               (EpaSpan { T17544.hs:52:30 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: a}))))])
          (Prefix)
          (L
-          (SrcSpanAnn
-           (EpAnn
-            (EpaSpan { <no location info> })
-            (NoEpAnns)
-            (EpaComments
-             []))
-           { <no location info> })
+          (EpAnn
+           (EpaSpan { <no location info> })
+           (NoEpAnns)
+           (EpaComments
+            []))
           (NoSig
            (NoExtField)))
          (Nothing)))]
       []
       [])))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544.hs:(53,1)-(55,20) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544.hs:(53,1)-(55,20) })
+    (EpAnn
+     (EpaSpan { T17544.hs:(53,1)-(55,20) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (InstD
      (NoExtField)
      (ClsInstD
@@ -2896,32 +2884,32 @@
           []))
         (NoAnnSortKey))
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T17544.hs:53:10-16 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T17544.hs:53:10-16 })
+        (EpAnn
+         (EpaSpan { T17544.hs:53:10-16 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (HsSig
          (NoExtField)
          (HsOuterImplicit
           (NoExtField))
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T17544.hs:53:10-16 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T17544.hs:53:10-16 })
+          (EpAnn
+           (EpaSpan { T17544.hs:53:10-16 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsAppTy
            (NoExtField)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:53:10-12 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:53:10-12 })
+            (EpAnn
+             (EpaSpan { T17544.hs:53:10-12 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { T17544.hs:53:10-12 })
@@ -2930,21 +2918,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:53:10-12 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:53:10-12 })
+              (EpAnn
+               (EpaSpan { T17544.hs:53:10-12 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: C10}))))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:53:14-16 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:53:14-16 })
+            (EpAnn
+             (EpaSpan { T17544.hs:53:14-16 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { T17544.hs:53:14-16 })
@@ -2953,12 +2941,12 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:53:14-16 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:53:14-16 })
+              (EpAnn
+               (EpaSpan { T17544.hs:53:14-16 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: Int}))))))))
        {Bag(LocatedA (HsBind GhcPs)):
@@ -2966,12 +2954,12 @@
        []
        []
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T17544.hs:(54,3)-(55,20) })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T17544.hs:(54,3)-(55,20) })
+         (EpAnn
+          (EpaSpan { T17544.hs:(54,3)-(55,20) })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (DataFamInstDecl
           (FamEqn
            (EpAnn
@@ -2981,24 +2969,24 @@
             (EpaComments
              []))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544.hs:54:8-10 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { T17544.hs:54:8-10 })
+            (EpAnn
+             (EpaSpan { T17544.hs:54:8-10 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: D10}))
            (HsOuterImplicit
             (NoExtField))
            [(HsValArg
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544.hs:54:12-14 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { T17544.hs:54:12-14 })
+              (EpAnn
+               (EpaSpan { T17544.hs:54:12-14 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { T17544.hs:54:12-14 })
@@ -3007,12 +2995,12 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T17544.hs:54:12-14 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { T17544.hs:54:12-14 })
+                (EpAnn
+                 (EpaSpan { T17544.hs:54:12-14 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: Int})))))]
            (Prefix)
@@ -3024,12 +3012,12 @@
             (DataTypeCons
              (False)
              [(L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { T17544.hs:55:5-20 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { T17544.hs:55:5-20 })
+               (EpAnn
+                (EpaSpan { T17544.hs:55:5-20 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (ConDeclGADT
                 (EpAnn
                  (EpaSpan { T17544.hs:55:5-20 })
@@ -3038,12 +3026,12 @@
                   []))
                 (:|
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { T17544.hs:55:5-9 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { T17544.hs:55:5-9 })
+                  (EpAnn
+                   (EpaSpan { T17544.hs:55:5-9 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: MkD10}))
                  [])
@@ -3052,33 +3040,33 @@
                   (EpaSpan { T17544.hs:55:11-12 }))
                  (HsNormalTok))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { T17544.hs:55:14-20 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { T17544.hs:55:14-20 })
+                 (EpAnn
+                  (EpaSpan { T17544.hs:55:14-20 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsOuterImplicit
                   (NoExtField)))
                 (Nothing)
                 (PrefixConGADT
                  [])
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { T17544.hs:55:14-20 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { T17544.hs:55:14-20 })
+                 (EpAnn
+                  (EpaSpan { T17544.hs:55:14-20 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsAppTy
                   (NoExtField)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { T17544.hs:55:14-16 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { T17544.hs:55:14-16 })
+                   (EpAnn
+                    (EpaSpan { T17544.hs:55:14-16 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { T17544.hs:55:14-16 })
@@ -3087,21 +3075,21 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { T17544.hs:55:14-16 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { T17544.hs:55:14-16 })
+                     (EpAnn
+                      (EpaSpan { T17544.hs:55:14-16 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: D10}))))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { T17544.hs:55:18-20 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { T17544.hs:55:18-20 })
+                   (EpAnn
+                    (EpaSpan { T17544.hs:55:18-20 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { T17544.hs:55:18-20 })
@@ -3110,24 +3098,24 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { T17544.hs:55:18-20 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { T17544.hs:55:18-20 })
+                     (EpAnn
+                      (EpaSpan { T17544.hs:55:18-20 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: Int}))))))
                 (Nothing)))])
             []))))]
        (Nothing)))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544.hs:56:1-38 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544.hs:56:1-38 })
+    (EpAnn
+     (EpaSpan { T17544.hs:56:1-38 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (DocD
      (NoExtField)
      (DocCommentPrev
diff --git a/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr
index b73efbb948fd..d0afee6137f5 100644
--- a/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr
@@ -36,22 +36,22 @@
       []))))
   (Just
    (L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544_kw.hs:13:3-11 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544_kw.hs:13:3-11 })
+    (EpAnn
+     (EpaSpan { T17544_kw.hs:13:3-11 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     {ModuleName: T17544_kw}))
   (Nothing)
   []
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544_kw.hs:(15,1)-(16,20) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544_kw.hs:(15,1)-(16,20) })
+    (EpAnn
+     (EpaSpan { T17544_kw.hs:(15,1)-(16,20) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (DataDecl
@@ -62,12 +62,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T17544_kw.hs:15:6-8 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T17544_kw.hs:15:6-8 })
+       (EpAnn
+        (EpaSpan { T17544_kw.hs:15:6-8 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: Foo}))
       (HsQTvs
@@ -82,12 +82,12 @@
        (DataTypeCons
         (False)
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T17544_kw.hs:16:9-20 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T17544_kw.hs:16:9-20 })
+          (EpAnn
+           (EpaSpan { T17544_kw.hs:16:9-20 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (ConDeclGADT
            (EpAnn
             (EpaSpan { T17544_kw.hs:16:9-20 })
@@ -96,12 +96,12 @@
              []))
            (:|
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { T17544_kw.hs:16:9-13 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { T17544_kw.hs:16:9-13 })
+             (EpAnn
+              (EpaSpan { T17544_kw.hs:16:9-13 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: MkFoo}))
             [])
@@ -110,24 +110,24 @@
              (EpaSpan { T17544_kw.hs:16:15-16 }))
             (HsNormalTok))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544_kw.hs:16:18-20 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544_kw.hs:16:18-20 })
+            (EpAnn
+             (EpaSpan { T17544_kw.hs:16:18-20 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsOuterImplicit
              (NoExtField)))
            (Nothing)
            (PrefixConGADT
             [])
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544_kw.hs:16:18-20 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544_kw.hs:16:18-20 })
+            (EpAnn
+             (EpaSpan { T17544_kw.hs:16:18-20 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { T17544_kw.hs:16:18-20 })
@@ -136,12 +136,12 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544_kw.hs:16:18-20 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T17544_kw.hs:16:18-20 })
+              (EpAnn
+               (EpaSpan { T17544_kw.hs:16:18-20 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: Foo}))))
            (Just
@@ -159,12 +159,12 @@
               [])))))])
        []))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544_kw.hs:(18,1)-(19,26) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544_kw.hs:(18,1)-(19,26) })
+    (EpAnn
+     (EpaSpan { T17544_kw.hs:(18,1)-(19,26) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (DataDecl
@@ -175,12 +175,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T17544_kw.hs:18:9-11 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T17544_kw.hs:18:9-11 })
+       (EpAnn
+        (EpaSpan { T17544_kw.hs:18:9-11 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: Bar}))
       (HsQTvs
@@ -194,12 +194,12 @@
        (Nothing)
        (NewTypeCon
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T17544_kw.hs:19:9-26 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T17544_kw.hs:19:9-26 })
+         (EpAnn
+          (EpaSpan { T17544_kw.hs:19:9-26 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (ConDeclGADT
           (EpAnn
            (EpaSpan { T17544_kw.hs:19:9-26 })
@@ -208,12 +208,12 @@
             []))
           (:|
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544_kw.hs:19:9-13 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { T17544_kw.hs:19:9-13 })
+            (EpAnn
+             (EpaSpan { T17544_kw.hs:19:9-13 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: MkBar}))
            [])
@@ -222,12 +222,12 @@
             (EpaSpan { T17544_kw.hs:19:15-16 }))
            (HsNormalTok))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T17544_kw.hs:19:18-26 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { T17544_kw.hs:19:18-26 })
+           (EpAnn
+            (EpaSpan { T17544_kw.hs:19:18-26 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsOuterImplicit
             (NoExtField)))
           (Nothing)
@@ -239,12 +239,12 @@
                 (EpaSpan { T17544_kw.hs:19:21-22 }))
                (HsNormalTok)))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544_kw.hs:19:18-19 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { T17544_kw.hs:19:18-19 })
+              (EpAnn
+               (EpaSpan { T17544_kw.hs:19:18-19 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTupleTy
                (EpAnn
                 (EpaSpan { T17544_kw.hs:19:18-19 })
@@ -257,12 +257,12 @@
                (HsBoxedOrConstraintTuple)
                [])))])
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T17544_kw.hs:19:24-26 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { T17544_kw.hs:19:24-26 })
+           (EpAnn
+            (EpaSpan { T17544_kw.hs:19:24-26 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsTyVar
             (EpAnn
              (EpaSpan { T17544_kw.hs:19:24-26 })
@@ -271,12 +271,12 @@
               []))
             (NotPromoted)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { T17544_kw.hs:19:24-26 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { T17544_kw.hs:19:24-26 })
+             (EpAnn
+              (EpaSpan { T17544_kw.hs:19:24-26 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: Bar}))))
           (Just
@@ -294,12 +294,12 @@
              []))))))
        []))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T17544_kw.hs:(21,1)-(24,18) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T17544_kw.hs:(21,1)-(24,18) })
+    (EpAnn
+     (EpaSpan { T17544_kw.hs:(21,1)-(24,18) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (ClassDecl
@@ -315,23 +315,23 @@
        (5))
       (Nothing)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T17544_kw.hs:21:7-9 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T17544_kw.hs:21:7-9 })
+       (EpAnn
+        (EpaSpan { T17544_kw.hs:21:7-9 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: Cls}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T17544_kw.hs:21:11 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T17544_kw.hs:21:11 })
+         (EpAnn
+          (EpaSpan { T17544_kw.hs:21:11 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (UserTyVar
           (EpAnn
            (EpaSpan { T17544_kw.hs:21:11 })
@@ -340,23 +340,23 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T17544_kw.hs:21:11 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T17544_kw.hs:21:11 })
+           (EpAnn
+            (EpaSpan { T17544_kw.hs:21:11 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: a}))))])
       (Prefix)
       []
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T17544_kw.hs:24:5-18 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T17544_kw.hs:24:5-18 })
+        (EpAnn
+         (EpaSpan { T17544_kw.hs:24:5-18 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (ClassOpSig
          (EpAnn
           (EpaSpan { T17544_kw.hs:24:5-18 })
@@ -367,32 +367,32 @@
            []))
          (False)
          [(L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T17544_kw.hs:24:5-13 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T17544_kw.hs:24:5-13 })
+           (EpAnn
+            (EpaSpan { T17544_kw.hs:24:5-13 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: clsmethod}))]
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T17544_kw.hs:24:18 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T17544_kw.hs:24:18 })
+          (EpAnn
+           (EpaSpan { T17544_kw.hs:24:18 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsSig
            (NoExtField)
            (HsOuterImplicit
             (NoExtField))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T17544_kw.hs:24:18 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T17544_kw.hs:24:18 })
+            (EpAnn
+             (EpaSpan { T17544_kw.hs:24:18 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { T17544_kw.hs:24:18 })
@@ -401,12 +401,12 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T17544_kw.hs:24:18 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T17544_kw.hs:24:18 })
+              (EpAnn
+               (EpaSpan { T17544_kw.hs:24:18 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: a}))))))))]
       {Bag(LocatedA (HsBind GhcPs)):
@@ -414,12 +414,12 @@
       []
       []
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T17544_kw.hs:22:5-34 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T17544_kw.hs:22:5-34 })
+        (EpAnn
+         (EpaSpan { T17544_kw.hs:22:5-34 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (DocCommentNext
          (L
           { T17544_kw.hs:22:5-34 }
diff --git a/testsuite/tests/module/mod185.stderr b/testsuite/tests/module/mod185.stderr
index faa8482a1749..c9fbd962ef69 100644
--- a/testsuite/tests/module/mod185.stderr
+++ b/testsuite/tests/module/mod185.stderr
@@ -24,12 +24,12 @@
   (Nothing)
   (Nothing)
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { mod185.hs:3:1-24 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { mod185.hs:3:1-24 })
+    (EpAnn
+     (EpaSpan { mod185.hs:3:1-24 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (ImportDecl
      (XImportDeclPass
       (EpAnn
@@ -47,12 +47,12 @@
       (NoSourceText)
       (False))
      (L
-      (SrcSpanAnn (EpAnn
-                   (EpaSpan { mod185.hs:3:8-14 })
-                   (AnnListItem
-                    [])
-                   (EpaComments
-                    [])) { mod185.hs:3:8-14 })
+      (EpAnn
+       (EpaSpan { mod185.hs:3:8-14 })
+       (AnnListItem
+        [])
+       (EpaComments
+        []))
       {ModuleName: Prelude})
      (NoRawPkgQual)
      (NotBoot)
@@ -61,45 +61,45 @@
      (Nothing)
      (Nothing)))]
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { mod185.hs:5:1-24 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { mod185.hs:5:1-24 })
+    (EpAnn
+     (EpaSpan { mod185.hs:5:1-24 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { mod185.hs:5:1-4 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { mod185.hs:5:1-4 })
+       (EpAnn
+        (EpaSpan { mod185.hs:5:1-4 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: main}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { mod185.hs:5:1-24 })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { mod185.hs:5:1-24 })
+        (EpAnn
+         (EpaSpan { mod185.hs:5:1-24 })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { mod185.hs:5:1-24 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { mod185.hs:5:1-24 })
+          (EpAnn
+           (EpaSpan { mod185.hs:5:1-24 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { mod185.hs:5:1-24 })
@@ -108,12 +108,12 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { mod185.hs:5:1-4 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { mod185.hs:5:1-4 })
+             (EpAnn
+              (EpaSpan { mod185.hs:5:1-4 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: main}))
             (Prefix)
@@ -123,13 +123,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { mod185.hs:5:6-24 })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { mod185.hs:5:6-24 })
+              (EpAnn
+               (EpaSpan { mod185.hs:5:6-24 })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { mod185.hs:5:6-24 })
@@ -140,23 +138,25 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { mod185.hs:5:8-24 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { mod185.hs:5:8-24 })
+                (EpAnn
+                 (EpaSpan { mod185.hs:5:8-24 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsVar
                  (NoExtField)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { mod185.hs:5:8-24 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { mod185.hs:5:8-24 })
+                  (EpAnn
+                   (EpaSpan { mod185.hs:5:8-24 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Qual
                    {ModuleName: Prelude}
                    {OccName: undefined}))))))]
             (EmptyLocalBinds
              (NoExtField)))))])))))]))
+
+
diff --git a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
index 866776643b6b..a43f159b2882 100644
--- a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
@@ -24,21 +24,21 @@
    (Nothing))
   (Just
    (L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpParsedAst.hs:4:8-20 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpParsedAst.hs:4:8-20 })
+    (EpAnn
+     (EpaSpan { DumpParsedAst.hs:4:8-20 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     {ModuleName: DumpParsedAst}))
   (Nothing)
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpParsedAst.hs:5:1-16 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpParsedAst.hs:5:1-16 })
+    (EpAnn
+     (EpaSpan { DumpParsedAst.hs:5:1-16 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (ImportDecl
      (XImportDeclPass
       (EpAnn
@@ -55,12 +55,12 @@
       (NoSourceText)
       (False))
      (L
-      (SrcSpanAnn (EpAnn
-                   (EpaSpan { DumpParsedAst.hs:5:8-16 })
-                   (AnnListItem
-                    [])
-                   (EpaComments
-                    [])) { DumpParsedAst.hs:5:8-16 })
+      (EpAnn
+       (EpaSpan { DumpParsedAst.hs:5:8-16 })
+       (AnnListItem
+        [])
+       (EpaComments
+        []))
       {ModuleName: Data.Kind})
      (NoRawPkgQual)
      (NotBoot)
@@ -69,12 +69,12 @@
      (Nothing)
      (Nothing)))]
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpParsedAst.hs:7:1-30 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpParsedAst.hs:7:1-30 })
+    (EpAnn
+     (EpaSpan { DumpParsedAst.hs:7:1-30 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (DataDecl
@@ -85,12 +85,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpParsedAst.hs:7:6-10 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { DumpParsedAst.hs:7:6-10 })
+       (EpAnn
+        (EpaSpan { DumpParsedAst.hs:7:6-10 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: Peano}))
       (HsQTvs
@@ -105,13 +105,13 @@
        (DataTypeCons
         (False)
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpParsedAst.hs:7:14-17 })
-                       (AnnListItem
-                        [(AddVbarAnn
-                          (EpaSpan { DumpParsedAst.hs:7:19 }))])
-                       (EpaComments
-                        [])) { DumpParsedAst.hs:7:14-17 })
+          (EpAnn
+           (EpaSpan { DumpParsedAst.hs:7:14-17 })
+           (AnnListItem
+            [(AddVbarAnn
+              (EpaSpan { DumpParsedAst.hs:7:19 }))])
+           (EpaComments
+            []))
           (ConDeclH98
            (EpAnn
             (EpaSpan { DumpParsedAst.hs:7:14-17 })
@@ -119,12 +119,12 @@
             (EpaComments
              []))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpParsedAst.hs:7:14-17 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { DumpParsedAst.hs:7:14-17 })
+            (EpAnn
+             (EpaSpan { DumpParsedAst.hs:7:14-17 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: Zero}))
            (False)
@@ -135,12 +135,12 @@
             [])
            (Nothing)))
         ,(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpParsedAst.hs:7:21-30 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpParsedAst.hs:7:21-30 })
+          (EpAnn
+           (EpaSpan { DumpParsedAst.hs:7:21-30 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (ConDeclH98
            (EpAnn
             (EpaSpan { DumpParsedAst.hs:7:21-30 })
@@ -148,12 +148,12 @@
             (EpaComments
              []))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpParsedAst.hs:7:21-24 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { DumpParsedAst.hs:7:21-24 })
+            (EpAnn
+             (EpaSpan { DumpParsedAst.hs:7:21-24 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: Succ}))
            (False)
@@ -171,12 +171,12 @@
                  (NoTokenLoc)
                  (HsNormalTok))))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:7:26-30 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:7:26-30 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:7:26-30 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsTyVar
                 (EpAnn
                  (EpaSpan { DumpParsedAst.hs:7:26-30 })
@@ -185,23 +185,23 @@
                   []))
                 (NotPromoted)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:7:26-30 })
-                              (NameAnnTrailing
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:7:26-30 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:7:26-30 })
+                  (NameAnnTrailing
+                   [])
+                  (EpaComments
+                   []))
                  (Unqual
                   {OccName: Peano})))))])
            (Nothing)))])
        []))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpParsedAst.hs:9:1-27 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpParsedAst.hs:9:1-27 })
+    (EpAnn
+     (EpaSpan { DumpParsedAst.hs:9:1-27 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (KindSigD
      (NoExtField)
      (StandaloneKindSig
@@ -212,32 +212,32 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpParsedAst.hs:9:6-11 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { DumpParsedAst.hs:9:6-11 })
+       (EpAnn
+        (EpaSpan { DumpParsedAst.hs:9:6-11 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: Length}))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpParsedAst.hs:9:16-27 })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { DumpParsedAst.hs:9:16-27 })
+       (EpAnn
+        (EpaSpan { DumpParsedAst.hs:9:16-27 })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsSig
         (NoExtField)
         (HsOuterImplicit
          (NoExtField))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { DumpParsedAst.hs:9:16-27 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { DumpParsedAst.hs:9:16-27 })
+         (EpAnn
+          (EpaSpan { DumpParsedAst.hs:9:16-27 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsFunTy
           (EpAnn
            (EpaSpan { DumpParsedAst.hs:9:16-27 })
@@ -250,12 +250,12 @@
              (EpaSpan { DumpParsedAst.hs:9:20-21 }))
             (HsNormalTok)))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpParsedAst.hs:9:16-18 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { DumpParsedAst.hs:9:16-18 })
+           (EpAnn
+            (EpaSpan { DumpParsedAst.hs:9:16-18 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsListTy
             (EpAnn
              (EpaSpan { DumpParsedAst.hs:9:16-18 })
@@ -266,12 +266,12 @@
              (EpaComments
               []))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAst.hs:9:17 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAst.hs:9:17 })
+             (EpAnn
+              (EpaSpan { DumpParsedAst.hs:9:17 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsTyVar
               (EpAnn
                (EpaSpan { DumpParsedAst.hs:9:17 })
@@ -280,21 +280,21 @@
                 []))
               (NotPromoted)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:9:17 })
-                            (NameAnnTrailing
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:9:17 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:9:17 })
+                (NameAnnTrailing
+                 [])
+                (EpaComments
+                 []))
                (Unqual
                 {OccName: k}))))))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpParsedAst.hs:9:23-27 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { DumpParsedAst.hs:9:23-27 })
+           (EpAnn
+            (EpaSpan { DumpParsedAst.hs:9:23-27 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsTyVar
             (EpAnn
              (EpaSpan { DumpParsedAst.hs:9:23-27 })
@@ -303,21 +303,21 @@
               []))
             (NotPromoted)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAst.hs:9:23-27 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAst.hs:9:23-27 })
+             (EpAnn
+              (EpaSpan { DumpParsedAst.hs:9:23-27 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: Peano})))))))))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpParsedAst.hs:(10,1)-(12,24) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpParsedAst.hs:(10,1)-(12,24) })
+    (EpAnn
+     (EpaSpan { DumpParsedAst.hs:(10,1)-(12,24) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (FamDecl
@@ -334,12 +334,12 @@
        (ClosedTypeFamily
         (Just
          [(L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpParsedAst.hs:11:3-36 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { DumpParsedAst.hs:11:3-36 })
+           (EpAnn
+            (EpaSpan { DumpParsedAst.hs:11:3-36 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (FamEqn
             (EpAnn
              (EpaSpan { DumpParsedAst.hs:11:3-36 })
@@ -347,24 +347,24 @@
              (EpaComments
               []))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAst.hs:11:3-8 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAst.hs:11:3-8 })
+             (EpAnn
+              (EpaSpan { DumpParsedAst.hs:11:3-8 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: Length}))
             (HsOuterImplicit
              (NoExtField))
             [(HsValArg
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:11:10-17 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:11:10-17 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:11:10-17 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsParTy
                 (EpAnn
                  (EpaSpan { DumpParsedAst.hs:11:10-17 })
@@ -375,12 +375,12 @@
                  (EpaComments
                   []))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:11:11-16 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:11:11-16 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:11:11-16 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsOpTy
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -389,12 +389,12 @@
                     []))
                   (NotPromoted)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpParsedAst.hs:11:11 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpParsedAst.hs:11:11 })
+                   (EpAnn
+                    (EpaSpan { DumpParsedAst.hs:11:11 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { DumpParsedAst.hs:11:11 })
@@ -403,30 +403,30 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpParsedAst.hs:11:11 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpParsedAst.hs:11:11 })
+                     (EpAnn
+                      (EpaSpan { DumpParsedAst.hs:11:11 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: a}))))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpParsedAst.hs:11:13 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { DumpParsedAst.hs:11:13 })
+                   (EpAnn
+                    (EpaSpan { DumpParsedAst.hs:11:13 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    (Exact
                     {Name: :}))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpParsedAst.hs:11:15-16 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpParsedAst.hs:11:15-16 })
+                   (EpAnn
+                    (EpaSpan { DumpParsedAst.hs:11:15-16 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { DumpParsedAst.hs:11:15-16 })
@@ -435,31 +435,31 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpParsedAst.hs:11:15-16 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpParsedAst.hs:11:15-16 })
+                     (EpAnn
+                      (EpaSpan { DumpParsedAst.hs:11:15-16 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: as})))))))))]
             (Prefix)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAst.hs:11:21-36 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAst.hs:11:21-36 })
+             (EpAnn
+              (EpaSpan { DumpParsedAst.hs:11:21-36 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsAppTy
               (NoExtField)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:11:21-24 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:11:21-24 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:11:21-24 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsTyVar
                 (EpAnn
                  (EpaSpan { DumpParsedAst.hs:11:21-24 })
@@ -468,21 +468,21 @@
                   []))
                 (NotPromoted)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:11:21-24 })
-                              (NameAnnTrailing
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:11:21-24 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:11:21-24 })
+                  (NameAnnTrailing
+                   [])
+                  (EpaComments
+                   []))
                  (Unqual
                   {OccName: Succ}))))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:11:26-36 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:11:26-36 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:11:26-36 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsParTy
                 (EpAnn
                  (EpaSpan { DumpParsedAst.hs:11:26-36 })
@@ -493,21 +493,21 @@
                  (EpaComments
                   []))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:11:27-35 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:11:27-35 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:11:27-35 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsAppTy
                   (NoExtField)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpParsedAst.hs:11:27-32 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpParsedAst.hs:11:27-32 })
+                   (EpAnn
+                    (EpaSpan { DumpParsedAst.hs:11:27-32 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { DumpParsedAst.hs:11:27-32 })
@@ -516,21 +516,21 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpParsedAst.hs:11:27-32 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpParsedAst.hs:11:27-32 })
+                     (EpAnn
+                      (EpaSpan { DumpParsedAst.hs:11:27-32 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: Length}))))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpParsedAst.hs:11:34-35 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpParsedAst.hs:11:34-35 })
+                   (EpAnn
+                    (EpaSpan { DumpParsedAst.hs:11:34-35 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { DumpParsedAst.hs:11:34-35 })
@@ -539,21 +539,21 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpParsedAst.hs:11:34-35 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpParsedAst.hs:11:34-35 })
+                     (EpAnn
+                      (EpaSpan { DumpParsedAst.hs:11:34-35 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: as}))))))))))))
          ,(L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpParsedAst.hs:12:3-24 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { DumpParsedAst.hs:12:3-24 })
+           (EpAnn
+            (EpaSpan { DumpParsedAst.hs:12:3-24 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (FamEqn
             (EpAnn
              (EpaSpan { DumpParsedAst.hs:12:3-24 })
@@ -561,24 +561,24 @@
              (EpaComments
               []))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAst.hs:12:3-8 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAst.hs:12:3-8 })
+             (EpAnn
+              (EpaSpan { DumpParsedAst.hs:12:3-8 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: Length}))
             (HsOuterImplicit
              (NoExtField))
             [(HsValArg
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:12:10-12 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:12:10-12 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:12:10-12 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsExplicitListTy
                 (EpAnn
                  (EpaSpan { DumpParsedAst.hs:12:10-12 })
@@ -591,12 +591,12 @@
                 [])))]
             (Prefix)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAst.hs:12:21-24 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAst.hs:12:21-24 })
+             (EpAnn
+              (EpaSpan { DumpParsedAst.hs:12:21-24 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsTyVar
               (EpAnn
                (EpaSpan { DumpParsedAst.hs:12:21-24 })
@@ -605,33 +605,33 @@
                 []))
               (NotPromoted)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:12:21-24 })
-                            (NameAnnTrailing
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:12:21-24 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:12:21-24 })
+                (NameAnnTrailing
+                 [])
+                (EpaComments
+                 []))
                (Unqual
                 {OccName: Zero}))))))]))
        (TopLevel)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpParsedAst.hs:10:13-18 })
-                     (NameAnnTrailing
-                      [])
-                     (EpaComments
-                      [])) { DumpParsedAst.hs:10:13-18 })
+        (EpAnn
+         (EpaSpan { DumpParsedAst.hs:10:13-18 })
+         (NameAnnTrailing
+          [])
+         (EpaComments
+          []))
         (Unqual
          {OccName: Length}))
        (HsQTvs
         (NoExtField)
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpParsedAst.hs:10:20-30 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpParsedAst.hs:10:20-30 })
+          (EpAnn
+           (EpaSpan { DumpParsedAst.hs:10:20-30 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (KindedTyVar
            (EpAnn
             (EpaSpan { DumpParsedAst.hs:10:20-30 })
@@ -642,21 +642,21 @@
              []))
            (HsBndrRequired)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpParsedAst.hs:10:21-22 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { DumpParsedAst.hs:10:21-22 })
+            (EpAnn
+             (EpaSpan { DumpParsedAst.hs:10:21-22 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: as}))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpParsedAst.hs:10:27-29 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpParsedAst.hs:10:27-29 })
+            (EpAnn
+             (EpaSpan { DumpParsedAst.hs:10:27-29 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsListTy
              (EpAnn
               (EpaSpan { DumpParsedAst.hs:10:27-29 })
@@ -667,12 +667,12 @@
               (EpaComments
                []))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpParsedAst.hs:10:28 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { DumpParsedAst.hs:10:28 })
+              (EpAnn
+               (EpaSpan { DumpParsedAst.hs:10:28 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { DumpParsedAst.hs:10:28 })
@@ -681,32 +681,30 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpParsedAst.hs:10:28 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { DumpParsedAst.hs:10:28 })
+                (EpAnn
+                 (EpaSpan { DumpParsedAst.hs:10:28 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: k}))))))))])
        (Prefix)
        (L
-        (SrcSpanAnn
-         (EpAnn
-          (EpaSpan { DumpParsedAst.hs:10:32-39 })
-          (NoEpAnns)
-          (EpaComments
-           []))
-         { DumpParsedAst.hs:10:32-39 })
+        (EpAnn
+         (EpaSpan { DumpParsedAst.hs:10:32-39 })
+         (NoEpAnns)
+         (EpaComments
+          []))
         (KindSig
          (NoExtField)
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpParsedAst.hs:10:35-39 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpParsedAst.hs:10:35-39 })
+          (EpAnn
+           (EpaSpan { DumpParsedAst.hs:10:35-39 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsTyVar
            (EpAnn
             (EpaSpan { DumpParsedAst.hs:10:35-39 })
@@ -715,22 +713,22 @@
              []))
            (NotPromoted)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpParsedAst.hs:10:35-39 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { DumpParsedAst.hs:10:35-39 })
+            (EpAnn
+             (EpaSpan { DumpParsedAst.hs:10:35-39 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: Peano}))))))
        (Nothing)))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpParsedAst.hs:15:1-29 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpParsedAst.hs:15:1-29 })
+    (EpAnn
+     (EpaSpan { DumpParsedAst.hs:15:1-29 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (DataDecl
@@ -741,24 +739,24 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpParsedAst.hs:15:6 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { DumpParsedAst.hs:15:6 })
+       (EpAnn
+        (EpaSpan { DumpParsedAst.hs:15:6 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: T}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { DumpParsedAst.hs:15:8 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { DumpParsedAst.hs:15:8 })
-         (UserTyVar
+         (EpAnn
+          (EpaSpan { DumpParsedAst.hs:15:8 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
+         (UserTyVar
           (EpAnn
            (EpaSpan { DumpParsedAst.hs:15:8 })
            []
@@ -766,21 +764,21 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpParsedAst.hs:15:8 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { DumpParsedAst.hs:15:8 })
+           (EpAnn
+            (EpaSpan { DumpParsedAst.hs:15:8 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: f}))))
        ,(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { DumpParsedAst.hs:15:10-17 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { DumpParsedAst.hs:15:10-17 })
+         (EpAnn
+          (EpaSpan { DumpParsedAst.hs:15:10-17 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (KindedTyVar
           (EpAnn
            (EpaSpan { DumpParsedAst.hs:15:10-17 })
@@ -791,21 +789,21 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpParsedAst.hs:15:11 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { DumpParsedAst.hs:15:11 })
+           (EpAnn
+            (EpaSpan { DumpParsedAst.hs:15:11 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: a}))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpParsedAst.hs:15:16 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { DumpParsedAst.hs:15:16 })
+           (EpAnn
+            (EpaSpan { DumpParsedAst.hs:15:16 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsTyVar
             (EpAnn
              (EpaSpan { DumpParsedAst.hs:15:16 })
@@ -814,12 +812,12 @@
               []))
             (NotPromoted)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAst.hs:15:16 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAst.hs:15:16 })
+             (EpAnn
+              (EpaSpan { DumpParsedAst.hs:15:16 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: k}))))))])
       (Prefix)
@@ -831,12 +829,12 @@
        (DataTypeCons
         (False)
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpParsedAst.hs:15:21-29 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpParsedAst.hs:15:21-29 })
+          (EpAnn
+           (EpaSpan { DumpParsedAst.hs:15:21-29 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (ConDeclH98
            (EpAnn
             (EpaSpan { DumpParsedAst.hs:15:21-29 })
@@ -844,12 +842,12 @@
             (EpaComments
              []))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpParsedAst.hs:15:21-23 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { DumpParsedAst.hs:15:21-23 })
+            (EpAnn
+             (EpaSpan { DumpParsedAst.hs:15:21-23 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: MkT}))
            (False)
@@ -867,12 +865,12 @@
                  (NoTokenLoc)
                  (HsNormalTok))))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:15:25-29 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:15:25-29 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:15:25-29 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsParTy
                 (EpAnn
                  (EpaSpan { DumpParsedAst.hs:15:25-29 })
@@ -883,21 +881,21 @@
                  (EpaComments
                   []))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:15:26-28 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:15:26-28 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:15:26-28 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsAppTy
                   (NoExtField)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpParsedAst.hs:15:26 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpParsedAst.hs:15:26 })
+                   (EpAnn
+                    (EpaSpan { DumpParsedAst.hs:15:26 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { DumpParsedAst.hs:15:26 })
@@ -906,21 +904,21 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpParsedAst.hs:15:26 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpParsedAst.hs:15:26 })
+                     (EpAnn
+                      (EpaSpan { DumpParsedAst.hs:15:26 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: f}))))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpParsedAst.hs:15:28 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpParsedAst.hs:15:28 })
+                   (EpAnn
+                    (EpaSpan { DumpParsedAst.hs:15:28 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { DumpParsedAst.hs:15:28 })
@@ -929,23 +927,23 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpParsedAst.hs:15:28 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpParsedAst.hs:15:28 })
+                     (EpAnn
+                      (EpaSpan { DumpParsedAst.hs:15:28 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: a})))))))))])
            (Nothing)))])
        []))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpParsedAst.hs:17:1-35 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpParsedAst.hs:17:1-35 })
+    (EpAnn
+     (EpaSpan { DumpParsedAst.hs:17:1-35 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (KindSigD
      (NoExtField)
      (StandaloneKindSig
@@ -956,32 +954,32 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpParsedAst.hs:17:6-7 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { DumpParsedAst.hs:17:6-7 })
+       (EpAnn
+        (EpaSpan { DumpParsedAst.hs:17:6-7 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: F1}))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpParsedAst.hs:17:12-35 })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { DumpParsedAst.hs:17:12-35 })
+       (EpAnn
+        (EpaSpan { DumpParsedAst.hs:17:12-35 })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsSig
         (NoExtField)
         (HsOuterImplicit
          (NoExtField))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { DumpParsedAst.hs:17:12-35 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { DumpParsedAst.hs:17:12-35 })
+         (EpAnn
+          (EpaSpan { DumpParsedAst.hs:17:12-35 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsFunTy
           (EpAnn
            (EpaSpan { DumpParsedAst.hs:17:12-35 })
@@ -994,12 +992,12 @@
              (EpaSpan { DumpParsedAst.hs:17:14-15 }))
             (HsNormalTok)))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpParsedAst.hs:17:12 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { DumpParsedAst.hs:17:12 })
+           (EpAnn
+            (EpaSpan { DumpParsedAst.hs:17:12 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsTyVar
             (EpAnn
              (EpaSpan { DumpParsedAst.hs:17:12 })
@@ -1008,21 +1006,21 @@
               []))
             (NotPromoted)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAst.hs:17:12 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAst.hs:17:12 })
+             (EpAnn
+              (EpaSpan { DumpParsedAst.hs:17:12 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: k}))))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpParsedAst.hs:17:17-35 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { DumpParsedAst.hs:17:17-35 })
+           (EpAnn
+            (EpaSpan { DumpParsedAst.hs:17:17-35 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsFunTy
             (EpAnn
              (EpaSpan { DumpParsedAst.hs:17:17-35 })
@@ -1035,12 +1033,12 @@
                (EpaSpan { DumpParsedAst.hs:17:29-30 }))
               (HsNormalTok)))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAst.hs:17:17-27 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAst.hs:17:17-27 })
+             (EpAnn
+              (EpaSpan { DumpParsedAst.hs:17:17-27 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsParTy
               (EpAnn
                (EpaSpan { DumpParsedAst.hs:17:17-27 })
@@ -1051,12 +1049,12 @@
                (EpaComments
                 []))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:17:18-26 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:17:18-26 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:17:18-26 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsFunTy
                 (EpAnn
                  (EpaSpan { DumpParsedAst.hs:17:18-26 })
@@ -1069,12 +1067,12 @@
                    (EpaSpan { DumpParsedAst.hs:17:20-21 }))
                   (HsNormalTok)))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:17:18 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:17:18 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:17:18 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsTyVar
                   (EpAnn
                    (EpaSpan { DumpParsedAst.hs:17:18 })
@@ -1083,21 +1081,21 @@
                     []))
                   (NotPromoted)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpParsedAst.hs:17:18 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { DumpParsedAst.hs:17:18 })
+                   (EpAnn
+                    (EpaSpan { DumpParsedAst.hs:17:18 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    (Unqual
                     {OccName: k}))))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:17:23-26 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:17:23-26 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:17:23-26 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsTyVar
                   (EpAnn
                    (EpaSpan { DumpParsedAst.hs:17:23-26 })
@@ -1106,21 +1104,21 @@
                     []))
                   (NotPromoted)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpParsedAst.hs:17:23-26 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { DumpParsedAst.hs:17:23-26 })
+                   (EpAnn
+                    (EpaSpan { DumpParsedAst.hs:17:23-26 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    (Unqual
                     {OccName: Type}))))))))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAst.hs:17:32-35 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAst.hs:17:32-35 })
+             (EpAnn
+              (EpaSpan { DumpParsedAst.hs:17:32-35 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsTyVar
               (EpAnn
                (EpaSpan { DumpParsedAst.hs:17:32-35 })
@@ -1129,21 +1127,21 @@
                 []))
               (NotPromoted)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:17:32-35 })
-                            (NameAnnTrailing
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:17:32-35 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:17:32-35 })
+                (NameAnnTrailing
+                 [])
+                (EpaComments
+                 []))
                (Unqual
                 {OccName: Type})))))))))))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpParsedAst.hs:(18,1)-(19,30) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpParsedAst.hs:(18,1)-(19,30) })
+    (EpAnn
+     (EpaSpan { DumpParsedAst.hs:(18,1)-(19,30) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (FamDecl
@@ -1160,12 +1158,12 @@
        (ClosedTypeFamily
         (Just
          [(L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpParsedAst.hs:19:3-30 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { DumpParsedAst.hs:19:3-30 })
+           (EpAnn
+            (EpaSpan { DumpParsedAst.hs:19:3-30 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (FamEqn
             (EpAnn
              (EpaSpan { DumpParsedAst.hs:19:3-30 })
@@ -1173,12 +1171,12 @@
              (EpaComments
               []))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAst.hs:19:3-4 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAst.hs:19:3-4 })
+             (EpAnn
+              (EpaSpan { DumpParsedAst.hs:19:3-4 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: F1}))
             (HsOuterImplicit
@@ -1189,12 +1187,12 @@
                 (EpaSpan { DumpParsedAst.hs:19:6 }))
                (HsTok))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:19:7-11 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:19:7-11 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:19:7-11 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsTyVar
                 (EpAnn
                  (EpaSpan { DumpParsedAst.hs:19:7-11 })
@@ -1203,22 +1201,22 @@
                   []))
                 (NotPromoted)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:19:7-11 })
-                              (NameAnnTrailing
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:19:7-11 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:19:7-11 })
+                  (NameAnnTrailing
+                   [])
+                  (EpaComments
+                   []))
                  (Unqual
                   {OccName: Peano})))))
             ,(HsValArg
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:19:13 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:19:13 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:19:13 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsTyVar
                 (EpAnn
                  (EpaSpan { DumpParsedAst.hs:19:13 })
@@ -1227,22 +1225,22 @@
                   []))
                 (NotPromoted)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:19:13 })
-                              (NameAnnTrailing
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:19:13 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:19:13 })
+                  (NameAnnTrailing
+                   [])
+                  (EpaComments
+                   []))
                  (Unqual
                   {OccName: a})))))
             ,(HsValArg
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:19:15 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:19:15 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:19:15 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsTyVar
                 (EpAnn
                  (EpaSpan { DumpParsedAst.hs:19:15 })
@@ -1251,49 +1249,49 @@
                   []))
                 (NotPromoted)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:19:15 })
-                              (NameAnnTrailing
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:19:15 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:19:15 })
+                  (NameAnnTrailing
+                   [])
+                  (EpaComments
+                   []))
                  (Unqual
                   {OccName: f})))))]
             (Prefix)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAst.hs:19:19-30 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAst.hs:19:19-30 })
+             (EpAnn
+              (EpaSpan { DumpParsedAst.hs:19:19-30 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsAppTy
               (NoExtField)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:19:19-28 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:19:19-28 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:19:19-28 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsAppTy
                 (NoExtField)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:19:19-26 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:19:19-26 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:19:19-26 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsAppKindTy
                   (NoExtField)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpParsedAst.hs:19:19 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpParsedAst.hs:19:19 })
+                   (EpAnn
+                    (EpaSpan { DumpParsedAst.hs:19:19 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { DumpParsedAst.hs:19:19 })
@@ -1302,12 +1300,12 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpParsedAst.hs:19:19 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpParsedAst.hs:19:19 })
+                     (EpAnn
+                      (EpaSpan { DumpParsedAst.hs:19:19 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: T}))))
                   (L
@@ -1315,12 +1313,12 @@
                     (EpaSpan { DumpParsedAst.hs:19:21 }))
                    (HsTok))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpParsedAst.hs:19:22-26 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpParsedAst.hs:19:22-26 })
+                   (EpAnn
+                    (EpaSpan { DumpParsedAst.hs:19:22-26 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { DumpParsedAst.hs:19:22-26 })
@@ -1329,21 +1327,21 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpParsedAst.hs:19:22-26 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpParsedAst.hs:19:22-26 })
+                     (EpAnn
+                      (EpaSpan { DumpParsedAst.hs:19:22-26 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: Peano}))))))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:19:28 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:19:28 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:19:28 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsTyVar
                   (EpAnn
                    (EpaSpan { DumpParsedAst.hs:19:28 })
@@ -1352,21 +1350,21 @@
                     []))
                   (NotPromoted)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpParsedAst.hs:19:28 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { DumpParsedAst.hs:19:28 })
+                   (EpAnn
+                    (EpaSpan { DumpParsedAst.hs:19:28 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    (Unqual
                     {OccName: f}))))))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:19:30 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:19:30 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:19:30 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsTyVar
                 (EpAnn
                  (EpaSpan { DumpParsedAst.hs:19:30 })
@@ -1375,33 +1373,33 @@
                   []))
                 (NotPromoted)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:19:30 })
-                              (NameAnnTrailing
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:19:30 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:19:30 })
+                  (NameAnnTrailing
+                   [])
+                  (EpaComments
+                   []))
                  (Unqual
                   {OccName: a}))))))))]))
        (TopLevel)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpParsedAst.hs:18:13-14 })
-                     (NameAnnTrailing
-                      [])
-                     (EpaComments
-                      [])) { DumpParsedAst.hs:18:13-14 })
+        (EpAnn
+         (EpaSpan { DumpParsedAst.hs:18:13-14 })
+         (NameAnnTrailing
+          [])
+         (EpaComments
+          []))
         (Unqual
          {OccName: F1}))
        (HsQTvs
         (NoExtField)
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpParsedAst.hs:18:16-23 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpParsedAst.hs:18:16-23 })
+          (EpAnn
+           (EpaSpan { DumpParsedAst.hs:18:16-23 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (KindedTyVar
            (EpAnn
             (EpaSpan { DumpParsedAst.hs:18:16-23 })
@@ -1412,21 +1410,21 @@
              []))
            (HsBndrRequired)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpParsedAst.hs:18:17 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { DumpParsedAst.hs:18:17 })
+            (EpAnn
+             (EpaSpan { DumpParsedAst.hs:18:17 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: a}))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpParsedAst.hs:18:22 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpParsedAst.hs:18:22 })
+            (EpAnn
+             (EpaSpan { DumpParsedAst.hs:18:22 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { DumpParsedAst.hs:18:22 })
@@ -1435,21 +1433,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpParsedAst.hs:18:22 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { DumpParsedAst.hs:18:22 })
+              (EpAnn
+               (EpaSpan { DumpParsedAst.hs:18:22 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: k}))))))
         ,(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpParsedAst.hs:18:25-40 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpParsedAst.hs:18:25-40 })
+          (EpAnn
+           (EpaSpan { DumpParsedAst.hs:18:25-40 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (KindedTyVar
            (EpAnn
             (EpaSpan { DumpParsedAst.hs:18:25-40 })
@@ -1460,21 +1458,21 @@
              []))
            (HsBndrRequired)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpParsedAst.hs:18:26 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { DumpParsedAst.hs:18:26 })
+            (EpAnn
+             (EpaSpan { DumpParsedAst.hs:18:26 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: f}))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpParsedAst.hs:18:31-39 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpParsedAst.hs:18:31-39 })
+            (EpAnn
+             (EpaSpan { DumpParsedAst.hs:18:31-39 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsFunTy
              (EpAnn
               (EpaSpan { DumpParsedAst.hs:18:31-39 })
@@ -1487,12 +1485,12 @@
                 (EpaSpan { DumpParsedAst.hs:18:33-34 }))
                (HsNormalTok)))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpParsedAst.hs:18:31 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { DumpParsedAst.hs:18:31 })
+              (EpAnn
+               (EpaSpan { DumpParsedAst.hs:18:31 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { DumpParsedAst.hs:18:31 })
@@ -1501,21 +1499,21 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpParsedAst.hs:18:31 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { DumpParsedAst.hs:18:31 })
+                (EpAnn
+                 (EpaSpan { DumpParsedAst.hs:18:31 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: k}))))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpParsedAst.hs:18:36-39 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { DumpParsedAst.hs:18:36-39 })
+              (EpAnn
+               (EpaSpan { DumpParsedAst.hs:18:36-39 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { DumpParsedAst.hs:18:36-39 })
@@ -1524,32 +1522,30 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpParsedAst.hs:18:36-39 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { DumpParsedAst.hs:18:36-39 })
+                (EpAnn
+                 (EpaSpan { DumpParsedAst.hs:18:36-39 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: Type}))))))))])
        (Prefix)
        (L
-        (SrcSpanAnn
-         (EpAnn
-          (EpaSpan { DumpParsedAst.hs:18:42-48 })
-          (NoEpAnns)
-          (EpaComments
-           []))
-         { DumpParsedAst.hs:18:42-48 })
+        (EpAnn
+         (EpaSpan { DumpParsedAst.hs:18:42-48 })
+         (NoEpAnns)
+         (EpaComments
+          []))
         (KindSig
          (NoExtField)
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpParsedAst.hs:18:45-48 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpParsedAst.hs:18:45-48 })
+          (EpAnn
+           (EpaSpan { DumpParsedAst.hs:18:45-48 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsTyVar
            (EpAnn
             (EpaSpan { DumpParsedAst.hs:18:45-48 })
@@ -1558,22 +1554,22 @@
              []))
            (NotPromoted)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpParsedAst.hs:18:45-48 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { DumpParsedAst.hs:18:45-48 })
+            (EpAnn
+             (EpaSpan { DumpParsedAst.hs:18:45-48 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: Type}))))))
        (Nothing)))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpParsedAst.hs:21:1-33 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpParsedAst.hs:21:1-33 })
+    (EpAnn
+     (EpaSpan { DumpParsedAst.hs:21:1-33 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (FamDecl
@@ -1589,12 +1585,12 @@
        (DataFamily)
        (TopLevel)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpParsedAst.hs:21:13-15 })
-                     (NameAnnTrailing
-                      [])
-                     (EpaComments
-                      [])) { DumpParsedAst.hs:21:13-15 })
+        (EpAnn
+         (EpaSpan { DumpParsedAst.hs:21:13-15 })
+         (NameAnnTrailing
+          [])
+         (EpaComments
+          []))
         (Unqual
          {OccName: Nat}))
        (HsQTvs
@@ -1602,22 +1598,20 @@
         [])
        (Prefix)
        (L
-        (SrcSpanAnn
-         (EpAnn
-          (EpaSpan { DumpParsedAst.hs:21:17-33 })
-          (NoEpAnns)
-          (EpaComments
-           []))
-         { DumpParsedAst.hs:21:17-33 })
+        (EpAnn
+         (EpaSpan { DumpParsedAst.hs:21:17-33 })
+         (NoEpAnns)
+         (EpaComments
+          []))
         (KindSig
          (NoExtField)
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpParsedAst.hs:21:20-33 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpParsedAst.hs:21:20-33 })
+          (EpAnn
+           (EpaSpan { DumpParsedAst.hs:21:20-33 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsFunTy
            (EpAnn
             (EpaSpan { DumpParsedAst.hs:21:20-33 })
@@ -1630,12 +1624,12 @@
               (EpaSpan { DumpParsedAst.hs:21:22-23 }))
              (HsNormalTok)))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpParsedAst.hs:21:20 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpParsedAst.hs:21:20 })
+            (EpAnn
+             (EpaSpan { DumpParsedAst.hs:21:20 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { DumpParsedAst.hs:21:20 })
@@ -1644,21 +1638,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpParsedAst.hs:21:20 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { DumpParsedAst.hs:21:20 })
+              (EpAnn
+               (EpaSpan { DumpParsedAst.hs:21:20 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: k}))))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpParsedAst.hs:21:25-33 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpParsedAst.hs:21:25-33 })
+            (EpAnn
+             (EpaSpan { DumpParsedAst.hs:21:25-33 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsFunTy
              (EpAnn
               (EpaSpan { DumpParsedAst.hs:21:25-33 })
@@ -1671,12 +1665,12 @@
                 (EpaSpan { DumpParsedAst.hs:21:27-28 }))
                (HsNormalTok)))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpParsedAst.hs:21:25 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { DumpParsedAst.hs:21:25 })
+              (EpAnn
+               (EpaSpan { DumpParsedAst.hs:21:25 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { DumpParsedAst.hs:21:25 })
@@ -1685,21 +1679,21 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpParsedAst.hs:21:25 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { DumpParsedAst.hs:21:25 })
+                (EpAnn
+                 (EpaSpan { DumpParsedAst.hs:21:25 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: k}))))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpParsedAst.hs:21:30-33 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { DumpParsedAst.hs:21:30-33 })
+              (EpAnn
+               (EpaSpan { DumpParsedAst.hs:21:30-33 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { DumpParsedAst.hs:21:30-33 })
@@ -1708,22 +1702,22 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpParsedAst.hs:21:30-33 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { DumpParsedAst.hs:21:30-33 })
+                (EpAnn
+                 (EpaSpan { DumpParsedAst.hs:21:30-33 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: Type}))))))))))
        (Nothing)))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpParsedAst.hs:(22,1)-(23,45) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpParsedAst.hs:(22,1)-(23,45) })
+    (EpAnn
+     (EpaSpan { DumpParsedAst.hs:(22,1)-(23,45) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (InstD
      (NoExtField)
      (DataFamInstD
@@ -1739,24 +1733,24 @@
          (EpaComments
           []))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { DumpParsedAst.hs:22:18-20 })
-                      (NameAnnTrailing
-                       [])
-                      (EpaComments
-                       [])) { DumpParsedAst.hs:22:18-20 })
+         (EpAnn
+          (EpaSpan { DumpParsedAst.hs:22:18-20 })
+          (NameAnnTrailing
+           [])
+          (EpaComments
+           []))
          (Unqual
           {OccName: Nat}))
         (HsOuterImplicit
          (NoExtField))
         [(HsValArg
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpParsedAst.hs:22:22-37 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { DumpParsedAst.hs:22:22-37 })
+           (EpAnn
+            (EpaSpan { DumpParsedAst.hs:22:22-37 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsParTy
             (EpAnn
              (EpaSpan { DumpParsedAst.hs:22:22-37 })
@@ -1767,12 +1761,12 @@
              (EpaComments
               []))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAst.hs:22:23-36 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAst.hs:22:23-36 })
+             (EpAnn
+              (EpaSpan { DumpParsedAst.hs:22:23-36 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsKindSig
               (EpAnn
                (EpaSpan { DumpParsedAst.hs:22:23-36 })
@@ -1780,12 +1774,12 @@
                (EpaComments
                 []))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:22:23 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:22:23 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:22:23 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsTyVar
                 (EpAnn
                  (EpaSpan { DumpParsedAst.hs:22:23 })
@@ -1794,21 +1788,21 @@
                   []))
                 (NotPromoted)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:22:23 })
-                              (NameAnnTrailing
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:22:23 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:22:23 })
+                  (NameAnnTrailing
+                   [])
+                  (EpaComments
+                   []))
                  (Unqual
                   {OccName: a}))))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:22:28-36 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:22:28-36 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:22:28-36 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsFunTy
                 (EpAnn
                  (EpaSpan { DumpParsedAst.hs:22:28-36 })
@@ -1821,12 +1815,12 @@
                    (EpaSpan { DumpParsedAst.hs:22:30-31 }))
                   (HsNormalTok)))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:22:28 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:22:28 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:22:28 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsTyVar
                   (EpAnn
                    (EpaSpan { DumpParsedAst.hs:22:28 })
@@ -1835,21 +1829,21 @@
                     []))
                   (NotPromoted)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpParsedAst.hs:22:28 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { DumpParsedAst.hs:22:28 })
+                   (EpAnn
+                    (EpaSpan { DumpParsedAst.hs:22:28 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    (Unqual
                     {OccName: k}))))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:22:33-36 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:22:33-36 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:22:33-36 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsTyVar
                   (EpAnn
                    (EpaSpan { DumpParsedAst.hs:22:33-36 })
@@ -1858,12 +1852,12 @@
                     []))
                   (NotPromoted)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpParsedAst.hs:22:33-36 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { DumpParsedAst.hs:22:33-36 })
+                   (EpAnn
+                    (EpaSpan { DumpParsedAst.hs:22:33-36 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    (Unqual
                     {OccName: Type})))))))))))]
         (Prefix)
@@ -1873,12 +1867,12 @@
          (Nothing)
          (Just
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpParsedAst.hs:22:42-60 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { DumpParsedAst.hs:22:42-60 })
+           (EpAnn
+            (EpaSpan { DumpParsedAst.hs:22:42-60 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsFunTy
             (EpAnn
              (EpaSpan { DumpParsedAst.hs:22:42-60 })
@@ -1891,12 +1885,12 @@
                (EpaSpan { DumpParsedAst.hs:22:54-55 }))
               (HsNormalTok)))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAst.hs:22:42-52 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAst.hs:22:42-52 })
+             (EpAnn
+              (EpaSpan { DumpParsedAst.hs:22:42-52 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsParTy
               (EpAnn
                (EpaSpan { DumpParsedAst.hs:22:42-52 })
@@ -1907,12 +1901,12 @@
                (EpaComments
                 []))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:22:43-51 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:22:43-51 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:22:43-51 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsFunTy
                 (EpAnn
                  (EpaSpan { DumpParsedAst.hs:22:43-51 })
@@ -1925,12 +1919,12 @@
                    (EpaSpan { DumpParsedAst.hs:22:45-46 }))
                   (HsNormalTok)))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:22:43 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:22:43 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:22:43 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsTyVar
                   (EpAnn
                    (EpaSpan { DumpParsedAst.hs:22:43 })
@@ -1939,21 +1933,21 @@
                     []))
                   (NotPromoted)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpParsedAst.hs:22:43 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { DumpParsedAst.hs:22:43 })
+                   (EpAnn
+                    (EpaSpan { DumpParsedAst.hs:22:43 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    (Unqual
                     {OccName: k}))))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:22:48-51 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:22:48-51 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:22:48-51 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsTyVar
                   (EpAnn
                    (EpaSpan { DumpParsedAst.hs:22:48-51 })
@@ -1962,21 +1956,21 @@
                     []))
                   (NotPromoted)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpParsedAst.hs:22:48-51 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { DumpParsedAst.hs:22:48-51 })
+                   (EpAnn
+                    (EpaSpan { DumpParsedAst.hs:22:48-51 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    (Unqual
                     {OccName: Type}))))))))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAst.hs:22:57-60 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAst.hs:22:57-60 })
+             (EpAnn
+              (EpaSpan { DumpParsedAst.hs:22:57-60 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsTyVar
               (EpAnn
                (EpaSpan { DumpParsedAst.hs:22:57-60 })
@@ -1985,22 +1979,22 @@
                 []))
               (NotPromoted)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:22:57-60 })
-                            (NameAnnTrailing
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:22:57-60 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:22:57-60 })
+                (NameAnnTrailing
+                 [])
+                (EpaComments
+                 []))
                (Unqual
                 {OccName: Type})))))))
          (NewTypeCon
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpParsedAst.hs:23:3-45 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { DumpParsedAst.hs:23:3-45 })
+           (EpAnn
+            (EpaSpan { DumpParsedAst.hs:23:3-45 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (ConDeclGADT
             (EpAnn
              (EpaSpan { DumpParsedAst.hs:23:3-45 })
@@ -2009,12 +2003,12 @@
               []))
             (:|
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpParsedAst.hs:23:3-5 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { DumpParsedAst.hs:23:3-5 })
+              (EpAnn
+               (EpaSpan { DumpParsedAst.hs:23:3-5 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: Nat}))
              [])
@@ -2023,12 +2017,12 @@
               (EpaSpan { DumpParsedAst.hs:23:7-8 }))
              (HsNormalTok))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAst.hs:23:10-45 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAst.hs:23:10-45 })
+             (EpAnn
+              (EpaSpan { DumpParsedAst.hs:23:10-45 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsOuterImplicit
               (NoExtField)))
             (Nothing)
@@ -2040,12 +2034,12 @@
                   (EpaSpan { DumpParsedAst.hs:23:36-37 }))
                  (HsNormalTok)))
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpParsedAst.hs:23:10-34 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpParsedAst.hs:23:10-34 })
+                (EpAnn
+                 (EpaSpan { DumpParsedAst.hs:23:10-34 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsParTy
                  (EpAnn
                   (EpaSpan { DumpParsedAst.hs:23:10-34 })
@@ -2056,12 +2050,12 @@
                   (EpaComments
                    []))
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpParsedAst.hs:23:11-33 })
-                               (AnnListItem
-                                [])
-                               (EpaComments
-                                [])) { DumpParsedAst.hs:23:11-33 })
+                  (EpAnn
+                   (EpaSpan { DumpParsedAst.hs:23:11-33 })
+                   (AnnListItem
+                    [])
+                   (EpaComments
+                    []))
                   (HsForAllTy
                    (NoExtField)
                    (HsForAllInvis
@@ -2073,12 +2067,12 @@
                      (EpaComments
                       []))
                     [(L
-                      (SrcSpanAnn (EpAnn
-                                   (EpaSpan { DumpParsedAst.hs:23:18-19 })
-                                   (AnnListItem
-                                    [])
-                                   (EpaComments
-                                    [])) { DumpParsedAst.hs:23:18-19 })
+                      (EpAnn
+                       (EpaSpan { DumpParsedAst.hs:23:18-19 })
+                       (AnnListItem
+                        [])
+                       (EpaComments
+                        []))
                       (UserTyVar
                        (EpAnn
                         (EpaSpan { DumpParsedAst.hs:23:18-19 })
@@ -2087,21 +2081,21 @@
                          []))
                        (SpecifiedSpec)
                        (L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpParsedAst.hs:23:18-19 })
-                                     (NameAnnTrailing
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpParsedAst.hs:23:18-19 })
+                        (EpAnn
+                         (EpaSpan { DumpParsedAst.hs:23:18-19 })
+                         (NameAnnTrailing
+                          [])
+                         (EpaComments
+                          []))
                         (Unqual
                          {OccName: xx}))))])
                    (L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { DumpParsedAst.hs:23:22-33 })
-                                 (AnnListItem
-                                  [])
-                                 (EpaComments
-                                  [])) { DumpParsedAst.hs:23:22-33 })
+                    (EpAnn
+                     (EpaSpan { DumpParsedAst.hs:23:22-33 })
+                     (AnnListItem
+                      [])
+                     (EpaComments
+                      []))
                     (HsFunTy
                      (EpAnn
                       (EpaSpan { DumpParsedAst.hs:23:22-33 })
@@ -2114,21 +2108,21 @@
                         (EpaSpan { DumpParsedAst.hs:23:27-28 }))
                        (HsNormalTok)))
                      (L
-                      (SrcSpanAnn (EpAnn
-                                   (EpaSpan { DumpParsedAst.hs:23:22-25 })
-                                   (AnnListItem
-                                    [])
-                                   (EpaComments
-                                    [])) { DumpParsedAst.hs:23:22-25 })
+                      (EpAnn
+                       (EpaSpan { DumpParsedAst.hs:23:22-25 })
+                       (AnnListItem
+                        [])
+                       (EpaComments
+                        []))
                       (HsAppTy
                        (NoExtField)
                        (L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpParsedAst.hs:23:22 })
-                                     (AnnListItem
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpParsedAst.hs:23:22 })
+                        (EpAnn
+                         (EpaSpan { DumpParsedAst.hs:23:22 })
+                         (AnnListItem
+                          [])
+                         (EpaComments
+                          []))
                         (HsTyVar
                          (EpAnn
                           (EpaSpan { DumpParsedAst.hs:23:22 })
@@ -2137,21 +2131,21 @@
                            []))
                          (NotPromoted)
                          (L
-                          (SrcSpanAnn (EpAnn
-                                       (EpaSpan { DumpParsedAst.hs:23:22 })
-                                       (NameAnnTrailing
-                                        [])
-                                       (EpaComments
-                                        [])) { DumpParsedAst.hs:23:22 })
+                          (EpAnn
+                           (EpaSpan { DumpParsedAst.hs:23:22 })
+                           (NameAnnTrailing
+                            [])
+                           (EpaComments
+                            []))
                           (Unqual
                            {OccName: f}))))
                        (L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpParsedAst.hs:23:24-25 })
-                                     (AnnListItem
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpParsedAst.hs:23:24-25 })
+                        (EpAnn
+                         (EpaSpan { DumpParsedAst.hs:23:24-25 })
+                         (AnnListItem
+                          [])
+                         (EpaComments
+                          []))
                         (HsTyVar
                          (EpAnn
                           (EpaSpan { DumpParsedAst.hs:23:24-25 })
@@ -2160,30 +2154,30 @@
                            []))
                          (NotPromoted)
                          (L
-                          (SrcSpanAnn (EpAnn
-                                       (EpaSpan { DumpParsedAst.hs:23:24-25 })
-                                       (NameAnnTrailing
-                                        [])
-                                       (EpaComments
-                                        [])) { DumpParsedAst.hs:23:24-25 })
+                          (EpAnn
+                           (EpaSpan { DumpParsedAst.hs:23:24-25 })
+                           (NameAnnTrailing
+                            [])
+                           (EpaComments
+                            []))
                           (Unqual
                            {OccName: xx}))))))
                      (L
-                      (SrcSpanAnn (EpAnn
-                                   (EpaSpan { DumpParsedAst.hs:23:30-33 })
-                                   (AnnListItem
-                                    [])
-                                   (EpaComments
-                                    [])) { DumpParsedAst.hs:23:30-33 })
+                      (EpAnn
+                       (EpaSpan { DumpParsedAst.hs:23:30-33 })
+                       (AnnListItem
+                        [])
+                       (EpaComments
+                        []))
                       (HsAppTy
                        (NoExtField)
                        (L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpParsedAst.hs:23:30 })
-                                     (AnnListItem
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpParsedAst.hs:23:30 })
+                        (EpAnn
+                         (EpaSpan { DumpParsedAst.hs:23:30 })
+                         (AnnListItem
+                          [])
+                         (EpaComments
+                          []))
                         (HsTyVar
                          (EpAnn
                           (EpaSpan { DumpParsedAst.hs:23:30 })
@@ -2192,21 +2186,21 @@
                            []))
                          (NotPromoted)
                          (L
-                          (SrcSpanAnn (EpAnn
-                                       (EpaSpan { DumpParsedAst.hs:23:30 })
-                                       (NameAnnTrailing
-                                        [])
-                                       (EpaComments
-                                        [])) { DumpParsedAst.hs:23:30 })
+                          (EpAnn
+                           (EpaSpan { DumpParsedAst.hs:23:30 })
+                           (NameAnnTrailing
+                            [])
+                           (EpaComments
+                            []))
                           (Unqual
                            {OccName: g}))))
                        (L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpParsedAst.hs:23:32-33 })
-                                     (AnnListItem
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpParsedAst.hs:23:32-33 })
+                        (EpAnn
+                         (EpaSpan { DumpParsedAst.hs:23:32-33 })
+                         (AnnListItem
+                          [])
+                         (EpaComments
+                          []))
                         (HsTyVar
                          (EpAnn
                           (EpaSpan { DumpParsedAst.hs:23:32-33 })
@@ -2215,39 +2209,39 @@
                            []))
                          (NotPromoted)
                          (L
-                          (SrcSpanAnn (EpAnn
-                                       (EpaSpan { DumpParsedAst.hs:23:32-33 })
-                                       (NameAnnTrailing
-                                        [])
-                                       (EpaComments
-                                        [])) { DumpParsedAst.hs:23:32-33 })
+                          (EpAnn
+                           (EpaSpan { DumpParsedAst.hs:23:32-33 })
+                           (NameAnnTrailing
+                            [])
+                           (EpaComments
+                            []))
                           (Unqual
                            {OccName: xx})))))))))))))])
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAst.hs:23:39-45 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAst.hs:23:39-45 })
+             (EpAnn
+              (EpaSpan { DumpParsedAst.hs:23:39-45 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsAppTy
               (NoExtField)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:23:39-43 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:23:39-43 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:23:39-43 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsAppTy
                 (NoExtField)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:23:39-41 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:23:39-41 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:23:39-41 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsTyVar
                   (EpAnn
                    (EpaSpan { DumpParsedAst.hs:23:39-41 })
@@ -2256,21 +2250,21 @@
                     []))
                   (NotPromoted)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpParsedAst.hs:23:39-41 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { DumpParsedAst.hs:23:39-41 })
+                   (EpAnn
+                    (EpaSpan { DumpParsedAst.hs:23:39-41 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    (Unqual
                     {OccName: Nat}))))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:23:43 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:23:43 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:23:43 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsTyVar
                   (EpAnn
                    (EpaSpan { DumpParsedAst.hs:23:43 })
@@ -2279,21 +2273,21 @@
                     []))
                   (NotPromoted)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpParsedAst.hs:23:43 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { DumpParsedAst.hs:23:43 })
+                   (EpAnn
+                    (EpaSpan { DumpParsedAst.hs:23:43 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    (Unqual
                     {OccName: f}))))))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpParsedAst.hs:23:45 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpParsedAst.hs:23:45 })
+               (EpAnn
+                (EpaSpan { DumpParsedAst.hs:23:45 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsTyVar
                 (EpAnn
                  (EpaSpan { DumpParsedAst.hs:23:45 })
@@ -2302,56 +2296,56 @@
                   []))
                 (NotPromoted)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpParsedAst.hs:23:45 })
-                              (NameAnnTrailing
-                               [])
-                              (EpaComments
-                               [])) { DumpParsedAst.hs:23:45 })
+                 (EpAnn
+                  (EpaSpan { DumpParsedAst.hs:23:45 })
+                  (NameAnnTrailing
+                   [])
+                  (EpaComments
+                   []))
                  (Unqual
                   {OccName: g}))))))
             (Nothing))))
          []))))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpParsedAst.hs:25:1-23 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpParsedAst.hs:25:1-23 })
+    (EpAnn
+     (EpaSpan { DumpParsedAst.hs:25:1-23 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpParsedAst.hs:25:1-4 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { DumpParsedAst.hs:25:1-4 })
+       (EpAnn
+        (EpaSpan { DumpParsedAst.hs:25:1-4 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: main}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpParsedAst.hs:25:1-23 })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { DumpParsedAst.hs:25:1-23 })
+        (EpAnn
+         (EpaSpan { DumpParsedAst.hs:25:1-23 })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpParsedAst.hs:25:1-23 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpParsedAst.hs:25:1-23 })
+          (EpAnn
+           (EpaSpan { DumpParsedAst.hs:25:1-23 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { DumpParsedAst.hs:25:1-23 })
@@ -2360,12 +2354,12 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAst.hs:25:1-4 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAst.hs:25:1-4 })
+             (EpAnn
+              (EpaSpan { DumpParsedAst.hs:25:1-4 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: main}))
             (Prefix)
@@ -2375,13 +2369,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { DumpParsedAst.hs:25:6-23 })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { DumpParsedAst.hs:25:6-23 })
+              (EpAnn
+               (EpaSpan { DumpParsedAst.hs:25:6-23 })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { DumpParsedAst.hs:25:6-23 })
@@ -2392,12 +2384,12 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpParsedAst.hs:25:8-23 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpParsedAst.hs:25:8-23 })
+                (EpAnn
+                 (EpaSpan { DumpParsedAst.hs:25:8-23 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsApp
                  (EpAnn
                   (EpaSpan { DumpParsedAst.hs:25:8-23 })
@@ -2405,30 +2397,30 @@
                   (EpaComments
                    []))
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpParsedAst.hs:25:8-15 })
-                               (AnnListItem
-                                [])
-                               (EpaComments
-                                [])) { DumpParsedAst.hs:25:8-15 })
+                  (EpAnn
+                   (EpaSpan { DumpParsedAst.hs:25:8-15 })
+                   (AnnListItem
+                    [])
+                   (EpaComments
+                    []))
                   (HsVar
                    (NoExtField)
                    (L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { DumpParsedAst.hs:25:8-15 })
-                                 (NameAnnTrailing
-                                  [])
-                                 (EpaComments
-                                  [])) { DumpParsedAst.hs:25:8-15 })
+                    (EpAnn
+                     (EpaSpan { DumpParsedAst.hs:25:8-15 })
+                     (NameAnnTrailing
+                      [])
+                     (EpaComments
+                      []))
                     (Unqual
                      {OccName: putStrLn}))))
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpParsedAst.hs:25:17-23 })
-                               (AnnListItem
-                                [])
-                               (EpaComments
-                                [])) { DumpParsedAst.hs:25:17-23 })
+                  (EpAnn
+                   (EpaSpan { DumpParsedAst.hs:25:17-23 })
+                   (AnnListItem
+                    [])
+                   (EpaComments
+                    []))
                   (HsLit
                    (EpAnn
                     (EpaSpan { DumpParsedAst.hs:25:17-23 })
diff --git a/testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr b/testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr
index b0c9f27d78b2..eeda54cd0b71 100644
--- a/testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr
+++ b/testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr
@@ -27,7 +27,7 @@
        (EpaSpan { DumpParsedAstComments.hs:(2,1)-(4,4) })
        (EpaComment
         (EpaBlockComment
-         "{-/n  Block comment at the beginning/n  -}")
+         "{-\n  Block comment at the beginning\n  -}")
         { DumpParsedAstComments.hs:1:1-28 }))]
      []))
    (VirtualBraces
@@ -36,67 +36,66 @@
    (Nothing))
   (Just
    (L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpParsedAstComments.hs:5:8-28 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpParsedAstComments.hs:5:8-28 })
+    (EpAnn
+     (EpaSpan { DumpParsedAstComments.hs:5:8-28 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     {ModuleName: DumpParsedAstComments}))
   (Nothing)
   []
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpParsedAstComments.hs:9:1-7 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [(L
-                    (EpaSpan { DumpParsedAstComments.hs:7:1-20 })
-                    (EpaComment
-                     (EpaLineComment
-                      "-- comment 1 for bar")
-                     { DumpParsedAstComments.hs:5:30-34 }))
-                  ,(L
-                    (EpaSpan { DumpParsedAstComments.hs:8:1-20 })
-                    (EpaComment
-                     (EpaLineComment
-                      "-- comment 2 for bar")
-                     { DumpParsedAstComments.hs:7:1-20
-                        }))])) { DumpParsedAstComments.hs:9:1-7 })
+    (EpAnn
+     (EpaSpan { DumpParsedAstComments.hs:9:1-7 })
+     (AnnListItem
+      [])
+     (EpaComments
+      [(L
+        (EpaSpan { DumpParsedAstComments.hs:7:1-20 })
+        (EpaComment
+         (EpaLineComment
+          "-- comment 1 for bar")
+         { DumpParsedAstComments.hs:5:30-34 }))
+      ,(L
+        (EpaSpan { DumpParsedAstComments.hs:8:1-20 })
+        (EpaComment
+         (EpaLineComment
+          "-- comment 2 for bar")
+         { DumpParsedAstComments.hs:7:1-20 }))]))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpParsedAstComments.hs:9:1-3 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { DumpParsedAstComments.hs:9:1-3 })
+       (EpAnn
+        (EpaSpan { DumpParsedAstComments.hs:9:1-3 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: bar}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpParsedAstComments.hs:9:1-7 })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { DumpParsedAstComments.hs:9:1-7 })
+        (EpAnn
+         (EpaSpan { DumpParsedAstComments.hs:9:1-7 })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpParsedAstComments.hs:9:1-7 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpParsedAstComments.hs:9:1-7 })
+          (EpAnn
+           (EpaSpan { DumpParsedAstComments.hs:9:1-7 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { DumpParsedAstComments.hs:9:1-7 })
@@ -105,12 +104,12 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAstComments.hs:9:1-3 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAstComments.hs:9:1-3 })
+             (EpAnn
+              (EpaSpan { DumpParsedAstComments.hs:9:1-3 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: bar}))
             (Prefix)
@@ -120,13 +119,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { DumpParsedAstComments.hs:9:5-7 })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { DumpParsedAstComments.hs:9:5-7 })
+              (EpAnn
+               (EpaSpan { DumpParsedAstComments.hs:9:5-7 })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { DumpParsedAstComments.hs:9:5-7 })
@@ -137,12 +134,12 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpParsedAstComments.hs:9:7 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpParsedAstComments.hs:9:7 })
+                (EpAnn
+                 (EpaSpan { DumpParsedAstComments.hs:9:7 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsOverLit
                  (EpAnn
                   (EpaSpan { DumpParsedAstComments.hs:9:7 })
@@ -159,63 +156,62 @@
             (EmptyLocalBinds
              (NoExtField)))))])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpParsedAstComments.hs:(14,1)-(16,3) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [(L
-                    (EpaSpan { DumpParsedAstComments.hs:10:1-16 })
-                    (EpaComment
-                     (EpaLineComment
-                      "-- Other comment")
-                     { DumpParsedAstComments.hs:9:7 }))
-                  ,(L
-                    (EpaSpan { DumpParsedAstComments.hs:12:1-20 })
-                    (EpaComment
-                     (EpaLineComment
-                      "-- comment 1 for foo")
-                     { DumpParsedAstComments.hs:10:1-16 }))
-                  ,(L
-                    (EpaSpan { DumpParsedAstComments.hs:13:1-20 })
-                    (EpaComment
-                     (EpaLineComment
-                      "-- comment 2 for foo")
-                     { DumpParsedAstComments.hs:12:1-20
-                        }))])) { DumpParsedAstComments.hs:(14,1)-(16,3) })
+    (EpAnn
+     (EpaSpan { DumpParsedAstComments.hs:(14,1)-(16,3) })
+     (AnnListItem
+      [])
+     (EpaComments
+      [(L
+        (EpaSpan { DumpParsedAstComments.hs:10:1-16 })
+        (EpaComment
+         (EpaLineComment
+          "-- Other comment")
+         { DumpParsedAstComments.hs:9:7 }))
+      ,(L
+        (EpaSpan { DumpParsedAstComments.hs:12:1-20 })
+        (EpaComment
+         (EpaLineComment
+          "-- comment 1 for foo")
+         { DumpParsedAstComments.hs:10:1-16 }))
+      ,(L
+        (EpaSpan { DumpParsedAstComments.hs:13:1-20 })
+        (EpaComment
+         (EpaLineComment
+          "-- comment 2 for foo")
+         { DumpParsedAstComments.hs:12:1-20 }))]))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpParsedAstComments.hs:14:1-3 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { DumpParsedAstComments.hs:14:1-3 })
+       (EpAnn
+        (EpaSpan { DumpParsedAstComments.hs:14:1-3 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: foo}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpParsedAstComments.hs:(14,1)-(16,3) })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { DumpParsedAstComments.hs:(14,1)-(16,3) })
+        (EpAnn
+         (EpaSpan { DumpParsedAstComments.hs:(14,1)-(16,3) })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpParsedAstComments.hs:(14,1)-(16,3) })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpParsedAstComments.hs:(14,1)-(16,3) })
+          (EpAnn
+           (EpaSpan { DumpParsedAstComments.hs:(14,1)-(16,3) })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { DumpParsedAstComments.hs:(14,1)-(16,3) })
@@ -224,12 +220,12 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAstComments.hs:14:1-3 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAstComments.hs:14:1-3 })
+             (EpAnn
+              (EpaSpan { DumpParsedAstComments.hs:14:1-3 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: foo}))
             (Prefix)
@@ -239,13 +235,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { DumpParsedAstComments.hs:(14,5)-(16,3) })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { DumpParsedAstComments.hs:(14,5)-(16,3) })
+              (EpAnn
+               (EpaSpan { DumpParsedAstComments.hs:(14,5)-(16,3) })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { DumpParsedAstComments.hs:(14,5)-(16,3) })
@@ -256,12 +250,12 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpParsedAstComments.hs:(14,7)-(16,3) })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpParsedAstComments.hs:(14,7)-(16,3) })
+                (EpAnn
+                 (EpaSpan { DumpParsedAstComments.hs:(14,7)-(16,3) })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsDo
                  (EpAnn
                   (EpaSpan { DumpParsedAstComments.hs:(14,7)-(16,3) })
@@ -282,33 +276,33 @@
                  (DoExpr
                   (Nothing))
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpParsedAstComments.hs:16:3 })
-                               (AnnList
-                                (Just
-                                 (EpaSpan { DumpParsedAstComments.hs:16:3 }))
-                                (Nothing)
-                                (Nothing)
-                                []
-                                [])
-                               (EpaComments
-                                [])) { DumpParsedAstComments.hs:16:3 })
+                  (EpAnn
+                   (EpaSpan { DumpParsedAstComments.hs:16:3 })
+                   (AnnList
+                    (Just
+                     (EpaSpan { DumpParsedAstComments.hs:16:3 }))
+                    (Nothing)
+                    (Nothing)
+                    []
+                    [])
+                   (EpaComments
+                    []))
                   [(L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { DumpParsedAstComments.hs:16:3 })
-                                 (AnnListItem
-                                  [])
-                                 (EpaComments
-                                  [])) { DumpParsedAstComments.hs:16:3 })
+                    (EpAnn
+                     (EpaSpan { DumpParsedAstComments.hs:16:3 })
+                     (AnnListItem
+                      [])
+                     (EpaComments
+                      []))
                     (BodyStmt
                      (NoExtField)
                      (L
-                      (SrcSpanAnn (EpAnn
-                                   (EpaSpan { DumpParsedAstComments.hs:16:3 })
-                                   (AnnListItem
-                                    [])
-                                   (EpaComments
-                                    [])) { DumpParsedAstComments.hs:16:3 })
+                      (EpAnn
+                       (EpaSpan { DumpParsedAstComments.hs:16:3 })
+                       (AnnListItem
+                        [])
+                       (EpaComments
+                        []))
                       (HsOverLit
                        (EpAnn
                         (EpaSpan { DumpParsedAstComments.hs:16:3 })
@@ -327,51 +321,50 @@
             (EmptyLocalBinds
              (NoExtField)))))])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpParsedAstComments.hs:19:1-23 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [(L
-                    (EpaSpan { DumpParsedAstComments.hs:18:1-20 })
-                    (EpaComment
-                     (EpaLineComment
-                      "-- | Haddock comment")
-                     { DumpParsedAstComments.hs:16:3
-                        }))])) { DumpParsedAstComments.hs:19:1-23 })
+    (EpAnn
+     (EpaSpan { DumpParsedAstComments.hs:19:1-23 })
+     (AnnListItem
+      [])
+     (EpaComments
+      [(L
+        (EpaSpan { DumpParsedAstComments.hs:18:1-20 })
+        (EpaComment
+         (EpaLineComment
+          "-- | Haddock comment")
+         { DumpParsedAstComments.hs:16:3 }))]))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpParsedAstComments.hs:19:1-4 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { DumpParsedAstComments.hs:19:1-4 })
+       (EpAnn
+        (EpaSpan { DumpParsedAstComments.hs:19:1-4 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: main}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpParsedAstComments.hs:19:1-23 })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { DumpParsedAstComments.hs:19:1-23 })
+        (EpAnn
+         (EpaSpan { DumpParsedAstComments.hs:19:1-23 })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpParsedAstComments.hs:19:1-23 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpParsedAstComments.hs:19:1-23 })
+          (EpAnn
+           (EpaSpan { DumpParsedAstComments.hs:19:1-23 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { DumpParsedAstComments.hs:19:1-23 })
@@ -380,12 +373,12 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpParsedAstComments.hs:19:1-4 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpParsedAstComments.hs:19:1-4 })
+             (EpAnn
+              (EpaSpan { DumpParsedAstComments.hs:19:1-4 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: main}))
             (Prefix)
@@ -395,13 +388,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { DumpParsedAstComments.hs:19:6-23 })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { DumpParsedAstComments.hs:19:6-23 })
+              (EpAnn
+               (EpaSpan { DumpParsedAstComments.hs:19:6-23 })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { DumpParsedAstComments.hs:19:6-23 })
@@ -412,12 +403,12 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpParsedAstComments.hs:19:8-23 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpParsedAstComments.hs:19:8-23 })
+                (EpAnn
+                 (EpaSpan { DumpParsedAstComments.hs:19:8-23 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsApp
                  (EpAnn
                   (EpaSpan { DumpParsedAstComments.hs:19:8-23 })
@@ -425,30 +416,30 @@
                   (EpaComments
                    []))
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpParsedAstComments.hs:19:8-15 })
-                               (AnnListItem
-                                [])
-                               (EpaComments
-                                [])) { DumpParsedAstComments.hs:19:8-15 })
+                  (EpAnn
+                   (EpaSpan { DumpParsedAstComments.hs:19:8-15 })
+                   (AnnListItem
+                    [])
+                   (EpaComments
+                    []))
                   (HsVar
                    (NoExtField)
                    (L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { DumpParsedAstComments.hs:19:8-15 })
-                                 (NameAnnTrailing
-                                  [])
-                                 (EpaComments
-                                  [])) { DumpParsedAstComments.hs:19:8-15 })
+                    (EpAnn
+                     (EpaSpan { DumpParsedAstComments.hs:19:8-15 })
+                     (NameAnnTrailing
+                      [])
+                     (EpaComments
+                      []))
                     (Unqual
                      {OccName: putStrLn}))))
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpParsedAstComments.hs:19:17-23 })
-                               (AnnListItem
-                                [])
-                               (EpaComments
-                                [])) { DumpParsedAstComments.hs:19:17-23 })
+                  (EpAnn
+                   (EpaSpan { DumpParsedAstComments.hs:19:17-23 })
+                   (AnnListItem
+                    [])
+                   (EpaComments
+                    []))
                   (HsLit
                    (EpAnn
                     (EpaSpan { DumpParsedAstComments.hs:19:17-23 })
@@ -459,4 +450,6 @@
                     (SourceText "hello")
                     {FastString: "hello"})))))))]
             (EmptyLocalBinds
-             (NoExtField)))))])))))]))
\ No newline at end of file
+             (NoExtField)))))])))))]))
+
+
diff --git a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
index d6afe02450d4..4e67f0be7b26 100644
--- a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
@@ -11,43 +11,43 @@
        (NonRecursive)
        {Bag(LocatedA (HsBind Name)):
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpRenamedAst.hs:35:1-23 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpRenamedAst.hs:35:1-23 })
+          (EpAnn
+           (EpaSpan { DumpRenamedAst.hs:35:1-23 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (FunBind
            {NameSet:
             []}
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpRenamedAst.hs:35:1-4 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { DumpRenamedAst.hs:35:1-4 })
+            (EpAnn
+             (EpaSpan { DumpRenamedAst.hs:35:1-4 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             {Name: DumpRenamedAst.main})
            (MG
             (FromSource)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpRenamedAst.hs:35:1-23 })
-                          (AnnList
-                           (Nothing)
-                           (Nothing)
-                           (Nothing)
-                           []
-                           [])
-                          (EpaComments
-                           [])) { DumpRenamedAst.hs:35:1-23 })
+             (EpAnn
+              (EpaSpan { DumpRenamedAst.hs:35:1-23 })
+              (AnnList
+               (Nothing)
+               (Nothing)
+               (Nothing)
+               []
+               [])
+              (EpaComments
+               []))
              [(L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpRenamedAst.hs:35:1-23 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpRenamedAst.hs:35:1-23 })
+               (EpAnn
+                (EpaSpan { DumpRenamedAst.hs:35:1-23 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (Match
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -56,12 +56,12 @@
                   []))
                 (FunRhs
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpRenamedAst.hs:35:1-4 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { DumpRenamedAst.hs:35:1-4 })
+                  (EpAnn
+                   (EpaSpan { DumpRenamedAst.hs:35:1-4 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   {Name: DumpRenamedAst.main})
                  (Prefix)
                  (NoSrcStrict))
@@ -70,13 +70,11 @@
                  (EpaComments
                   [])
                  [(L
-                   (SrcSpanAnn
-                    (EpAnn
-                     (EpaSpan { DumpRenamedAst.hs:35:6-23 })
-                     (NoEpAnns)
-                     (EpaComments
-                      []))
-                    { DumpRenamedAst.hs:35:6-23 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:35:6-23 })
+                    (NoEpAnns)
+                    (EpaComments
+                     []))
                    (GRHS
                     (EpAnn
                      (EpaDelta (SameLine 0) [])
@@ -87,12 +85,12 @@
                       []))
                     []
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpRenamedAst.hs:35:8-23 })
-                                  (AnnListItem
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpRenamedAst.hs:35:8-23 })
+                     (EpAnn
+                      (EpaSpan { DumpRenamedAst.hs:35:8-23 })
+                      (AnnListItem
+                       [])
+                      (EpaComments
+                       []))
                      (HsApp
                       (EpAnn
                        (EpaSpan { DumpRenamedAst.hs:35:8-23 })
@@ -100,29 +98,29 @@
                        (EpaComments
                         []))
                       (L
-                       (SrcSpanAnn (EpAnn
-                                    (EpaSpan { DumpRenamedAst.hs:35:8-15 })
-                                    (AnnListItem
-                                     [])
-                                    (EpaComments
-                                     [])) { DumpRenamedAst.hs:35:8-15 })
+                       (EpAnn
+                        (EpaSpan { DumpRenamedAst.hs:35:8-15 })
+                        (AnnListItem
+                         [])
+                        (EpaComments
+                         []))
                        (HsVar
                         (NoExtField)
                         (L
-                         (SrcSpanAnn (EpAnn
-                                      (EpaSpan { DumpRenamedAst.hs:35:8-15 })
-                                      (NameAnnTrailing
-                                       [])
-                                      (EpaComments
-                                       [])) { DumpRenamedAst.hs:35:8-15 })
+                         (EpAnn
+                          (EpaSpan { DumpRenamedAst.hs:35:8-15 })
+                          (NameAnnTrailing
+                           [])
+                          (EpaComments
+                           []))
                          {Name: System.IO.putStrLn})))
                       (L
-                       (SrcSpanAnn (EpAnn
-                                    (EpaSpan { DumpRenamedAst.hs:35:17-23 })
-                                    (AnnListItem
-                                     [])
-                                    (EpaComments
-                                     [])) { DumpRenamedAst.hs:35:17-23 })
+                       (EpAnn
+                        (EpaSpan { DumpRenamedAst.hs:35:17-23 })
+                        (AnnListItem
+                         [])
+                        (EpaComments
+                         []))
                        (HsLit
                         (EpAnn
                          (EpaSpan { DumpRenamedAst.hs:35:17-23 })
@@ -139,24 +137,24 @@
    [(TyClGroup
      (NoExtField)
      [(L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpRenamedAst.hs:9:1-30 })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { DumpRenamedAst.hs:9:1-30 })
+       (EpAnn
+        (EpaSpan { DumpRenamedAst.hs:9:1-30 })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (DataDecl
         (DataDeclRn
          (True)
          {NameSet:
           [{Name: DumpRenamedAst.Peano}]})
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { DumpRenamedAst.hs:9:6-10 })
-                      (NameAnnTrailing
-                       [])
-                      (EpaComments
-                       [])) { DumpRenamedAst.hs:9:6-10 })
+         (EpAnn
+          (EpaSpan { DumpRenamedAst.hs:9:6-10 })
+          (NameAnnTrailing
+           [])
+          (EpaComments
+           []))
          {Name: DumpRenamedAst.Peano})
         (HsQTvs
          []
@@ -170,13 +168,13 @@
          (DataTypeCons
           (False)
           [(L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpRenamedAst.hs:9:14-17 })
-                         (AnnListItem
-                          [(AddVbarAnn
-                            (EpaSpan { DumpRenamedAst.hs:9:19 }))])
-                         (EpaComments
-                          [])) { DumpRenamedAst.hs:9:14-17 })
+            (EpAnn
+             (EpaSpan { DumpRenamedAst.hs:9:14-17 })
+             (AnnListItem
+              [(AddVbarAnn
+                (EpaSpan { DumpRenamedAst.hs:9:19 }))])
+             (EpaComments
+              []))
             (ConDeclH98
              (EpAnn
               (EpaDelta (SameLine 0) [])
@@ -184,12 +182,12 @@
               (EpaComments
                []))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpRenamedAst.hs:9:14-17 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { DumpRenamedAst.hs:9:14-17 })
+              (EpAnn
+               (EpaSpan { DumpRenamedAst.hs:9:14-17 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               {Name: DumpRenamedAst.Zero})
              (False)
              []
@@ -199,12 +197,12 @@
               [])
              (Nothing)))
           ,(L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpRenamedAst.hs:9:21-30 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpRenamedAst.hs:9:21-30 })
+            (EpAnn
+             (EpaSpan { DumpRenamedAst.hs:9:21-30 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (ConDeclH98
              (EpAnn
               (EpaDelta (SameLine 0) [])
@@ -212,12 +210,12 @@
               (EpaComments
                []))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpRenamedAst.hs:9:21-24 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { DumpRenamedAst.hs:9:21-24 })
+              (EpAnn
+               (EpaSpan { DumpRenamedAst.hs:9:21-24 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               {Name: DumpRenamedAst.Succ})
              (False)
              []
@@ -234,12 +232,12 @@
                    (NoTokenLoc)
                    (HsNormalTok))))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:9:26-30 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:9:26-30 })
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:9:26-30 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsTyVar
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -248,12 +246,12 @@
                     []))
                   (NotPromoted)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:9:26-30 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:9:26-30 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:9:26-30 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    {Name: DumpRenamedAst.Peano}))))])
              (Nothing)))])
          [])))]
@@ -263,12 +261,12 @@
    ,(TyClGroup
      (NoExtField)
      [(L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpRenamedAst.hs:(12,1)-(14,24) })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { DumpRenamedAst.hs:(12,1)-(14,24) })
+       (EpAnn
+        (EpaSpan { DumpRenamedAst.hs:(12,1)-(14,24) })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (FamDecl
         (NoExtField)
         (FamilyDecl
@@ -280,12 +278,12 @@
          (ClosedTypeFamily
           (Just
            [(L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpRenamedAst.hs:13:3-36 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpRenamedAst.hs:13:3-36 })
+             (EpAnn
+              (EpaSpan { DumpRenamedAst.hs:13:3-36 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (FamEqn
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -293,24 +291,24 @@
                (EpaComments
                 []))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpRenamedAst.hs:13:3-8 })
-                            (NameAnnTrailing
-                             [])
-                            (EpaComments
-                             [])) { DumpRenamedAst.hs:13:3-8 })
+               (EpAnn
+                (EpaSpan { DumpRenamedAst.hs:13:3-8 })
+                (NameAnnTrailing
+                 [])
+                (EpaComments
+                 []))
                {Name: DumpRenamedAst.Length})
               (HsOuterImplicit
                [{Name: a}
                ,{Name: as}])
               [(HsValArg
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:13:10-17 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:13:10-17 })
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:13:10-17 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsParTy
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -321,12 +319,12 @@
                    (EpaComments
                     []))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:13:11-16 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:13:11-16 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:13:11-16 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsOpTy
                     (EpAnn
                      (EpaDelta (SameLine 0) [])
@@ -335,12 +333,12 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpRenamedAst.hs:13:11 })
-                                  (AnnListItem
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpRenamedAst.hs:13:11 })
+                     (EpAnn
+                      (EpaSpan { DumpRenamedAst.hs:13:11 })
+                      (AnnListItem
+                       [])
+                      (EpaComments
+                       []))
                      (HsTyVar
                       (EpAnn
                        (EpaDelta (SameLine 0) [])
@@ -349,28 +347,28 @@
                         []))
                       (NotPromoted)
                       (L
-                       (SrcSpanAnn (EpAnn
-                                    (EpaSpan { DumpRenamedAst.hs:13:11 })
-                                    (NameAnnTrailing
-                                     [])
-                                    (EpaComments
-                                     [])) { DumpRenamedAst.hs:13:11 })
+                       (EpAnn
+                        (EpaSpan { DumpRenamedAst.hs:13:11 })
+                        (NameAnnTrailing
+                         [])
+                        (EpaComments
+                         []))
                        {Name: a})))
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpRenamedAst.hs:13:13 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpRenamedAst.hs:13:13 })
+                     (EpAnn
+                      (EpaSpan { DumpRenamedAst.hs:13:13 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      {Name: :})
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpRenamedAst.hs:13:15-16 })
-                                  (AnnListItem
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpRenamedAst.hs:13:15-16 })
+                     (EpAnn
+                      (EpaSpan { DumpRenamedAst.hs:13:15-16 })
+                      (AnnListItem
+                       [])
+                      (EpaComments
+                       []))
                      (HsTyVar
                       (EpAnn
                        (EpaDelta (SameLine 0) [])
@@ -379,30 +377,30 @@
                         []))
                       (NotPromoted)
                       (L
-                       (SrcSpanAnn (EpAnn
-                                    (EpaSpan { DumpRenamedAst.hs:13:15-16 })
-                                    (NameAnnTrailing
-                                     [])
-                                    (EpaComments
-                                     [])) { DumpRenamedAst.hs:13:15-16 })
+                       (EpAnn
+                        (EpaSpan { DumpRenamedAst.hs:13:15-16 })
+                        (NameAnnTrailing
+                         [])
+                        (EpaComments
+                         []))
                        {Name: as}))))))))]
               (Prefix)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpRenamedAst.hs:13:21-36 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpRenamedAst.hs:13:21-36 })
+               (EpAnn
+                (EpaSpan { DumpRenamedAst.hs:13:21-36 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsAppTy
                 (NoExtField)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:13:21-24 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:13:21-24 })
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:13:21-24 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsTyVar
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -411,20 +409,20 @@
                     []))
                   (NotPromoted)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:13:21-24 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:13:21-24 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:13:21-24 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    {Name: DumpRenamedAst.Succ})))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:13:26-36 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:13:26-36 })
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:13:26-36 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsParTy
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -435,21 +433,21 @@
                    (EpaComments
                     []))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:13:27-35 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:13:27-35 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:13:27-35 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsAppTy
                     (NoExtField)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpRenamedAst.hs:13:27-32 })
-                                  (AnnListItem
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpRenamedAst.hs:13:27-32 })
+                     (EpAnn
+                      (EpaSpan { DumpRenamedAst.hs:13:27-32 })
+                      (AnnListItem
+                       [])
+                      (EpaComments
+                       []))
                      (HsTyVar
                       (EpAnn
                        (EpaDelta (SameLine 0) [])
@@ -458,20 +456,20 @@
                         []))
                       (NotPromoted)
                       (L
-                       (SrcSpanAnn (EpAnn
-                                    (EpaSpan { DumpRenamedAst.hs:13:27-32 })
-                                    (NameAnnTrailing
-                                     [])
-                                    (EpaComments
-                                     [])) { DumpRenamedAst.hs:13:27-32 })
+                       (EpAnn
+                        (EpaSpan { DumpRenamedAst.hs:13:27-32 })
+                        (NameAnnTrailing
+                         [])
+                        (EpaComments
+                         []))
                        {Name: DumpRenamedAst.Length})))
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpRenamedAst.hs:13:34-35 })
-                                  (AnnListItem
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpRenamedAst.hs:13:34-35 })
+                     (EpAnn
+                      (EpaSpan { DumpRenamedAst.hs:13:34-35 })
+                      (AnnListItem
+                       [])
+                      (EpaComments
+                       []))
                      (HsTyVar
                       (EpAnn
                        (EpaDelta (SameLine 0) [])
@@ -480,20 +478,20 @@
                         []))
                       (NotPromoted)
                       (L
-                       (SrcSpanAnn (EpAnn
-                                    (EpaSpan { DumpRenamedAst.hs:13:34-35 })
-                                    (NameAnnTrailing
-                                     [])
-                                    (EpaComments
-                                     [])) { DumpRenamedAst.hs:13:34-35 })
+                       (EpAnn
+                        (EpaSpan { DumpRenamedAst.hs:13:34-35 })
+                        (NameAnnTrailing
+                         [])
+                        (EpaComments
+                         []))
                        {Name: as})))))))))))
            ,(L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpRenamedAst.hs:14:3-24 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpRenamedAst.hs:14:3-24 })
+             (EpAnn
+              (EpaSpan { DumpRenamedAst.hs:14:3-24 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (FamEqn
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -501,35 +499,35 @@
                (EpaComments
                 []))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpRenamedAst.hs:14:3-8 })
-                            (NameAnnTrailing
-                             [])
-                            (EpaComments
-                             [])) { DumpRenamedAst.hs:14:3-8 })
+               (EpAnn
+                (EpaSpan { DumpRenamedAst.hs:14:3-8 })
+                (NameAnnTrailing
+                 [])
+                (EpaComments
+                 []))
                {Name: DumpRenamedAst.Length})
               (HsOuterImplicit
                [])
               [(HsValArg
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:14:10-12 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:14:10-12 })
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:14:10-12 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsExplicitListTy
                   (NoExtField)
                   (IsPromoted)
                   [])))]
               (Prefix)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpRenamedAst.hs:14:21-24 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpRenamedAst.hs:14:21-24 })
+               (EpAnn
+                (EpaSpan { DumpRenamedAst.hs:14:21-24 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsTyVar
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -538,31 +536,31 @@
                   []))
                 (NotPromoted)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:14:21-24 })
-                              (NameAnnTrailing
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:14:21-24 })
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:14:21-24 })
+                  (NameAnnTrailing
+                   [])
+                  (EpaComments
+                   []))
                  {Name: DumpRenamedAst.Zero})))))]))
          (TopLevel)
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpRenamedAst.hs:12:13-18 })
-                       (NameAnnTrailing
-                        [])
-                       (EpaComments
-                        [])) { DumpRenamedAst.hs:12:13-18 })
+          (EpAnn
+           (EpaSpan { DumpRenamedAst.hs:12:13-18 })
+           (NameAnnTrailing
+            [])
+           (EpaComments
+            []))
           {Name: DumpRenamedAst.Length})
          (HsQTvs
           [{Name: k}]
           [(L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpRenamedAst.hs:12:20-30 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpRenamedAst.hs:12:20-30 })
+            (EpAnn
+             (EpaSpan { DumpRenamedAst.hs:12:20-30 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (KindedTyVar
              (EpAnn
               (EpaSpan { DumpRenamedAst.hs:12:20-30 })
@@ -573,20 +571,20 @@
                []))
              (HsBndrRequired)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpRenamedAst.hs:12:21-22 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { DumpRenamedAst.hs:12:21-22 })
+              (EpAnn
+               (EpaSpan { DumpRenamedAst.hs:12:21-22 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               {Name: as})
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpRenamedAst.hs:12:27-29 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { DumpRenamedAst.hs:12:27-29 })
+              (EpAnn
+               (EpaSpan { DumpRenamedAst.hs:12:27-29 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsListTy
                (EpAnn
                 (EpaSpan { DumpRenamedAst.hs:12:27-29 })
@@ -597,12 +595,12 @@
                 (EpaComments
                  []))
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpRenamedAst.hs:12:28 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpRenamedAst.hs:12:28 })
+                (EpAnn
+                 (EpaSpan { DumpRenamedAst.hs:12:28 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsTyVar
                  (EpAnn
                   (EpaDelta (SameLine 0) [])
@@ -611,31 +609,29 @@
                    []))
                  (NotPromoted)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpRenamedAst.hs:12:28 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { DumpRenamedAst.hs:12:28 })
+                  (EpAnn
+                   (EpaSpan { DumpRenamedAst.hs:12:28 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   {Name: k})))))))])
          (Prefix)
          (L
-          (SrcSpanAnn
-           (EpAnn
-            (EpaSpan { DumpRenamedAst.hs:12:32-39 })
-            (NoEpAnns)
-            (EpaComments
-             []))
-           { DumpRenamedAst.hs:12:32-39 })
+          (EpAnn
+           (EpaSpan { DumpRenamedAst.hs:12:32-39 })
+           (NoEpAnns)
+           (EpaComments
+            []))
           (KindSig
            (NoExtField)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpRenamedAst.hs:12:35-39 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpRenamedAst.hs:12:35-39 })
+            (EpAnn
+             (EpaSpan { DumpRenamedAst.hs:12:35-39 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaDelta (SameLine 0) [])
@@ -644,50 +640,50 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpRenamedAst.hs:12:35-39 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { DumpRenamedAst.hs:12:35-39 })
+              (EpAnn
+               (EpaSpan { DumpRenamedAst.hs:12:35-39 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               {Name: DumpRenamedAst.Peano})))))
          (Nothing))))]
      []
      [(L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpRenamedAst.hs:11:1-27 })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { DumpRenamedAst.hs:11:1-27 })
+       (EpAnn
+        (EpaSpan { DumpRenamedAst.hs:11:1-27 })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (StandaloneKindSig
         (NoExtField)
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { DumpRenamedAst.hs:11:6-11 })
-                      (NameAnnTrailing
-                       [])
-                      (EpaComments
-                       [])) { DumpRenamedAst.hs:11:6-11 })
+         (EpAnn
+          (EpaSpan { DumpRenamedAst.hs:11:6-11 })
+          (NameAnnTrailing
+           [])
+          (EpaComments
+           []))
          {Name: DumpRenamedAst.Length})
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { DumpRenamedAst.hs:11:16-27 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { DumpRenamedAst.hs:11:16-27 })
-         (HsSig
+         (EpAnn
+          (EpaSpan { DumpRenamedAst.hs:11:16-27 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
+         (HsSig
           (NoExtField)
           (HsOuterImplicit
            [{Name: k}])
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpRenamedAst.hs:11:16-27 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { DumpRenamedAst.hs:11:16-27 })
+           (EpAnn
+            (EpaSpan { DumpRenamedAst.hs:11:16-27 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsFunTy
             (EpAnn
              (EpaSpan { DumpRenamedAst.hs:11:16-27 })
@@ -700,12 +696,12 @@
                (EpaSpan { DumpRenamedAst.hs:11:20-21 }))
               (HsNormalTok)))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpRenamedAst.hs:11:16-18 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpRenamedAst.hs:11:16-18 })
+             (EpAnn
+              (EpaSpan { DumpRenamedAst.hs:11:16-18 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsListTy
               (EpAnn
                (EpaSpan { DumpRenamedAst.hs:11:16-18 })
@@ -716,12 +712,12 @@
                (EpaComments
                 []))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpRenamedAst.hs:11:17 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpRenamedAst.hs:11:17 })
+               (EpAnn
+                (EpaSpan { DumpRenamedAst.hs:11:17 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsTyVar
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -730,20 +726,20 @@
                   []))
                 (NotPromoted)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:11:17 })
-                              (NameAnnTrailing
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:11:17 })
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:11:17 })
+                  (NameAnnTrailing
+                   [])
+                  (EpaComments
+                   []))
                  {Name: k})))))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpRenamedAst.hs:11:23-27 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpRenamedAst.hs:11:23-27 })
+             (EpAnn
+              (EpaSpan { DumpRenamedAst.hs:11:23-27 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsTyVar
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -752,23 +748,23 @@
                 []))
               (NotPromoted)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpRenamedAst.hs:11:23-27 })
-                            (NameAnnTrailing
-                             [])
-                            (EpaComments
-                             [])) { DumpRenamedAst.hs:11:23-27 })
+               (EpAnn
+                (EpaSpan { DumpRenamedAst.hs:11:23-27 })
+                (NameAnnTrailing
+                 [])
+                (EpaComments
+                 []))
                {Name: DumpRenamedAst.Peano})))))))))]
      [])
    ,(TyClGroup
      (NoExtField)
      [(L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpRenamedAst.hs:16:1-33 })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { DumpRenamedAst.hs:16:1-33 })
+       (EpAnn
+        (EpaSpan { DumpRenamedAst.hs:16:1-33 })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (FamDecl
         (NoExtField)
         (FamilyDecl
@@ -780,34 +776,32 @@
          (DataFamily)
          (TopLevel)
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpRenamedAst.hs:16:13-15 })
-                       (NameAnnTrailing
-                        [])
-                       (EpaComments
-                        [])) { DumpRenamedAst.hs:16:13-15 })
+          (EpAnn
+           (EpaSpan { DumpRenamedAst.hs:16:13-15 })
+           (NameAnnTrailing
+            [])
+           (EpaComments
+            []))
           {Name: DumpRenamedAst.Nat})
          (HsQTvs
           [{Name: k}]
           [])
          (Prefix)
          (L
-          (SrcSpanAnn
-           (EpAnn
-            (EpaSpan { DumpRenamedAst.hs:16:17-33 })
-            (NoEpAnns)
-            (EpaComments
-             []))
-           { DumpRenamedAst.hs:16:17-33 })
+          (EpAnn
+           (EpaSpan { DumpRenamedAst.hs:16:17-33 })
+           (NoEpAnns)
+           (EpaComments
+            []))
           (KindSig
            (NoExtField)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpRenamedAst.hs:16:20-33 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpRenamedAst.hs:16:20-33 })
+            (EpAnn
+             (EpaSpan { DumpRenamedAst.hs:16:20-33 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsFunTy
              (EpAnn
               (EpaSpan { DumpRenamedAst.hs:16:20-33 })
@@ -820,12 +814,12 @@
                 (EpaSpan { DumpRenamedAst.hs:16:22-23 }))
                (HsNormalTok)))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpRenamedAst.hs:16:20 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { DumpRenamedAst.hs:16:20 })
+              (EpAnn
+               (EpaSpan { DumpRenamedAst.hs:16:20 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaDelta (SameLine 0) [])
@@ -834,20 +828,20 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpRenamedAst.hs:16:20 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { DumpRenamedAst.hs:16:20 })
+                (EpAnn
+                 (EpaSpan { DumpRenamedAst.hs:16:20 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 {Name: k})))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpRenamedAst.hs:16:25-33 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { DumpRenamedAst.hs:16:25-33 })
+              (EpAnn
+               (EpaSpan { DumpRenamedAst.hs:16:25-33 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsFunTy
                (EpAnn
                 (EpaSpan { DumpRenamedAst.hs:16:25-33 })
@@ -860,12 +854,12 @@
                   (EpaSpan { DumpRenamedAst.hs:16:27-28 }))
                  (HsNormalTok)))
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpRenamedAst.hs:16:25 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpRenamedAst.hs:16:25 })
+                (EpAnn
+                 (EpaSpan { DumpRenamedAst.hs:16:25 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsTyVar
                  (EpAnn
                   (EpaDelta (SameLine 0) [])
@@ -874,20 +868,20 @@
                    []))
                  (NotPromoted)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpRenamedAst.hs:16:25 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { DumpRenamedAst.hs:16:25 })
+                  (EpAnn
+                   (EpaSpan { DumpRenamedAst.hs:16:25 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   {Name: k})))
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpRenamedAst.hs:16:30-33 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpRenamedAst.hs:16:30-33 })
+                (EpAnn
+                 (EpaSpan { DumpRenamedAst.hs:16:30-33 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsTyVar
                  (EpAnn
                   (EpaDelta (SameLine 0) [])
@@ -896,23 +890,23 @@
                    []))
                  (NotPromoted)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpRenamedAst.hs:16:30-33 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { DumpRenamedAst.hs:16:30-33 })
+                  (EpAnn
+                   (EpaSpan { DumpRenamedAst.hs:16:30-33 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   {Name: GHC.Types.Type})))))))))
          (Nothing))))]
      []
      []
      [(L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpRenamedAst.hs:(19,1)-(20,45) })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { DumpRenamedAst.hs:(19,1)-(20,45) })
+       (EpAnn
+        (EpaSpan { DumpRenamedAst.hs:(19,1)-(20,45) })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (DataFamInstD
         (NoExtField)
         (DataFamInstDecl
@@ -923,24 +917,24 @@
            (EpaComments
             []))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpRenamedAst.hs:19:18-20 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { DumpRenamedAst.hs:19:18-20 })
+           (EpAnn
+            (EpaSpan { DumpRenamedAst.hs:19:18-20 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            {Name: DumpRenamedAst.Nat})
           (HsOuterImplicit
            [{Name: a}
            ,{Name: k}])
           [(HsValArg
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpRenamedAst.hs:19:22-37 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpRenamedAst.hs:19:22-37 })
+             (EpAnn
+              (EpaSpan { DumpRenamedAst.hs:19:22-37 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsParTy
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -951,12 +945,12 @@
                (EpaComments
                 []))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpRenamedAst.hs:19:23-36 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpRenamedAst.hs:19:23-36 })
+               (EpAnn
+                (EpaSpan { DumpRenamedAst.hs:19:23-36 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsKindSig
                 (EpAnn
                  (EpaSpan { DumpRenamedAst.hs:19:23-36 })
@@ -964,12 +958,12 @@
                  (EpaComments
                   []))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:19:23 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:19:23 })
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:19:23 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsTyVar
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -978,20 +972,20 @@
                     []))
                   (NotPromoted)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:19:23 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:19:23 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:19:23 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    {Name: a})))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:19:28-36 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:19:28-36 })
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:19:28-36 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsFunTy
                   (EpAnn
                    (EpaSpan { DumpRenamedAst.hs:19:28-36 })
@@ -1004,12 +998,12 @@
                      (EpaSpan { DumpRenamedAst.hs:19:30-31 }))
                     (HsNormalTok)))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:19:28 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:19:28 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:19:28 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaDelta (SameLine 0) [])
@@ -1018,20 +1012,20 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpRenamedAst.hs:19:28 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpRenamedAst.hs:19:28 })
+                     (EpAnn
+                      (EpaSpan { DumpRenamedAst.hs:19:28 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      {Name: k})))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:19:33-36 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:19:33-36 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:19:33-36 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaDelta (SameLine 0) [])
@@ -1040,12 +1034,12 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpRenamedAst.hs:19:33-36 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpRenamedAst.hs:19:33-36 })
+                     (EpAnn
+                      (EpaSpan { DumpRenamedAst.hs:19:33-36 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      {Name: GHC.Types.Type}))))))))))]
           (Prefix)
           (HsDataDefn
@@ -1054,12 +1048,12 @@
            (Nothing)
            (Just
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpRenamedAst.hs:19:42-60 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpRenamedAst.hs:19:42-60 })
+             (EpAnn
+              (EpaSpan { DumpRenamedAst.hs:19:42-60 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsFunTy
               (EpAnn
                (EpaSpan { DumpRenamedAst.hs:19:42-60 })
@@ -1072,12 +1066,12 @@
                  (EpaSpan { DumpRenamedAst.hs:19:54-55 }))
                 (HsNormalTok)))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpRenamedAst.hs:19:42-52 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpRenamedAst.hs:19:42-52 })
+               (EpAnn
+                (EpaSpan { DumpRenamedAst.hs:19:42-52 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsParTy
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -1088,12 +1082,12 @@
                  (EpaComments
                   []))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:19:43-51 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:19:43-51 })
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:19:43-51 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsFunTy
                   (EpAnn
                    (EpaSpan { DumpRenamedAst.hs:19:43-51 })
@@ -1106,12 +1100,12 @@
                      (EpaSpan { DumpRenamedAst.hs:19:45-46 }))
                     (HsNormalTok)))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:19:43 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:19:43 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:19:43 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaDelta (SameLine 0) [])
@@ -1120,20 +1114,20 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpRenamedAst.hs:19:43 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpRenamedAst.hs:19:43 })
+                     (EpAnn
+                      (EpaSpan { DumpRenamedAst.hs:19:43 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      {Name: k})))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:19:48-51 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:19:48-51 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:19:48-51 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaDelta (SameLine 0) [])
@@ -1142,20 +1136,20 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpRenamedAst.hs:19:48-51 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpRenamedAst.hs:19:48-51 })
+                     (EpAnn
+                      (EpaSpan { DumpRenamedAst.hs:19:48-51 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      {Name: GHC.Types.Type})))))))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpRenamedAst.hs:19:57-60 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpRenamedAst.hs:19:57-60 })
+               (EpAnn
+                (EpaSpan { DumpRenamedAst.hs:19:57-60 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsTyVar
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -1164,21 +1158,21 @@
                   []))
                 (NotPromoted)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:19:57-60 })
-                              (NameAnnTrailing
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:19:57-60 })
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:19:57-60 })
+                  (NameAnnTrailing
+                   [])
+                  (EpaComments
+                   []))
                  {Name: GHC.Types.Type}))))))
            (NewTypeCon
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpRenamedAst.hs:20:3-45 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpRenamedAst.hs:20:3-45 })
+             (EpAnn
+              (EpaSpan { DumpRenamedAst.hs:20:3-45 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (ConDeclGADT
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -1187,12 +1181,12 @@
                 []))
               (:|
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpRenamedAst.hs:20:3-5 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { DumpRenamedAst.hs:20:3-5 })
+                (EpAnn
+                 (EpaSpan { DumpRenamedAst.hs:20:3-5 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 {Name: DumpRenamedAst.Nat})
                [])
               (L
@@ -1200,12 +1194,12 @@
                 (EpaSpan { DumpRenamedAst.hs:20:7-8 }))
                (HsNormalTok))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpRenamedAst.hs:20:10-45 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpRenamedAst.hs:20:10-45 })
+               (EpAnn
+                (EpaSpan { DumpRenamedAst.hs:20:10-45 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsOuterImplicit
                 [{Name: f}
                 ,{Name: g}]))
@@ -1218,12 +1212,12 @@
                     (EpaSpan { DumpRenamedAst.hs:20:36-37 }))
                    (HsNormalTok)))
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpRenamedAst.hs:20:10-34 })
-                               (AnnListItem
-                                [])
-                               (EpaComments
-                                [])) { DumpRenamedAst.hs:20:10-34 })
+                  (EpAnn
+                   (EpaSpan { DumpRenamedAst.hs:20:10-34 })
+                   (AnnListItem
+                    [])
+                   (EpaComments
+                    []))
                   (HsParTy
                    (EpAnn
                     (EpaDelta (SameLine 0) [])
@@ -1234,12 +1228,12 @@
                     (EpaComments
                      []))
                    (L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { DumpRenamedAst.hs:20:11-33 })
-                                 (AnnListItem
-                                  [])
-                                 (EpaComments
-                                  [])) { DumpRenamedAst.hs:20:11-33 })
+                    (EpAnn
+                     (EpaSpan { DumpRenamedAst.hs:20:11-33 })
+                     (AnnListItem
+                      [])
+                     (EpaComments
+                      []))
                     (HsForAllTy
                      (NoExtField)
                      (HsForAllInvis
@@ -1251,12 +1245,12 @@
                        (EpaComments
                         []))
                       [(L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpRenamedAst.hs:20:18-19 })
-                                     (AnnListItem
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpRenamedAst.hs:20:18-19 })
+                        (EpAnn
+                         (EpaSpan { DumpRenamedAst.hs:20:18-19 })
+                         (AnnListItem
+                          [])
+                         (EpaComments
+                          []))
                         (UserTyVar
                          (EpAnn
                           (EpaSpan { DumpRenamedAst.hs:20:18-19 })
@@ -1265,20 +1259,20 @@
                            []))
                          (SpecifiedSpec)
                          (L
-                          (SrcSpanAnn (EpAnn
-                                       (EpaSpan { DumpRenamedAst.hs:20:18-19 })
-                                       (NameAnnTrailing
-                                        [])
-                                       (EpaComments
-                                        [])) { DumpRenamedAst.hs:20:18-19 })
+                          (EpAnn
+                           (EpaSpan { DumpRenamedAst.hs:20:18-19 })
+                           (NameAnnTrailing
+                            [])
+                           (EpaComments
+                            []))
                           {Name: xx})))])
                      (L
-                      (SrcSpanAnn (EpAnn
-                                   (EpaSpan { DumpRenamedAst.hs:20:22-33 })
-                                   (AnnListItem
-                                    [])
-                                   (EpaComments
-                                    [])) { DumpRenamedAst.hs:20:22-33 })
+                      (EpAnn
+                       (EpaSpan { DumpRenamedAst.hs:20:22-33 })
+                       (AnnListItem
+                        [])
+                       (EpaComments
+                        []))
                       (HsFunTy
                        (EpAnn
                         (EpaSpan { DumpRenamedAst.hs:20:22-33 })
@@ -1291,21 +1285,21 @@
                           (EpaSpan { DumpRenamedAst.hs:20:27-28 }))
                          (HsNormalTok)))
                        (L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpRenamedAst.hs:20:22-25 })
-                                     (AnnListItem
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpRenamedAst.hs:20:22-25 })
+                        (EpAnn
+                         (EpaSpan { DumpRenamedAst.hs:20:22-25 })
+                         (AnnListItem
+                          [])
+                         (EpaComments
+                          []))
                         (HsAppTy
                          (NoExtField)
                          (L
-                          (SrcSpanAnn (EpAnn
-                                       (EpaSpan { DumpRenamedAst.hs:20:22 })
-                                       (AnnListItem
-                                        [])
-                                       (EpaComments
-                                        [])) { DumpRenamedAst.hs:20:22 })
+                          (EpAnn
+                           (EpaSpan { DumpRenamedAst.hs:20:22 })
+                           (AnnListItem
+                            [])
+                           (EpaComments
+                            []))
                           (HsTyVar
                            (EpAnn
                             (EpaDelta (SameLine 0) [])
@@ -1314,20 +1308,20 @@
                              []))
                            (NotPromoted)
                            (L
-                            (SrcSpanAnn (EpAnn
-                                         (EpaSpan { DumpRenamedAst.hs:20:22 })
-                                         (NameAnnTrailing
-                                          [])
-                                         (EpaComments
-                                          [])) { DumpRenamedAst.hs:20:22 })
+                            (EpAnn
+                             (EpaSpan { DumpRenamedAst.hs:20:22 })
+                             (NameAnnTrailing
+                              [])
+                             (EpaComments
+                              []))
                             {Name: f})))
                          (L
-                          (SrcSpanAnn (EpAnn
-                                       (EpaSpan { DumpRenamedAst.hs:20:24-25 })
-                                       (AnnListItem
-                                        [])
-                                       (EpaComments
-                                        [])) { DumpRenamedAst.hs:20:24-25 })
+                          (EpAnn
+                           (EpaSpan { DumpRenamedAst.hs:20:24-25 })
+                           (AnnListItem
+                            [])
+                           (EpaComments
+                            []))
                           (HsTyVar
                            (EpAnn
                             (EpaDelta (SameLine 0) [])
@@ -1336,29 +1330,29 @@
                              []))
                            (NotPromoted)
                            (L
-                            (SrcSpanAnn (EpAnn
-                                         (EpaSpan { DumpRenamedAst.hs:20:24-25 })
-                                         (NameAnnTrailing
-                                          [])
-                                         (EpaComments
-                                          [])) { DumpRenamedAst.hs:20:24-25 })
+                            (EpAnn
+                             (EpaSpan { DumpRenamedAst.hs:20:24-25 })
+                             (NameAnnTrailing
+                              [])
+                             (EpaComments
+                              []))
                             {Name: xx})))))
                        (L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpRenamedAst.hs:20:30-33 })
-                                     (AnnListItem
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpRenamedAst.hs:20:30-33 })
+                        (EpAnn
+                         (EpaSpan { DumpRenamedAst.hs:20:30-33 })
+                         (AnnListItem
+                          [])
+                         (EpaComments
+                          []))
                         (HsAppTy
                          (NoExtField)
                          (L
-                          (SrcSpanAnn (EpAnn
-                                       (EpaSpan { DumpRenamedAst.hs:20:30 })
-                                       (AnnListItem
-                                        [])
-                                       (EpaComments
-                                        [])) { DumpRenamedAst.hs:20:30 })
+                          (EpAnn
+                           (EpaSpan { DumpRenamedAst.hs:20:30 })
+                           (AnnListItem
+                            [])
+                           (EpaComments
+                            []))
                           (HsTyVar
                            (EpAnn
                             (EpaDelta (SameLine 0) [])
@@ -1367,20 +1361,20 @@
                              []))
                            (NotPromoted)
                            (L
-                            (SrcSpanAnn (EpAnn
-                                         (EpaSpan { DumpRenamedAst.hs:20:30 })
-                                         (NameAnnTrailing
-                                          [])
-                                         (EpaComments
-                                          [])) { DumpRenamedAst.hs:20:30 })
+                            (EpAnn
+                             (EpaSpan { DumpRenamedAst.hs:20:30 })
+                             (NameAnnTrailing
+                              [])
+                             (EpaComments
+                              []))
                             {Name: g})))
                          (L
-                          (SrcSpanAnn (EpAnn
-                                       (EpaSpan { DumpRenamedAst.hs:20:32-33 })
-                                       (AnnListItem
-                                        [])
-                                       (EpaComments
-                                        [])) { DumpRenamedAst.hs:20:32-33 })
+                          (EpAnn
+                           (EpaSpan { DumpRenamedAst.hs:20:32-33 })
+                           (AnnListItem
+                            [])
+                           (EpaComments
+                            []))
                           (HsTyVar
                            (EpAnn
                             (EpaDelta (SameLine 0) [])
@@ -1389,38 +1383,38 @@
                              []))
                            (NotPromoted)
                            (L
-                            (SrcSpanAnn (EpAnn
-                                         (EpaSpan { DumpRenamedAst.hs:20:32-33 })
-                                         (NameAnnTrailing
-                                          [])
-                                         (EpaComments
-                                          [])) { DumpRenamedAst.hs:20:32-33 })
+                            (EpAnn
+                             (EpaSpan { DumpRenamedAst.hs:20:32-33 })
+                             (NameAnnTrailing
+                              [])
+                             (EpaComments
+                              []))
                             {Name: xx}))))))))))))])
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpRenamedAst.hs:20:39-45 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpRenamedAst.hs:20:39-45 })
+               (EpAnn
+                (EpaSpan { DumpRenamedAst.hs:20:39-45 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsAppTy
                 (NoExtField)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:20:39-43 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:20:39-43 })
-                 (HsAppTy
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:20:39-43 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
+                 (HsAppTy
                   (NoExtField)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:20:39-41 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:20:39-41 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:20:39-41 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaDelta (SameLine 0) [])
@@ -1429,20 +1423,20 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpRenamedAst.hs:20:39-41 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpRenamedAst.hs:20:39-41 })
+                     (EpAnn
+                      (EpaSpan { DumpRenamedAst.hs:20:39-41 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      {Name: DumpRenamedAst.Nat})))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:20:43 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:20:43 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:20:43 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaDelta (SameLine 0) [])
@@ -1451,20 +1445,20 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpRenamedAst.hs:20:43 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpRenamedAst.hs:20:43 })
+                     (EpAnn
+                      (EpaSpan { DumpRenamedAst.hs:20:43 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      {Name: f})))))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:20:45 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:20:45 })
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:20:45 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsTyVar
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -1473,24 +1467,24 @@
                     []))
                   (NotPromoted)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:20:45 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:20:45 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:20:45 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    {Name: g})))))
               (Nothing))))
            [])))))])
    ,(TyClGroup
      (NoExtField)
      [(L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpRenamedAst.hs:22:1-29 })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { DumpRenamedAst.hs:22:1-29 })
+       (EpAnn
+        (EpaSpan { DumpRenamedAst.hs:22:1-29 })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (DataDecl
         (DataDeclRn
          (False)
@@ -1498,22 +1492,22 @@
           [{Name: a}
           ,{Name: f}]})
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { DumpRenamedAst.hs:22:6 })
-                      (NameAnnTrailing
-                       [])
-                      (EpaComments
-                       [])) { DumpRenamedAst.hs:22:6 })
+         (EpAnn
+          (EpaSpan { DumpRenamedAst.hs:22:6 })
+          (NameAnnTrailing
+           [])
+          (EpaComments
+           []))
          {Name: DumpRenamedAst.T})
         (HsQTvs
          [{Name: k}]
          [(L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpRenamedAst.hs:22:8 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { DumpRenamedAst.hs:22:8 })
+           (EpAnn
+            (EpaSpan { DumpRenamedAst.hs:22:8 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (UserTyVar
             (EpAnn
              (EpaSpan { DumpRenamedAst.hs:22:8 })
@@ -1522,20 +1516,20 @@
               []))
             (HsBndrRequired)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpRenamedAst.hs:22:8 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpRenamedAst.hs:22:8 })
+             (EpAnn
+              (EpaSpan { DumpRenamedAst.hs:22:8 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              {Name: f})))
          ,(L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpRenamedAst.hs:22:10-17 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { DumpRenamedAst.hs:22:10-17 })
+           (EpAnn
+            (EpaSpan { DumpRenamedAst.hs:22:10-17 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (KindedTyVar
             (EpAnn
              (EpaSpan { DumpRenamedAst.hs:22:10-17 })
@@ -1546,20 +1540,20 @@
               []))
             (HsBndrRequired)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpRenamedAst.hs:22:11 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpRenamedAst.hs:22:11 })
+             (EpAnn
+              (EpaSpan { DumpRenamedAst.hs:22:11 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              {Name: a})
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpRenamedAst.hs:22:16 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpRenamedAst.hs:22:16 })
+             (EpAnn
+              (EpaSpan { DumpRenamedAst.hs:22:16 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsTyVar
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -1568,12 +1562,12 @@
                 []))
               (NotPromoted)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpRenamedAst.hs:22:16 })
-                            (NameAnnTrailing
-                             [])
-                            (EpaComments
-                             [])) { DumpRenamedAst.hs:22:16 })
+               (EpAnn
+                (EpaSpan { DumpRenamedAst.hs:22:16 })
+                (NameAnnTrailing
+                 [])
+                (EpaComments
+                 []))
                {Name: k})))))])
         (Prefix)
         (HsDataDefn
@@ -1584,12 +1578,12 @@
          (DataTypeCons
           (False)
           [(L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpRenamedAst.hs:22:21-29 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpRenamedAst.hs:22:21-29 })
+            (EpAnn
+             (EpaSpan { DumpRenamedAst.hs:22:21-29 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (ConDeclH98
              (EpAnn
               (EpaDelta (SameLine 0) [])
@@ -1597,12 +1591,12 @@
               (EpaComments
                []))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpRenamedAst.hs:22:21-23 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { DumpRenamedAst.hs:22:21-23 })
+              (EpAnn
+               (EpaSpan { DumpRenamedAst.hs:22:21-23 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               {Name: DumpRenamedAst.MkT})
              (False)
              []
@@ -1619,12 +1613,12 @@
                    (NoTokenLoc)
                    (HsNormalTok))))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:22:25-29 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:22:25-29 })
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:22:25-29 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsParTy
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -1635,21 +1629,21 @@
                    (EpaComments
                     []))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:22:26-28 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:22:26-28 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:22:26-28 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsAppTy
                     (NoExtField)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpRenamedAst.hs:22:26 })
-                                  (AnnListItem
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpRenamedAst.hs:22:26 })
+                     (EpAnn
+                      (EpaSpan { DumpRenamedAst.hs:22:26 })
+                      (AnnListItem
+                       [])
+                      (EpaComments
+                       []))
                      (HsTyVar
                       (EpAnn
                        (EpaDelta (SameLine 0) [])
@@ -1658,20 +1652,20 @@
                         []))
                       (NotPromoted)
                       (L
-                       (SrcSpanAnn (EpAnn
-                                    (EpaSpan { DumpRenamedAst.hs:22:26 })
-                                    (NameAnnTrailing
-                                     [])
-                                    (EpaComments
-                                     [])) { DumpRenamedAst.hs:22:26 })
+                       (EpAnn
+                        (EpaSpan { DumpRenamedAst.hs:22:26 })
+                        (NameAnnTrailing
+                         [])
+                        (EpaComments
+                         []))
                        {Name: f})))
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpRenamedAst.hs:22:28 })
-                                  (AnnListItem
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpRenamedAst.hs:22:28 })
+                     (EpAnn
+                      (EpaSpan { DumpRenamedAst.hs:22:28 })
+                      (AnnListItem
+                       [])
+                      (EpaComments
+                       []))
                      (HsTyVar
                       (EpAnn
                        (EpaDelta (SameLine 0) [])
@@ -1680,12 +1674,12 @@
                         []))
                       (NotPromoted)
                       (L
-                       (SrcSpanAnn (EpAnn
-                                    (EpaSpan { DumpRenamedAst.hs:22:28 })
-                                    (NameAnnTrailing
-                                     [])
-                                    (EpaComments
-                                     [])) { DumpRenamedAst.hs:22:28 })
+                       (EpAnn
+                        (EpaSpan { DumpRenamedAst.hs:22:28 })
+                        (NameAnnTrailing
+                         [])
+                        (EpaComments
+                         []))
                        {Name: a}))))))))])
              (Nothing)))])
          [])))]
@@ -1695,12 +1689,12 @@
    ,(TyClGroup
      (NoExtField)
      [(L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpRenamedAst.hs:(25,1)-(26,30) })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { DumpRenamedAst.hs:(25,1)-(26,30) })
+       (EpAnn
+        (EpaSpan { DumpRenamedAst.hs:(25,1)-(26,30) })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (FamDecl
         (NoExtField)
         (FamilyDecl
@@ -1712,12 +1706,12 @@
          (ClosedTypeFamily
           (Just
            [(L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpRenamedAst.hs:26:3-30 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpRenamedAst.hs:26:3-30 })
+             (EpAnn
+              (EpaSpan { DumpRenamedAst.hs:26:3-30 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (FamEqn
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -1725,12 +1719,12 @@
                (EpaComments
                 []))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpRenamedAst.hs:26:3-4 })
-                            (NameAnnTrailing
-                             [])
-                            (EpaComments
-                             [])) { DumpRenamedAst.hs:26:3-4 })
+               (EpAnn
+                (EpaSpan { DumpRenamedAst.hs:26:3-4 })
+                (NameAnnTrailing
+                 [])
+                (EpaComments
+                 []))
                {Name: DumpRenamedAst.F1})
               (HsOuterImplicit
                [{Name: a}
@@ -1741,12 +1735,12 @@
                   (EpaSpan { DumpRenamedAst.hs:26:6 }))
                  (HsTok))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:26:7-11 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:26:7-11 })
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:26:7-11 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsTyVar
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -1755,21 +1749,21 @@
                     []))
                   (NotPromoted)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:26:7-11 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:26:7-11 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:26:7-11 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    {Name: DumpRenamedAst.Peano}))))
               ,(HsValArg
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:26:13 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:26:13 })
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:26:13 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsTyVar
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -1778,21 +1772,21 @@
                     []))
                   (NotPromoted)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:26:13 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:26:13 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:26:13 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    {Name: a}))))
               ,(HsValArg
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:26:15 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:26:15 })
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:26:15 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsTyVar
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -1801,48 +1795,48 @@
                     []))
                   (NotPromoted)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:26:15 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:26:15 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:26:15 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    {Name: f}))))]
               (Prefix)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpRenamedAst.hs:26:19-30 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpRenamedAst.hs:26:19-30 })
+               (EpAnn
+                (EpaSpan { DumpRenamedAst.hs:26:19-30 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsAppTy
                 (NoExtField)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:26:19-28 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:26:19-28 })
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:26:19-28 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsAppTy
                   (NoExtField)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:26:19-26 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:26:19-26 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:26:19-26 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsAppKindTy
                     (NoExtField)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpRenamedAst.hs:26:19 })
-                                  (AnnListItem
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpRenamedAst.hs:26:19 })
+                     (EpAnn
+                      (EpaSpan { DumpRenamedAst.hs:26:19 })
+                      (AnnListItem
+                       [])
+                      (EpaComments
+                       []))
                      (HsTyVar
                       (EpAnn
                        (EpaDelta (SameLine 0) [])
@@ -1851,24 +1845,24 @@
                         []))
                       (NotPromoted)
                       (L
-                       (SrcSpanAnn (EpAnn
-                                    (EpaSpan { DumpRenamedAst.hs:26:19 })
-                                    (NameAnnTrailing
-                                     [])
-                                    (EpaComments
-                                     [])) { DumpRenamedAst.hs:26:19 })
+                       (EpAnn
+                        (EpaSpan { DumpRenamedAst.hs:26:19 })
+                        (NameAnnTrailing
+                         [])
+                        (EpaComments
+                         []))
                        {Name: DumpRenamedAst.T})))
                     (L
                      (TokenLoc
                       (EpaSpan { DumpRenamedAst.hs:26:21 }))
                      (HsTok))
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpRenamedAst.hs:26:22-26 })
-                                  (AnnListItem
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpRenamedAst.hs:26:22-26 })
+                     (EpAnn
+                      (EpaSpan { DumpRenamedAst.hs:26:22-26 })
+                      (AnnListItem
+                       [])
+                      (EpaComments
+                       []))
                      (HsTyVar
                       (EpAnn
                        (EpaDelta (SameLine 0) [])
@@ -1877,20 +1871,20 @@
                         []))
                       (NotPromoted)
                       (L
-                       (SrcSpanAnn (EpAnn
-                                    (EpaSpan { DumpRenamedAst.hs:26:22-26 })
-                                    (NameAnnTrailing
-                                     [])
-                                    (EpaComments
-                                     [])) { DumpRenamedAst.hs:26:22-26 })
+                       (EpAnn
+                        (EpaSpan { DumpRenamedAst.hs:26:22-26 })
+                        (NameAnnTrailing
+                         [])
+                        (EpaComments
+                         []))
                        {Name: DumpRenamedAst.Peano})))))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:26:28 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:26:28 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:26:28 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaDelta (SameLine 0) [])
@@ -1899,20 +1893,20 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpRenamedAst.hs:26:28 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpRenamedAst.hs:26:28 })
+                     (EpAnn
+                      (EpaSpan { DumpRenamedAst.hs:26:28 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      {Name: f})))))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:26:30 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:26:30 })
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:26:30 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsTyVar
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -1921,31 +1915,31 @@
                     []))
                   (NotPromoted)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:26:30 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:26:30 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:26:30 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    {Name: a})))))))]))
          (TopLevel)
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpRenamedAst.hs:25:13-14 })
-                       (NameAnnTrailing
-                        [])
-                       (EpaComments
-                        [])) { DumpRenamedAst.hs:25:13-14 })
+          (EpAnn
+           (EpaSpan { DumpRenamedAst.hs:25:13-14 })
+           (NameAnnTrailing
+            [])
+           (EpaComments
+            []))
           {Name: DumpRenamedAst.F1})
          (HsQTvs
           [{Name: k}]
           [(L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpRenamedAst.hs:25:16-23 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpRenamedAst.hs:25:16-23 })
+            (EpAnn
+             (EpaSpan { DumpRenamedAst.hs:25:16-23 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (KindedTyVar
              (EpAnn
               (EpaSpan { DumpRenamedAst.hs:25:16-23 })
@@ -1956,20 +1950,20 @@
                []))
              (HsBndrRequired)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpRenamedAst.hs:25:17 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { DumpRenamedAst.hs:25:17 })
+              (EpAnn
+               (EpaSpan { DumpRenamedAst.hs:25:17 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               {Name: a})
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpRenamedAst.hs:25:22 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { DumpRenamedAst.hs:25:22 })
+              (EpAnn
+               (EpaSpan { DumpRenamedAst.hs:25:22 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaDelta (SameLine 0) [])
@@ -1978,20 +1972,20 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpRenamedAst.hs:25:22 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { DumpRenamedAst.hs:25:22 })
+                (EpAnn
+                 (EpaSpan { DumpRenamedAst.hs:25:22 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 {Name: k})))))
           ,(L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpRenamedAst.hs:25:25-40 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpRenamedAst.hs:25:25-40 })
+            (EpAnn
+             (EpaSpan { DumpRenamedAst.hs:25:25-40 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (KindedTyVar
              (EpAnn
               (EpaSpan { DumpRenamedAst.hs:25:25-40 })
@@ -2002,20 +1996,20 @@
                []))
              (HsBndrRequired)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpRenamedAst.hs:25:26 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { DumpRenamedAst.hs:25:26 })
+              (EpAnn
+               (EpaSpan { DumpRenamedAst.hs:25:26 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               {Name: f})
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpRenamedAst.hs:25:31-39 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { DumpRenamedAst.hs:25:31-39 })
+              (EpAnn
+               (EpaSpan { DumpRenamedAst.hs:25:31-39 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsFunTy
                (EpAnn
                 (EpaSpan { DumpRenamedAst.hs:25:31-39 })
@@ -2028,12 +2022,12 @@
                   (EpaSpan { DumpRenamedAst.hs:25:33-34 }))
                  (HsNormalTok)))
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpRenamedAst.hs:25:31 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpRenamedAst.hs:25:31 })
+                (EpAnn
+                 (EpaSpan { DumpRenamedAst.hs:25:31 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsTyVar
                  (EpAnn
                   (EpaDelta (SameLine 0) [])
@@ -2042,20 +2036,20 @@
                    []))
                  (NotPromoted)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpRenamedAst.hs:25:31 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { DumpRenamedAst.hs:25:31 })
+                  (EpAnn
+                   (EpaSpan { DumpRenamedAst.hs:25:31 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   {Name: k})))
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpRenamedAst.hs:25:36-39 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpRenamedAst.hs:25:36-39 })
+                (EpAnn
+                 (EpaSpan { DumpRenamedAst.hs:25:36-39 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsTyVar
                  (EpAnn
                   (EpaDelta (SameLine 0) [])
@@ -2064,31 +2058,29 @@
                    []))
                  (NotPromoted)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpRenamedAst.hs:25:36-39 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { DumpRenamedAst.hs:25:36-39 })
+                  (EpAnn
+                   (EpaSpan { DumpRenamedAst.hs:25:36-39 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   {Name: GHC.Types.Type})))))))])
          (Prefix)
          (L
-          (SrcSpanAnn
-           (EpAnn
-            (EpaSpan { DumpRenamedAst.hs:25:42-48 })
-            (NoEpAnns)
-            (EpaComments
-             []))
-           { DumpRenamedAst.hs:25:42-48 })
+          (EpAnn
+           (EpaSpan { DumpRenamedAst.hs:25:42-48 })
+           (NoEpAnns)
+           (EpaComments
+            []))
           (KindSig
            (NoExtField)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpRenamedAst.hs:25:45-48 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpRenamedAst.hs:25:45-48 })
+            (EpAnn
+             (EpaSpan { DumpRenamedAst.hs:25:45-48 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaDelta (SameLine 0) [])
@@ -2097,50 +2089,50 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpRenamedAst.hs:25:45-48 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { DumpRenamedAst.hs:25:45-48 })
+              (EpAnn
+               (EpaSpan { DumpRenamedAst.hs:25:45-48 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               {Name: GHC.Types.Type})))))
          (Nothing))))]
      []
      [(L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpRenamedAst.hs:24:1-35 })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { DumpRenamedAst.hs:24:1-35 })
+       (EpAnn
+        (EpaSpan { DumpRenamedAst.hs:24:1-35 })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (StandaloneKindSig
         (NoExtField)
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { DumpRenamedAst.hs:24:6-7 })
-                      (NameAnnTrailing
-                       [])
-                      (EpaComments
-                       [])) { DumpRenamedAst.hs:24:6-7 })
+         (EpAnn
+          (EpaSpan { DumpRenamedAst.hs:24:6-7 })
+          (NameAnnTrailing
+           [])
+          (EpaComments
+           []))
          {Name: DumpRenamedAst.F1})
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { DumpRenamedAst.hs:24:12-35 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { DumpRenamedAst.hs:24:12-35 })
+         (EpAnn
+          (EpaSpan { DumpRenamedAst.hs:24:12-35 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsSig
           (NoExtField)
           (HsOuterImplicit
            [{Name: k}])
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpRenamedAst.hs:24:12-35 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { DumpRenamedAst.hs:24:12-35 })
+           (EpAnn
+            (EpaSpan { DumpRenamedAst.hs:24:12-35 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsFunTy
             (EpAnn
              (EpaSpan { DumpRenamedAst.hs:24:12-35 })
@@ -2153,12 +2145,12 @@
                (EpaSpan { DumpRenamedAst.hs:24:14-15 }))
               (HsNormalTok)))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpRenamedAst.hs:24:12 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpRenamedAst.hs:24:12 })
+             (EpAnn
+              (EpaSpan { DumpRenamedAst.hs:24:12 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsTyVar
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -2167,20 +2159,20 @@
                 []))
               (NotPromoted)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpRenamedAst.hs:24:12 })
-                            (NameAnnTrailing
-                             [])
-                            (EpaComments
-                             [])) { DumpRenamedAst.hs:24:12 })
+               (EpAnn
+                (EpaSpan { DumpRenamedAst.hs:24:12 })
+                (NameAnnTrailing
+                 [])
+                (EpaComments
+                 []))
                {Name: k})))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpRenamedAst.hs:24:17-35 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpRenamedAst.hs:24:17-35 })
+             (EpAnn
+              (EpaSpan { DumpRenamedAst.hs:24:17-35 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsFunTy
               (EpAnn
                (EpaSpan { DumpRenamedAst.hs:24:17-35 })
@@ -2193,12 +2185,12 @@
                  (EpaSpan { DumpRenamedAst.hs:24:29-30 }))
                 (HsNormalTok)))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpRenamedAst.hs:24:17-27 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpRenamedAst.hs:24:17-27 })
+               (EpAnn
+                (EpaSpan { DumpRenamedAst.hs:24:17-27 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsParTy
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -2209,12 +2201,12 @@
                  (EpaComments
                   []))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:24:18-26 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:24:18-26 })
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:24:18-26 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsFunTy
                   (EpAnn
                    (EpaSpan { DumpRenamedAst.hs:24:18-26 })
@@ -2227,12 +2219,12 @@
                      (EpaSpan { DumpRenamedAst.hs:24:20-21 }))
                     (HsNormalTok)))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:24:18 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:24:18 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:24:18 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaDelta (SameLine 0) [])
@@ -2241,20 +2233,20 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpRenamedAst.hs:24:18 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpRenamedAst.hs:24:18 })
+                     (EpAnn
+                      (EpaSpan { DumpRenamedAst.hs:24:18 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      {Name: k})))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpRenamedAst.hs:24:23-26 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpRenamedAst.hs:24:23-26 })
+                   (EpAnn
+                    (EpaSpan { DumpRenamedAst.hs:24:23-26 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaDelta (SameLine 0) [])
@@ -2263,20 +2255,20 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpRenamedAst.hs:24:23-26 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpRenamedAst.hs:24:23-26 })
+                     (EpAnn
+                      (EpaSpan { DumpRenamedAst.hs:24:23-26 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      {Name: GHC.Types.Type})))))))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpRenamedAst.hs:24:32-35 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { DumpRenamedAst.hs:24:32-35 })
+               (EpAnn
+                (EpaSpan { DumpRenamedAst.hs:24:32-35 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsTyVar
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -2285,23 +2277,23 @@
                   []))
                 (NotPromoted)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { DumpRenamedAst.hs:24:32-35 })
-                              (NameAnnTrailing
-                               [])
-                              (EpaComments
-                               [])) { DumpRenamedAst.hs:24:32-35 })
+                 (EpAnn
+                  (EpaSpan { DumpRenamedAst.hs:24:32-35 })
+                  (NameAnnTrailing
+                   [])
+                  (EpaComments
+                   []))
                  {Name: GHC.Types.Type})))))))))))]
      [])
    ,(TyClGroup
      (NoExtField)
      [(L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpRenamedAst.hs:(28,1)-(29,12) })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { DumpRenamedAst.hs:(28,1)-(29,12) })
+       (EpAnn
+        (EpaSpan { DumpRenamedAst.hs:(28,1)-(29,12) })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (ClassDecl
         {NameSet:
          []}
@@ -2309,22 +2301,22 @@
          (3))
         (Nothing)
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { DumpRenamedAst.hs:28:7 })
-                      (NameAnnTrailing
-                       [])
-                      (EpaComments
-                       [])) { DumpRenamedAst.hs:28:7 })
+         (EpAnn
+          (EpaSpan { DumpRenamedAst.hs:28:7 })
+          (NameAnnTrailing
+           [])
+          (EpaComments
+           []))
          {Name: DumpRenamedAst.C})
         (HsQTvs
          []
          [(L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpRenamedAst.hs:28:9 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { DumpRenamedAst.hs:28:9 })
+           (EpAnn
+            (EpaSpan { DumpRenamedAst.hs:28:9 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (UserTyVar
             (EpAnn
              (EpaSpan { DumpRenamedAst.hs:28:9 })
@@ -2333,12 +2325,12 @@
               []))
             (HsBndrRequired)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpRenamedAst.hs:28:9 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpRenamedAst.hs:28:9 })
+             (EpAnn
+              (EpaSpan { DumpRenamedAst.hs:28:9 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              {Name: a})))])
         (Prefix)
         []
@@ -2346,12 +2338,12 @@
         {Bag(LocatedA (HsBind Name)):
          []}
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpRenamedAst.hs:29:3-12 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpRenamedAst.hs:29:3-12 })
+          (EpAnn
+           (EpaSpan { DumpRenamedAst.hs:29:3-12 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (FamilyDecl
            (EpAnn
             (EpaDelta (SameLine 0) [])
@@ -2361,22 +2353,22 @@
            (OpenTypeFamily)
            (NotTopLevel)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpRenamedAst.hs:29:8 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { DumpRenamedAst.hs:29:8 })
+            (EpAnn
+             (EpaSpan { DumpRenamedAst.hs:29:8 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             {Name: DumpRenamedAst.F})
            (HsQTvs
             []
             [(L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpRenamedAst.hs:29:10 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { DumpRenamedAst.hs:29:10 })
+              (EpAnn
+               (EpaSpan { DumpRenamedAst.hs:29:10 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (UserTyVar
                (EpAnn
                 (EpaSpan { DumpRenamedAst.hs:29:10 })
@@ -2385,20 +2377,20 @@
                  []))
                (HsBndrRequired)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpRenamedAst.hs:29:10 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { DumpRenamedAst.hs:29:10 })
+                (EpAnn
+                 (EpaSpan { DumpRenamedAst.hs:29:10 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 {Name: a})))
             ,(L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpRenamedAst.hs:29:12 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { DumpRenamedAst.hs:29:12 })
+              (EpAnn
+               (EpaSpan { DumpRenamedAst.hs:29:12 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (UserTyVar
                (EpAnn
                 (EpaSpan { DumpRenamedAst.hs:29:12 })
@@ -2407,22 +2399,20 @@
                  []))
                (HsBndrRequired)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpRenamedAst.hs:29:12 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { DumpRenamedAst.hs:29:12 })
+                (EpAnn
+                 (EpaSpan { DumpRenamedAst.hs:29:12 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 {Name: b})))])
            (Prefix)
            (L
-            (SrcSpanAnn
-             (EpAnn
-              (EpaSpan { <no location info> })
-              (NoEpAnns)
-              (EpaComments
-               []))
-             { <no location info> })
+            (EpAnn
+             (EpaSpan { <no location info> })
+             (NoEpAnns)
+             (EpaComments
+              []))
             (NoSig
              (NoExtField)))
            (Nothing)))]
@@ -2431,43 +2421,43 @@
      []
      []
      [(L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpRenamedAst.hs:(31,1)-(32,27) })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { DumpRenamedAst.hs:(31,1)-(32,27) })
+       (EpAnn
+        (EpaSpan { DumpRenamedAst.hs:(31,1)-(32,27) })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (ClsInstD
         (NoExtField)
         (ClsInstDecl
          (Nothing)
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpRenamedAst.hs:31:10-14 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpRenamedAst.hs:31:10-14 })
+          (EpAnn
+           (EpaSpan { DumpRenamedAst.hs:31:10-14 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsSig
            (NoExtField)
            (HsOuterImplicit
             [{Name: a}])
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpRenamedAst.hs:31:10-14 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpRenamedAst.hs:31:10-14 })
+            (EpAnn
+             (EpaSpan { DumpRenamedAst.hs:31:10-14 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsAppTy
              (NoExtField)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpRenamedAst.hs:31:10 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { DumpRenamedAst.hs:31:10 })
+              (EpAnn
+               (EpaSpan { DumpRenamedAst.hs:31:10 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaDelta (SameLine 0) [])
@@ -2476,20 +2466,20 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpRenamedAst.hs:31:10 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { DumpRenamedAst.hs:31:10 })
+                (EpAnn
+                 (EpaSpan { DumpRenamedAst.hs:31:10 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 {Name: DumpRenamedAst.C})))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpRenamedAst.hs:31:12-14 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { DumpRenamedAst.hs:31:12-14 })
+              (EpAnn
+               (EpaSpan { DumpRenamedAst.hs:31:12-14 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsListTy
                (EpAnn
                 (EpaSpan { DumpRenamedAst.hs:31:12-14 })
@@ -2500,12 +2490,12 @@
                 (EpaComments
                  []))
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpRenamedAst.hs:31:13 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpRenamedAst.hs:31:13 })
+                (EpAnn
+                 (EpaSpan { DumpRenamedAst.hs:31:13 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsTyVar
                  (EpAnn
                   (EpaDelta (SameLine 0) [])
@@ -2514,23 +2504,23 @@
                    []))
                  (NotPromoted)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpRenamedAst.hs:31:13 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { DumpRenamedAst.hs:31:13 })
+                  (EpAnn
+                   (EpaSpan { DumpRenamedAst.hs:31:13 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   {Name: a})))))))))
          {Bag(LocatedA (HsBind Name)):
           []}
          []
          [(L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpRenamedAst.hs:32:3-27 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { DumpRenamedAst.hs:32:3-27 })
+           (EpAnn
+            (EpaSpan { DumpRenamedAst.hs:32:3-27 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (TyFamInstDecl
             (EpAnn
              (EpaSpan { DumpRenamedAst.hs:32:3-27 })
@@ -2544,23 +2534,23 @@
               (EpaComments
                []))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpRenamedAst.hs:32:8 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { DumpRenamedAst.hs:32:8 })
+              (EpAnn
+               (EpaSpan { DumpRenamedAst.hs:32:8 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               {Name: DumpRenamedAst.F})
              (HsOuterImplicit
               [{Name: b}])
              [(HsValArg
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpRenamedAst.hs:32:10-12 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpRenamedAst.hs:32:10-12 })
+                (EpAnn
+                 (EpaSpan { DumpRenamedAst.hs:32:10-12 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsListTy
                  (EpAnn
                   (EpaSpan { DumpRenamedAst.hs:32:10-12 })
@@ -2571,12 +2561,12 @@
                   (EpaComments
                    []))
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpRenamedAst.hs:32:11 })
-                               (AnnListItem
-                                [])
-                               (EpaComments
-                                [])) { DumpRenamedAst.hs:32:11 })
+                  (EpAnn
+                   (EpaSpan { DumpRenamedAst.hs:32:11 })
+                   (AnnListItem
+                    [])
+                   (EpaComments
+                    []))
                   (HsTyVar
                    (EpAnn
                     (EpaDelta (SameLine 0) [])
@@ -2585,21 +2575,21 @@
                      []))
                    (NotPromoted)
                    (L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { DumpRenamedAst.hs:32:11 })
-                                 (NameAnnTrailing
-                                  [])
-                                 (EpaComments
-                                  [])) { DumpRenamedAst.hs:32:11 })
+                    (EpAnn
+                     (EpaSpan { DumpRenamedAst.hs:32:11 })
+                     (NameAnnTrailing
+                      [])
+                     (EpaComments
+                      []))
                     {Name: a}))))))
              ,(HsValArg
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpRenamedAst.hs:32:14 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpRenamedAst.hs:32:14 })
+                (EpAnn
+                 (EpaSpan { DumpRenamedAst.hs:32:14 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsTyVar
                  (EpAnn
                   (EpaDelta (SameLine 0) [])
@@ -2608,39 +2598,39 @@
                    []))
                  (NotPromoted)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpRenamedAst.hs:32:14 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { DumpRenamedAst.hs:32:14 })
+                  (EpAnn
+                   (EpaSpan { DumpRenamedAst.hs:32:14 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   {Name: b}))))]
              (Prefix)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpRenamedAst.hs:32:18-27 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { DumpRenamedAst.hs:32:18-27 })
+              (EpAnn
+               (EpaSpan { DumpRenamedAst.hs:32:18-27 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsAppTy
                (NoExtField)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpRenamedAst.hs:32:18-25 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpRenamedAst.hs:32:18-25 })
+                (EpAnn
+                 (EpaSpan { DumpRenamedAst.hs:32:18-25 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsAppTy
                  (NoExtField)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpRenamedAst.hs:32:18-23 })
-                               (AnnListItem
-                                [])
-                               (EpaComments
-                                [])) { DumpRenamedAst.hs:32:18-23 })
+                  (EpAnn
+                   (EpaSpan { DumpRenamedAst.hs:32:18-23 })
+                   (AnnListItem
+                    [])
+                   (EpaComments
+                    []))
                   (HsTyVar
                    (EpAnn
                     (EpaDelta (SameLine 0) [])
@@ -2649,20 +2639,20 @@
                      []))
                    (NotPromoted)
                    (L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { DumpRenamedAst.hs:32:18-23 })
-                                 (NameAnnTrailing
-                                  [])
-                                 (EpaComments
-                                  [])) { DumpRenamedAst.hs:32:18-23 })
+                    (EpAnn
+                     (EpaSpan { DumpRenamedAst.hs:32:18-23 })
+                     (NameAnnTrailing
+                      [])
+                     (EpaComments
+                      []))
                     {Name: Data.Either.Either})))
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpRenamedAst.hs:32:25 })
-                               (AnnListItem
-                                [])
-                               (EpaComments
-                                [])) { DumpRenamedAst.hs:32:25 })
+                  (EpAnn
+                   (EpaSpan { DumpRenamedAst.hs:32:25 })
+                   (AnnListItem
+                    [])
+                   (EpaComments
+                    []))
                   (HsTyVar
                    (EpAnn
                     (EpaDelta (SameLine 0) [])
@@ -2671,20 +2661,20 @@
                      []))
                    (NotPromoted)
                    (L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { DumpRenamedAst.hs:32:25 })
-                                 (NameAnnTrailing
-                                  [])
-                                 (EpaComments
-                                  [])) { DumpRenamedAst.hs:32:25 })
+                    (EpAnn
+                     (EpaSpan { DumpRenamedAst.hs:32:25 })
+                     (NameAnnTrailing
+                      [])
+                     (EpaComments
+                      []))
                     {Name: a})))))
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpRenamedAst.hs:32:27 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpRenamedAst.hs:32:27 })
+                (EpAnn
+                 (EpaSpan { DumpRenamedAst.hs:32:27 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsTyVar
                  (EpAnn
                   (EpaDelta (SameLine 0) [])
@@ -2693,12 +2683,12 @@
                    []))
                  (NotPromoted)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpRenamedAst.hs:32:27 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { DumpRenamedAst.hs:32:27 })
+                  (EpAnn
+                   (EpaSpan { DumpRenamedAst.hs:32:27 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   {Name: b}))))))))]
          []
          (Nothing))))])]
@@ -2711,12 +2701,12 @@
    []
    [])
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpRenamedAst.hs:4:8-21 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpRenamedAst.hs:4:8-21 })
+    (EpAnn
+     (EpaSpan { DumpRenamedAst.hs:4:8-21 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (ImportDecl
      (XImportDeclPass
       (EpAnn
@@ -2733,12 +2723,12 @@
       (NoSourceText)
       (True))
      (L
-      (SrcSpanAnn (EpAnn
-                   (EpaSpan { DumpRenamedAst.hs:4:8-21 })
-                   (AnnListItem
-                    [])
-                   (EpaComments
-                    [])) { DumpRenamedAst.hs:4:8-21 })
+      (EpAnn
+       (EpaSpan { DumpRenamedAst.hs:4:8-21 })
+       (AnnListItem
+        [])
+       (EpaComments
+        []))
       {ModuleName: Prelude})
      (NoPkgQual)
      (NotBoot)
@@ -2747,12 +2737,12 @@
      (Nothing)
      (Nothing)))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpRenamedAst.hs:5:1-16 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpRenamedAst.hs:5:1-16 })
+    (EpAnn
+     (EpaSpan { DumpRenamedAst.hs:5:1-16 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (ImportDecl
      (XImportDeclPass
       (EpAnn
@@ -2769,12 +2759,12 @@
       (NoSourceText)
       (False))
      (L
-      (SrcSpanAnn (EpAnn
-                   (EpaSpan { DumpRenamedAst.hs:5:8-16 })
-                   (AnnListItem
-                    [])
-                   (EpaComments
-                    [])) { DumpRenamedAst.hs:5:8-16 })
+      (EpAnn
+       (EpaSpan { DumpRenamedAst.hs:5:8-16 })
+       (AnnListItem
+        [])
+       (EpaComments
+        []))
       {ModuleName: Data.Kind})
      (NoPkgQual)
      (NotBoot)
@@ -2783,12 +2773,12 @@
      (Nothing)
      (Nothing)))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpRenamedAst.hs:7:1-23 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpRenamedAst.hs:7:1-23 })
+    (EpAnn
+     (EpaSpan { DumpRenamedAst.hs:7:1-23 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (ImportDecl
      (XImportDeclPass
       (EpAnn
@@ -2805,12 +2795,12 @@
       (NoSourceText)
       (False))
      (L
-      (SrcSpanAnn (EpAnn
-                   (EpaSpan { DumpRenamedAst.hs:7:8-16 })
-                   (AnnListItem
-                    [])
-                   (EpaComments
-                    [])) { DumpRenamedAst.hs:7:8-16 })
+      (EpAnn
+       (EpaSpan { DumpRenamedAst.hs:7:8-16 })
+       (AnnListItem
+        [])
+       (EpaComments
+        []))
       {ModuleName: Data.Kind})
      (NoPkgQual)
      (NotBoot)
@@ -2821,25 +2811,25 @@
       ((,)
        (Exactly)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpRenamedAst.hs:7:18-23 })
-                     (AnnList
-                      (Nothing)
-                      (Just
-                       (AddEpAnn AnnOpenP (EpaSpan { DumpRenamedAst.hs:7:18 })))
-                      (Just
-                       (AddEpAnn AnnCloseP (EpaSpan { DumpRenamedAst.hs:7:23 })))
-                      []
-                      [])
-                     (EpaComments
-                      [])) { DumpRenamedAst.hs:7:18-23 })
+        (EpAnn
+         (EpaSpan { DumpRenamedAst.hs:7:18-23 })
+         (AnnList
+          (Nothing)
+          (Just
+           (AddEpAnn AnnOpenP (EpaSpan { DumpRenamedAst.hs:7:18 })))
+          (Just
+           (AddEpAnn AnnCloseP (EpaSpan { DumpRenamedAst.hs:7:23 })))
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpRenamedAst.hs:7:19-22 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpRenamedAst.hs:7:19-22 })
+          (EpAnn
+           (EpaSpan { DumpRenamedAst.hs:7:19-22 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (IEThingAbs
            ((,)
             (Nothing)
@@ -2849,21 +2839,21 @@
              (EpaComments
               [])))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpRenamedAst.hs:7:19-22 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpRenamedAst.hs:7:19-22 })
+            (EpAnn
+             (EpaSpan { DumpRenamedAst.hs:7:19-22 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (IEName
              (NoExtField)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpRenamedAst.hs:7:19-22 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { DumpRenamedAst.hs:7:19-22 })
+              (EpAnn
+               (EpaSpan { DumpRenamedAst.hs:7:19-22 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               {Name: GHC.Types.Type})))))])))))]
   (Nothing)
   (Nothing)))
diff --git a/testsuite/tests/parser/should_compile/DumpSemis.stderr b/testsuite/tests/parser/should_compile/DumpSemis.stderr
index a0cca938758e..301d0adfa043 100644
--- a/testsuite/tests/parser/should_compile/DumpSemis.stderr
+++ b/testsuite/tests/parser/should_compile/DumpSemis.stderr
@@ -35,26 +35,26 @@
    (Nothing))
   (Just
    (L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpSemis.hs:1:8-16 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpSemis.hs:1:8-16 })
+    (EpAnn
+     (EpaSpan { DumpSemis.hs:1:8-16 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     {ModuleName: DumpSemis}))
   (Nothing)
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpSemis.hs:5:1-19 })
-                 (AnnListItem
-                  [(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:6:1 }))
-                  ,(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:6:3 }))
-                  ,(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:6:5 }))])
-                 (EpaComments
-                  [])) { DumpSemis.hs:5:1-19 })
+    (EpAnn
+     (EpaSpan { DumpSemis.hs:5:1-19 })
+     (AnnListItem
+      [(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:6:1 }))
+      ,(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:6:3 }))
+      ,(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:6:5 }))])
+     (EpaComments
+      []))
     (ImportDecl
      (XImportDeclPass
       (EpAnn
@@ -71,12 +71,12 @@
       (NoSourceText)
       (False))
      (L
-      (SrcSpanAnn (EpAnn
-                   (EpaSpan { DumpSemis.hs:5:8-16 })
-                   (AnnListItem
-                    [])
-                   (EpaComments
-                    [])) { DumpSemis.hs:5:8-16 })
+      (EpAnn
+       (EpaSpan { DumpSemis.hs:5:8-16 })
+       (AnnListItem
+        [])
+       (EpaComments
+        []))
       {ModuleName: Data.List})
      (NoRawPkgQual)
      (NotBoot)
@@ -87,31 +87,31 @@
       ((,)
        (Exactly)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpSemis.hs:5:18-19 })
-                     (AnnList
-                      (Nothing)
-                      (Just
-                       (AddEpAnn AnnOpenP (EpaSpan { DumpSemis.hs:5:18 })))
-                      (Just
-                       (AddEpAnn AnnCloseP (EpaSpan { DumpSemis.hs:5:19 })))
-                      []
-                      [])
-                     (EpaComments
-                      [])) { DumpSemis.hs:5:18-19 })
+        (EpAnn
+         (EpaSpan { DumpSemis.hs:5:18-19 })
+         (AnnList
+          (Nothing)
+          (Just
+           (AddEpAnn AnnOpenP (EpaSpan { DumpSemis.hs:5:18 })))
+          (Just
+           (AddEpAnn AnnCloseP (EpaSpan { DumpSemis.hs:5:19 })))
+          []
+          [])
+         (EpaComments
+          []))
         [])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpSemis.hs:7:1-16 })
-                 (AnnListItem
-                  [(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:8:4 }))
-                  ,(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:8:6 }))
-                  ,(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:8:7 }))])
-                 (EpaComments
-                  [])) { DumpSemis.hs:7:1-16 })
+    (EpAnn
+     (EpaSpan { DumpSemis.hs:7:1-16 })
+     (AnnListItem
+      [(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:8:4 }))
+      ,(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:8:6 }))
+      ,(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:8:7 }))])
+     (EpaComments
+      []))
     (ImportDecl
      (XImportDeclPass
       (EpAnn
@@ -128,12 +128,12 @@
       (NoSourceText)
       (False))
      (L
-      (SrcSpanAnn (EpAnn
-                   (EpaSpan { DumpSemis.hs:7:8-16 })
-                   (AnnListItem
-                    [])
-                   (EpaComments
-                    [])) { DumpSemis.hs:7:8-16 })
+      (EpAnn
+       (EpaSpan { DumpSemis.hs:7:8-16 })
+       (AnnListItem
+        [])
+       (EpaComments
+        []))
       {ModuleName: Data.Kind})
      (NoRawPkgQual)
      (NotBoot)
@@ -142,12 +142,12 @@
      (Nothing)
      (Nothing)))]
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpSemis.hs:9:1-12 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpSemis.hs:9:1-12 })
+    (EpAnn
+     (EpaSpan { DumpSemis.hs:9:1-12 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (SigD
      (NoExtField)
      (TypeSig
@@ -159,43 +159,43 @@
        (EpaComments
         []))
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpSemis.hs:9:1-3 })
-                     (NameAnnTrailing
-                      [])
-                     (EpaComments
-                      [])) { DumpSemis.hs:9:1-3 })
+        (EpAnn
+         (EpaSpan { DumpSemis.hs:9:1-3 })
+         (NameAnnTrailing
+          [])
+         (EpaComments
+          []))
         (Unqual
          {OccName: foo}))]
       (HsWC
        (NoExtField)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpSemis.hs:9:8-12 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { DumpSemis.hs:9:8-12 })
+        (EpAnn
+         (EpaSpan { DumpSemis.hs:9:8-12 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (HsSig
          (NoExtField)
          (HsOuterImplicit
           (NoExtField))
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpSemis.hs:9:8-12 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpSemis.hs:9:8-12 })
+          (EpAnn
+           (EpaSpan { DumpSemis.hs:9:8-12 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsAppTy
            (NoExtField)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpSemis.hs:9:8-9 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpSemis.hs:9:8-9 })
+            (EpAnn
+             (EpaSpan { DumpSemis.hs:9:8-9 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { DumpSemis.hs:9:8-9 })
@@ -204,21 +204,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpSemis.hs:9:8-9 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { DumpSemis.hs:9:8-9 })
+              (EpAnn
+               (EpaSpan { DumpSemis.hs:9:8-9 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: IO}))))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpSemis.hs:9:11-12 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpSemis.hs:9:11-12 })
+            (EpAnn
+             (EpaSpan { DumpSemis.hs:9:11-12 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTupleTy
              (EpAnn
               (EpaSpan { DumpSemis.hs:9:11-12 })
@@ -231,50 +231,50 @@
              (HsBoxedOrConstraintTuple)
              []))))))))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpSemis.hs:(10,1)-(12,3) })
-                 (AnnListItem
-                  [(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:13:1 }))
-                  ,(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:13:3 }))
-                  ,(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:13:4 }))])
-                 (EpaComments
-                  [])) { DumpSemis.hs:(10,1)-(12,3) })
+    (EpAnn
+     (EpaSpan { DumpSemis.hs:(10,1)-(12,3) })
+     (AnnListItem
+      [(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:13:1 }))
+      ,(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:13:3 }))
+      ,(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:13:4 }))])
+     (EpaComments
+      []))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpSemis.hs:10:1-3 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { DumpSemis.hs:10:1-3 })
+       (EpAnn
+        (EpaSpan { DumpSemis.hs:10:1-3 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: foo}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpSemis.hs:(10,1)-(12,3) })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { DumpSemis.hs:(10,1)-(12,3) })
+        (EpAnn
+         (EpaSpan { DumpSemis.hs:(10,1)-(12,3) })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpSemis.hs:(10,1)-(12,3) })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpSemis.hs:(10,1)-(12,3) })
+          (EpAnn
+           (EpaSpan { DumpSemis.hs:(10,1)-(12,3) })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { DumpSemis.hs:(10,1)-(12,3) })
@@ -283,12 +283,12 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpSemis.hs:10:1-3 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpSemis.hs:10:1-3 })
+             (EpAnn
+              (EpaSpan { DumpSemis.hs:10:1-3 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: foo}))
             (Prefix)
@@ -298,13 +298,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { DumpSemis.hs:(10,5)-(12,3) })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { DumpSemis.hs:(10,5)-(12,3) })
+              (EpAnn
+               (EpaSpan { DumpSemis.hs:(10,5)-(12,3) })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { DumpSemis.hs:(10,5)-(12,3) })
@@ -315,12 +313,12 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpSemis.hs:(10,7)-(12,3) })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpSemis.hs:(10,7)-(12,3) })
+                (EpAnn
+                 (EpaSpan { DumpSemis.hs:(10,7)-(12,3) })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsDo
                  (EpAnn
                   (EpaSpan { DumpSemis.hs:(10,7)-(12,3) })
@@ -336,33 +334,33 @@
                  (DoExpr
                   (Nothing))
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpSemis.hs:(11,3)-(12,3) })
-                               (AnnList
-                                (Just
-                                 (EpaSpan { DumpSemis.hs:(11,3)-(12,3) }))
-                                (Nothing)
-                                (Nothing)
-                                []
-                                [])
-                               (EpaComments
-                                [])) { DumpSemis.hs:(11,3)-(12,3) })
+                  (EpAnn
+                   (EpaSpan { DumpSemis.hs:(11,3)-(12,3) })
+                   (AnnList
+                    (Just
+                     (EpaSpan { DumpSemis.hs:(11,3)-(12,3) }))
+                    (Nothing)
+                    (Nothing)
+                    []
+                    [])
+                   (EpaComments
+                    []))
                   [(L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { DumpSemis.hs:11:3-15 })
-                                 (AnnListItem
-                                  [])
-                                 (EpaComments
-                                  [])) { DumpSemis.hs:11:3-15 })
+                    (EpAnn
+                     (EpaSpan { DumpSemis.hs:11:3-15 })
+                     (AnnListItem
+                      [])
+                     (EpaComments
+                      []))
                     (BodyStmt
                      (NoExtField)
                      (L
-                      (SrcSpanAnn (EpAnn
-                                   (EpaSpan { DumpSemis.hs:11:3-15 })
-                                   (AnnListItem
-                                    [])
-                                   (EpaComments
-                                    [])) { DumpSemis.hs:11:3-15 })
+                      (EpAnn
+                       (EpaSpan { DumpSemis.hs:11:3-15 })
+                       (AnnListItem
+                        [])
+                       (EpaComments
+                        []))
                       (HsDo
                        (EpAnn
                         (EpaSpan { DumpSemis.hs:11:3-15 })
@@ -378,47 +376,47 @@
                        (DoExpr
                         (Nothing))
                        (L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpSemis.hs:11:6-15 })
-                                     (AnnList
-                                      (Just
-                                       (EpaSpan { DumpSemis.hs:11:8-13 }))
-                                      (Just
-                                       (AddEpAnn AnnOpenC (EpaSpan { DumpSemis.hs:11:6 })))
-                                      (Just
-                                       (AddEpAnn AnnCloseC (EpaSpan { DumpSemis.hs:11:15 })))
-                                      [(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:11:8 }))
-                                      ,(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:11:9 }))
-                                      ,(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:11:10 }))
-                                      ,(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:11:11 }))]
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpSemis.hs:11:6-15 })
+                        (EpAnn
+                         (EpaSpan { DumpSemis.hs:11:6-15 })
+                         (AnnList
+                          (Just
+                           (EpaSpan { DumpSemis.hs:11:8-13 }))
+                          (Just
+                           (AddEpAnn AnnOpenC (EpaSpan { DumpSemis.hs:11:6 })))
+                          (Just
+                           (AddEpAnn AnnCloseC (EpaSpan { DumpSemis.hs:11:15 })))
+                          [(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:11:8 }))
+                          ,(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:11:9 }))
+                          ,(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:11:10 }))
+                          ,(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:11:11 }))]
+                          [])
+                         (EpaComments
+                          []))
                         [(L
-                          (SrcSpanAnn (EpAnn
-                                       (EpaSpan { DumpSemis.hs:11:13 })
-                                       (AnnListItem
-                                        [])
-                                       (EpaComments
-                                        [])) { DumpSemis.hs:11:13 })
+                          (EpAnn
+                           (EpaSpan { DumpSemis.hs:11:13 })
+                           (AnnListItem
+                            [])
+                           (EpaComments
+                            []))
                           (BodyStmt
                            (NoExtField)
                            (L
-                            (SrcSpanAnn (EpAnn
-                                         (EpaSpan { DumpSemis.hs:11:13 })
-                                         (AnnListItem
-                                          [])
-                                         (EpaComments
-                                          [])) { DumpSemis.hs:11:13 })
+                            (EpAnn
+                             (EpaSpan { DumpSemis.hs:11:13 })
+                             (AnnListItem
+                              [])
+                             (EpaComments
+                              []))
                             (HsVar
                              (NoExtField)
                              (L
-                              (SrcSpanAnn (EpAnn
-                                           (EpaSpan { DumpSemis.hs:11:13 })
-                                           (NameAnnTrailing
-                                            [])
-                                           (EpaComments
-                                            [])) { DumpSemis.hs:11:13 })
+                              (EpAnn
+                               (EpaSpan { DumpSemis.hs:11:13 })
+                               (NameAnnTrailing
+                                [])
+                               (EpaComments
+                                []))
                               (Unqual
                                {OccName: a}))))
                            (NoExtField)
@@ -426,30 +424,30 @@
                      (NoExtField)
                      (NoExtField)))
                   ,(L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { DumpSemis.hs:12:3 })
-                                 (AnnListItem
-                                  [])
-                                 (EpaComments
-                                  [])) { DumpSemis.hs:12:3 })
+                    (EpAnn
+                     (EpaSpan { DumpSemis.hs:12:3 })
+                     (AnnListItem
+                      [])
+                     (EpaComments
+                      []))
                     (BodyStmt
                      (NoExtField)
                      (L
-                      (SrcSpanAnn (EpAnn
-                                   (EpaSpan { DumpSemis.hs:12:3 })
-                                   (AnnListItem
-                                    [])
-                                   (EpaComments
-                                    [])) { DumpSemis.hs:12:3 })
+                      (EpAnn
+                       (EpaSpan { DumpSemis.hs:12:3 })
+                       (AnnListItem
+                        [])
+                       (EpaComments
+                        []))
                       (HsVar
                        (NoExtField)
                        (L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpSemis.hs:12:3 })
-                                     (NameAnnTrailing
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpSemis.hs:12:3 })
+                        (EpAnn
+                         (EpaSpan { DumpSemis.hs:12:3 })
+                         (NameAnnTrailing
+                          [])
+                         (EpaComments
+                          []))
                         (Unqual
                          {OccName: a}))))
                      (NoExtField)
@@ -457,12 +455,12 @@
             (EmptyLocalBinds
              (NoExtField)))))])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpSemis.hs:14:1-12 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpSemis.hs:14:1-12 })
+    (EpAnn
+     (EpaSpan { DumpSemis.hs:14:1-12 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (SigD
      (NoExtField)
      (TypeSig
@@ -474,43 +472,43 @@
        (EpaComments
         []))
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpSemis.hs:14:1-3 })
-                     (NameAnnTrailing
-                      [])
-                     (EpaComments
-                      [])) { DumpSemis.hs:14:1-3 })
+        (EpAnn
+         (EpaSpan { DumpSemis.hs:14:1-3 })
+         (NameAnnTrailing
+          [])
+         (EpaComments
+          []))
         (Unqual
          {OccName: bar}))]
       (HsWC
        (NoExtField)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpSemis.hs:14:8-12 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { DumpSemis.hs:14:8-12 })
+        (EpAnn
+         (EpaSpan { DumpSemis.hs:14:8-12 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (HsSig
          (NoExtField)
          (HsOuterImplicit
           (NoExtField))
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpSemis.hs:14:8-12 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpSemis.hs:14:8-12 })
+          (EpAnn
+           (EpaSpan { DumpSemis.hs:14:8-12 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsAppTy
            (NoExtField)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpSemis.hs:14:8-9 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpSemis.hs:14:8-9 })
+            (EpAnn
+             (EpaSpan { DumpSemis.hs:14:8-9 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { DumpSemis.hs:14:8-9 })
@@ -519,21 +517,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpSemis.hs:14:8-9 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { DumpSemis.hs:14:8-9 })
+              (EpAnn
+               (EpaSpan { DumpSemis.hs:14:8-9 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: IO}))))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpSemis.hs:14:11-12 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpSemis.hs:14:11-12 })
+            (EpAnn
+             (EpaSpan { DumpSemis.hs:14:11-12 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTupleTy
              (EpAnn
               (EpaSpan { DumpSemis.hs:14:11-12 })
@@ -546,52 +544,52 @@
              (HsBoxedOrConstraintTuple)
              []))))))))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpSemis.hs:(15,1)-(19,3) })
-                 (AnnListItem
-                  [(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:20:2 }))
-                  ,(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:20:4 }))
-                  ,(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:20:5 }))
-                  ,(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:20:8 }))])
-                 (EpaComments
-                  [])) { DumpSemis.hs:(15,1)-(19,3) })
+    (EpAnn
+     (EpaSpan { DumpSemis.hs:(15,1)-(19,3) })
+     (AnnListItem
+      [(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:20:2 }))
+      ,(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:20:4 }))
+      ,(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:20:5 }))
+      ,(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:20:8 }))])
+     (EpaComments
+      []))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpSemis.hs:15:1-3 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { DumpSemis.hs:15:1-3 })
+       (EpAnn
+        (EpaSpan { DumpSemis.hs:15:1-3 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: bar}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpSemis.hs:(15,1)-(19,3) })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { DumpSemis.hs:(15,1)-(19,3) })
+        (EpAnn
+         (EpaSpan { DumpSemis.hs:(15,1)-(19,3) })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpSemis.hs:(15,1)-(19,3) })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpSemis.hs:(15,1)-(19,3) })
+          (EpAnn
+           (EpaSpan { DumpSemis.hs:(15,1)-(19,3) })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { DumpSemis.hs:(15,1)-(19,3) })
@@ -600,12 +598,12 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpSemis.hs:15:1-3 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpSemis.hs:15:1-3 })
+             (EpAnn
+              (EpaSpan { DumpSemis.hs:15:1-3 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: bar}))
             (Prefix)
@@ -615,13 +613,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { DumpSemis.hs:(15,5)-(19,3) })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { DumpSemis.hs:(15,5)-(19,3) })
+              (EpAnn
+               (EpaSpan { DumpSemis.hs:(15,5)-(19,3) })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { DumpSemis.hs:(15,5)-(19,3) })
@@ -632,12 +628,12 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpSemis.hs:(15,7)-(19,3) })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpSemis.hs:(15,7)-(19,3) })
+                (EpAnn
+                 (EpaSpan { DumpSemis.hs:(15,7)-(19,3) })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsDo
                  (EpAnn
                   (EpaSpan { DumpSemis.hs:(15,7)-(19,3) })
@@ -653,77 +649,77 @@
                  (DoExpr
                   (Nothing))
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpSemis.hs:(16,3)-(19,3) })
-                               (AnnList
-                                (Just
-                                 (EpaSpan { DumpSemis.hs:(16,5)-(18,5) }))
-                                (Just
-                                 (AddEpAnn AnnOpenC (EpaSpan { DumpSemis.hs:16:3 })))
-                                (Just
-                                 (AddEpAnn AnnCloseC (EpaSpan { DumpSemis.hs:19:3 })))
-                                [(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:16:5 }))
-                                ,(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:16:8 }))]
-                                [])
-                               (EpaComments
-                                [])) { DumpSemis.hs:(16,3)-(19,3) })
+                  (EpAnn
+                   (EpaSpan { DumpSemis.hs:(16,3)-(19,3) })
+                   (AnnList
+                    (Just
+                     (EpaSpan { DumpSemis.hs:(16,5)-(18,5) }))
+                    (Just
+                     (AddEpAnn AnnOpenC (EpaSpan { DumpSemis.hs:16:3 })))
+                    (Just
+                     (AddEpAnn AnnCloseC (EpaSpan { DumpSemis.hs:19:3 })))
+                    [(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:16:5 }))
+                    ,(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:16:8 }))]
+                    [])
+                   (EpaComments
+                    []))
                   [(L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { DumpSemis.hs:17:5 })
-                                 (AnnListItem
-                                  [(AddSemiAnn
-                                    (EpaSpan { DumpSemis.hs:17:7 }))
-                                  ,(AddSemiAnn
-                                    (EpaSpan { DumpSemis.hs:17:8 }))])
-                                 (EpaComments
-                                  [])) { DumpSemis.hs:17:5 })
+                    (EpAnn
+                     (EpaSpan { DumpSemis.hs:17:5 })
+                     (AnnListItem
+                      [(AddSemiAnn
+                        (EpaSpan { DumpSemis.hs:17:7 }))
+                      ,(AddSemiAnn
+                        (EpaSpan { DumpSemis.hs:17:8 }))])
+                     (EpaComments
+                      []))
                     (BodyStmt
                      (NoExtField)
                      (L
-                      (SrcSpanAnn (EpAnn
-                                   (EpaSpan { DumpSemis.hs:17:5 })
-                                   (AnnListItem
-                                    [])
-                                   (EpaComments
-                                    [])) { DumpSemis.hs:17:5 })
+                      (EpAnn
+                       (EpaSpan { DumpSemis.hs:17:5 })
+                       (AnnListItem
+                        [])
+                       (EpaComments
+                        []))
                       (HsVar
                        (NoExtField)
                        (L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpSemis.hs:17:5 })
-                                     (NameAnnTrailing
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpSemis.hs:17:5 })
+                        (EpAnn
+                         (EpaSpan { DumpSemis.hs:17:5 })
+                         (NameAnnTrailing
+                          [])
+                         (EpaComments
+                          []))
                         (Unqual
                          {OccName: a}))))
                      (NoExtField)
                      (NoExtField)))
                   ,(L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { DumpSemis.hs:18:5 })
-                                 (AnnListItem
-                                  [])
-                                 (EpaComments
-                                  [])) { DumpSemis.hs:18:5 })
+                    (EpAnn
+                     (EpaSpan { DumpSemis.hs:18:5 })
+                     (AnnListItem
+                      [])
+                     (EpaComments
+                      []))
                     (BodyStmt
                      (NoExtField)
                      (L
-                      (SrcSpanAnn (EpAnn
-                                   (EpaSpan { DumpSemis.hs:18:5 })
-                                   (AnnListItem
-                                    [])
-                                   (EpaComments
-                                    [])) { DumpSemis.hs:18:5 })
+                      (EpAnn
+                       (EpaSpan { DumpSemis.hs:18:5 })
+                       (AnnListItem
+                        [])
+                       (EpaComments
+                        []))
                       (HsVar
                        (NoExtField)
                        (L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpSemis.hs:18:5 })
-                                     (NameAnnTrailing
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpSemis.hs:18:5 })
+                        (EpAnn
+                         (EpaSpan { DumpSemis.hs:18:5 })
+                         (NameAnnTrailing
+                          [])
+                         (EpaComments
+                          []))
                         (Unqual
                          {OccName: b}))))
                      (NoExtField)
@@ -731,12 +727,12 @@
             (EmptyLocalBinds
              (NoExtField)))))])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpSemis.hs:21:1-12 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpSemis.hs:21:1-12 })
+    (EpAnn
+     (EpaSpan { DumpSemis.hs:21:1-12 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (SigD
      (NoExtField)
      (TypeSig
@@ -748,43 +744,43 @@
        (EpaComments
         []))
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpSemis.hs:21:1-3 })
-                     (NameAnnTrailing
-                      [])
-                     (EpaComments
-                      [])) { DumpSemis.hs:21:1-3 })
+        (EpAnn
+         (EpaSpan { DumpSemis.hs:21:1-3 })
+         (NameAnnTrailing
+          [])
+         (EpaComments
+          []))
         (Unqual
          {OccName: baz}))]
       (HsWC
        (NoExtField)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpSemis.hs:21:8-12 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { DumpSemis.hs:21:8-12 })
+        (EpAnn
+         (EpaSpan { DumpSemis.hs:21:8-12 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (HsSig
          (NoExtField)
          (HsOuterImplicit
           (NoExtField))
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpSemis.hs:21:8-12 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpSemis.hs:21:8-12 })
+          (EpAnn
+           (EpaSpan { DumpSemis.hs:21:8-12 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsAppTy
            (NoExtField)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpSemis.hs:21:8-9 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpSemis.hs:21:8-9 })
+            (EpAnn
+             (EpaSpan { DumpSemis.hs:21:8-9 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { DumpSemis.hs:21:8-9 })
@@ -793,21 +789,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpSemis.hs:21:8-9 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { DumpSemis.hs:21:8-9 })
+              (EpAnn
+               (EpaSpan { DumpSemis.hs:21:8-9 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: IO}))))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpSemis.hs:21:11-12 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpSemis.hs:21:11-12 })
+            (EpAnn
+             (EpaSpan { DumpSemis.hs:21:11-12 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTupleTy
              (EpAnn
               (EpaSpan { DumpSemis.hs:21:11-12 })
@@ -820,46 +816,46 @@
              (HsBoxedOrConstraintTuple)
              []))))))))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpSemis.hs:22:1-30 })
-                 (AnnListItem
-                  [(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:23:1 }))])
-                 (EpaComments
-                  [])) { DumpSemis.hs:22:1-30 })
+    (EpAnn
+     (EpaSpan { DumpSemis.hs:22:1-30 })
+     (AnnListItem
+      [(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:23:1 }))])
+     (EpaComments
+      []))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpSemis.hs:22:1-3 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { DumpSemis.hs:22:1-3 })
+       (EpAnn
+        (EpaSpan { DumpSemis.hs:22:1-3 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: baz}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpSemis.hs:22:1-30 })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { DumpSemis.hs:22:1-30 })
+        (EpAnn
+         (EpaSpan { DumpSemis.hs:22:1-30 })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpSemis.hs:22:1-30 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpSemis.hs:22:1-30 })
+          (EpAnn
+           (EpaSpan { DumpSemis.hs:22:1-30 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { DumpSemis.hs:22:1-30 })
@@ -868,12 +864,12 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpSemis.hs:22:1-3 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpSemis.hs:22:1-3 })
+             (EpAnn
+              (EpaSpan { DumpSemis.hs:22:1-3 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: baz}))
             (Prefix)
@@ -883,13 +879,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { DumpSemis.hs:22:5-30 })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { DumpSemis.hs:22:5-30 })
+              (EpAnn
+               (EpaSpan { DumpSemis.hs:22:5-30 })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { DumpSemis.hs:22:5-30 })
@@ -900,12 +894,12 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpSemis.hs:22:7-30 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpSemis.hs:22:7-30 })
+                (EpAnn
+                 (EpaSpan { DumpSemis.hs:22:7-30 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsDo
                  (EpAnn
                   (EpaSpan { DumpSemis.hs:22:7-30 })
@@ -921,110 +915,110 @@
                  (DoExpr
                   (Nothing))
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpSemis.hs:22:10-30 })
-                               (AnnList
-                                (Just
-                                 (EpaSpan { DumpSemis.hs:22:12-25 }))
-                                (Just
-                                 (AddEpAnn AnnOpenC (EpaSpan { DumpSemis.hs:22:10 })))
-                                (Just
-                                 (AddEpAnn AnnCloseC (EpaSpan { DumpSemis.hs:22:30 })))
-                                [(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:22:12 }))
-                                ,(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:22:13 }))]
-                                [])
-                               (EpaComments
-                                [])) { DumpSemis.hs:22:10-30 })
+                  (EpAnn
+                   (EpaSpan { DumpSemis.hs:22:10-30 })
+                   (AnnList
+                    (Just
+                     (EpaSpan { DumpSemis.hs:22:12-25 }))
+                    (Just
+                     (AddEpAnn AnnOpenC (EpaSpan { DumpSemis.hs:22:10 })))
+                    (Just
+                     (AddEpAnn AnnCloseC (EpaSpan { DumpSemis.hs:22:30 })))
+                    [(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:22:12 }))
+                    ,(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:22:13 }))]
+                    [])
+                   (EpaComments
+                    []))
                   [(L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { DumpSemis.hs:22:15 })
-                                 (AnnListItem
-                                  [(AddSemiAnn
-                                    (EpaSpan { DumpSemis.hs:22:17 }))])
-                                 (EpaComments
-                                  [])) { DumpSemis.hs:22:15 })
+                    (EpAnn
+                     (EpaSpan { DumpSemis.hs:22:15 })
+                     (AnnListItem
+                      [(AddSemiAnn
+                        (EpaSpan { DumpSemis.hs:22:17 }))])
+                     (EpaComments
+                      []))
                     (BodyStmt
                      (NoExtField)
                      (L
-                      (SrcSpanAnn (EpAnn
-                                   (EpaSpan { DumpSemis.hs:22:15 })
-                                   (AnnListItem
-                                    [])
-                                   (EpaComments
-                                    [])) { DumpSemis.hs:22:15 })
+                      (EpAnn
+                       (EpaSpan { DumpSemis.hs:22:15 })
+                       (AnnListItem
+                        [])
+                       (EpaComments
+                        []))
                       (HsVar
                        (NoExtField)
                        (L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpSemis.hs:22:15 })
-                                     (NameAnnTrailing
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpSemis.hs:22:15 })
+                        (EpAnn
+                         (EpaSpan { DumpSemis.hs:22:15 })
+                         (NameAnnTrailing
+                          [])
+                         (EpaComments
+                          []))
                         (Unqual
                          {OccName: s}))))
                      (NoExtField)
                      (NoExtField)))
                   ,(L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { DumpSemis.hs:22:19 })
-                                 (AnnListItem
-                                  [(AddSemiAnn
-                                    (EpaSpan { DumpSemis.hs:22:21 }))
-                                  ,(AddSemiAnn
-                                    (EpaSpan { DumpSemis.hs:22:23 }))])
-                                 (EpaComments
-                                  [])) { DumpSemis.hs:22:19 })
+                    (EpAnn
+                     (EpaSpan { DumpSemis.hs:22:19 })
+                     (AnnListItem
+                      [(AddSemiAnn
+                        (EpaSpan { DumpSemis.hs:22:21 }))
+                      ,(AddSemiAnn
+                        (EpaSpan { DumpSemis.hs:22:23 }))])
+                     (EpaComments
+                      []))
                     (BodyStmt
                      (NoExtField)
                      (L
-                      (SrcSpanAnn (EpAnn
-                                   (EpaSpan { DumpSemis.hs:22:19 })
-                                   (AnnListItem
-                                    [])
-                                   (EpaComments
-                                    [])) { DumpSemis.hs:22:19 })
+                      (EpAnn
+                       (EpaSpan { DumpSemis.hs:22:19 })
+                       (AnnListItem
+                        [])
+                       (EpaComments
+                        []))
                       (HsVar
                        (NoExtField)
                        (L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpSemis.hs:22:19 })
-                                     (NameAnnTrailing
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpSemis.hs:22:19 })
+                        (EpAnn
+                         (EpaSpan { DumpSemis.hs:22:19 })
+                         (NameAnnTrailing
+                          [])
+                         (EpaComments
+                          []))
                         (Unqual
                          {OccName: s}))))
                      (NoExtField)
                      (NoExtField)))
                   ,(L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { DumpSemis.hs:22:25 })
-                                 (AnnListItem
-                                  [(AddSemiAnn
-                                    (EpaSpan { DumpSemis.hs:22:27 }))
-                                  ,(AddSemiAnn
-                                    (EpaSpan { DumpSemis.hs:22:28 }))])
-                                 (EpaComments
-                                  [])) { DumpSemis.hs:22:25 })
+                    (EpAnn
+                     (EpaSpan { DumpSemis.hs:22:25 })
+                     (AnnListItem
+                      [(AddSemiAnn
+                        (EpaSpan { DumpSemis.hs:22:27 }))
+                      ,(AddSemiAnn
+                        (EpaSpan { DumpSemis.hs:22:28 }))])
+                     (EpaComments
+                      []))
                     (BodyStmt
                      (NoExtField)
                      (L
-                      (SrcSpanAnn (EpAnn
-                                   (EpaSpan { DumpSemis.hs:22:25 })
-                                   (AnnListItem
-                                    [])
-                                   (EpaComments
-                                    [])) { DumpSemis.hs:22:25 })
+                      (EpAnn
+                       (EpaSpan { DumpSemis.hs:22:25 })
+                       (AnnListItem
+                        [])
+                       (EpaComments
+                        []))
                       (HsVar
                        (NoExtField)
                        (L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpSemis.hs:22:25 })
-                                     (NameAnnTrailing
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpSemis.hs:22:25 })
+                        (EpAnn
+                         (EpaSpan { DumpSemis.hs:22:25 })
+                         (NameAnnTrailing
+                          [])
+                         (EpaComments
+                          []))
                         (Unqual
                          {OccName: s}))))
                      (NoExtField)
@@ -1032,45 +1026,45 @@
             (EmptyLocalBinds
              (NoExtField)))))])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpSemis.hs:24:1-13 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpSemis.hs:24:1-13 })
+    (EpAnn
+     (EpaSpan { DumpSemis.hs:24:1-13 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpSemis.hs:24:1 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { DumpSemis.hs:24:1 })
+       (EpAnn
+        (EpaSpan { DumpSemis.hs:24:1 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: a}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpSemis.hs:24:1-13 })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { DumpSemis.hs:24:1-13 })
+        (EpAnn
+         (EpaSpan { DumpSemis.hs:24:1-13 })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpSemis.hs:24:1-13 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpSemis.hs:24:1-13 })
+          (EpAnn
+           (EpaSpan { DumpSemis.hs:24:1-13 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { DumpSemis.hs:24:1-13 })
@@ -1079,12 +1073,12 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpSemis.hs:24:1 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpSemis.hs:24:1 })
+             (EpAnn
+              (EpaSpan { DumpSemis.hs:24:1 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: a}))
             (Prefix)
@@ -1094,13 +1088,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { DumpSemis.hs:24:3-13 })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { DumpSemis.hs:24:3-13 })
+              (EpAnn
+               (EpaSpan { DumpSemis.hs:24:3-13 })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { DumpSemis.hs:24:3-13 })
@@ -1111,65 +1103,65 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpSemis.hs:24:5-13 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpSemis.hs:24:5-13 })
+                (EpAnn
+                 (EpaSpan { DumpSemis.hs:24:5-13 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsVar
                  (NoExtField)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpSemis.hs:24:5-13 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { DumpSemis.hs:24:5-13 })
+                  (EpAnn
+                   (EpaSpan { DumpSemis.hs:24:5-13 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: undefined}))))))]
             (EmptyLocalBinds
              (NoExtField)))))])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpSemis.hs:25:1-13 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpSemis.hs:25:1-13 })
+    (EpAnn
+     (EpaSpan { DumpSemis.hs:25:1-13 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpSemis.hs:25:1 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { DumpSemis.hs:25:1 })
+       (EpAnn
+        (EpaSpan { DumpSemis.hs:25:1 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: b}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpSemis.hs:25:1-13 })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { DumpSemis.hs:25:1-13 })
+        (EpAnn
+         (EpaSpan { DumpSemis.hs:25:1-13 })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpSemis.hs:25:1-13 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpSemis.hs:25:1-13 })
+          (EpAnn
+           (EpaSpan { DumpSemis.hs:25:1-13 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { DumpSemis.hs:25:1-13 })
@@ -1178,12 +1170,12 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpSemis.hs:25:1 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpSemis.hs:25:1 })
+             (EpAnn
+              (EpaSpan { DumpSemis.hs:25:1 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: b}))
             (Prefix)
@@ -1193,13 +1185,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { DumpSemis.hs:25:3-13 })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { DumpSemis.hs:25:3-13 })
+              (EpAnn
+               (EpaSpan { DumpSemis.hs:25:3-13 })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { DumpSemis.hs:25:3-13 })
@@ -1210,66 +1200,66 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpSemis.hs:25:5-13 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpSemis.hs:25:5-13 })
+                (EpAnn
+                 (EpaSpan { DumpSemis.hs:25:5-13 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsVar
                  (NoExtField)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpSemis.hs:25:5-13 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { DumpSemis.hs:25:5-13 })
+                  (EpAnn
+                   (EpaSpan { DumpSemis.hs:25:5-13 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: undefined}))))))]
             (EmptyLocalBinds
              (NoExtField)))))])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpSemis.hs:26:1-13 })
-                 (AnnListItem
-                  [(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:27:1 }))])
-                 (EpaComments
-                  [])) { DumpSemis.hs:26:1-13 })
+    (EpAnn
+     (EpaSpan { DumpSemis.hs:26:1-13 })
+     (AnnListItem
+      [(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:27:1 }))])
+     (EpaComments
+      []))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpSemis.hs:26:1 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { DumpSemis.hs:26:1 })
+       (EpAnn
+        (EpaSpan { DumpSemis.hs:26:1 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: s}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpSemis.hs:26:1-13 })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { DumpSemis.hs:26:1-13 })
+        (EpAnn
+         (EpaSpan { DumpSemis.hs:26:1-13 })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpSemis.hs:26:1-13 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpSemis.hs:26:1-13 })
+          (EpAnn
+           (EpaSpan { DumpSemis.hs:26:1-13 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { DumpSemis.hs:26:1-13 })
@@ -1278,12 +1268,12 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpSemis.hs:26:1 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpSemis.hs:26:1 })
+             (EpAnn
+              (EpaSpan { DumpSemis.hs:26:1 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: s}))
             (Prefix)
@@ -1293,13 +1283,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { DumpSemis.hs:26:3-13 })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { DumpSemis.hs:26:3-13 })
+              (EpAnn
+               (EpaSpan { DumpSemis.hs:26:3-13 })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { DumpSemis.hs:26:3-13 })
@@ -1310,33 +1298,33 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpSemis.hs:26:5-13 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpSemis.hs:26:5-13 })
+                (EpAnn
+                 (EpaSpan { DumpSemis.hs:26:5-13 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsVar
                  (NoExtField)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpSemis.hs:26:5-13 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { DumpSemis.hs:26:5-13 })
+                  (EpAnn
+                   (EpaSpan { DumpSemis.hs:26:5-13 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: undefined}))))))]
             (EmptyLocalBinds
              (NoExtField)))))])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpSemis.hs:(28,1)-(29,23) })
-                 (AnnListItem
-                  [(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:30:1 }))])
-                 (EpaComments
-                  [])) { DumpSemis.hs:(28,1)-(29,23) })
+    (EpAnn
+     (EpaSpan { DumpSemis.hs:(28,1)-(29,23) })
+     (AnnListItem
+      [(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:30:1 }))])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (ClassDecl
@@ -1352,23 +1340,23 @@
        (3))
       (Nothing)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpSemis.hs:28:7-19 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { DumpSemis.hs:28:7-19 })
+       (EpAnn
+        (EpaSpan { DumpSemis.hs:28:7-19 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: LiftingMonad2}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { DumpSemis.hs:28:22-38 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { DumpSemis.hs:28:22-38 })
+         (EpAnn
+          (EpaSpan { DumpSemis.hs:28:22-38 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (KindedTyVar
           (EpAnn
            (EpaSpan { DumpSemis.hs:28:22-38 })
@@ -1381,21 +1369,21 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpSemis.hs:28:24-28 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { DumpSemis.hs:28:24-28 })
+           (EpAnn
+            (EpaSpan { DumpSemis.hs:28:24-28 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: trans}))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpSemis.hs:28:33-36 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { DumpSemis.hs:28:33-36 })
+           (EpAnn
+            (EpaSpan { DumpSemis.hs:28:33-36 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsTyVar
             (EpAnn
              (EpaSpan { DumpSemis.hs:28:33-36 })
@@ -1404,23 +1392,23 @@
               []))
             (NotPromoted)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpSemis.hs:28:33-36 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpSemis.hs:28:33-36 })
+             (EpAnn
+              (EpaSpan { DumpSemis.hs:28:33-36 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: Type}))))))])
       (Prefix)
       []
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpSemis.hs:29:3-23 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { DumpSemis.hs:29:3-23 })
+        (EpAnn
+         (EpaSpan { DumpSemis.hs:29:3-23 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (ClassOpSig
          (EpAnn
           (EpaSpan { DumpSemis.hs:29:3-23 })
@@ -1431,32 +1419,32 @@
            []))
          (False)
          [(L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpSemis.hs:29:3-7 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { DumpSemis.hs:29:3-7 })
+           (EpAnn
+            (EpaSpan { DumpSemis.hs:29:3-7 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: proof}))]
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpSemis.hs:29:12-23 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpSemis.hs:29:12-23 })
+          (EpAnn
+           (EpaSpan { DumpSemis.hs:29:12-23 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsSig
            (NoExtField)
            (HsOuterImplicit
             (NoExtField))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpSemis.hs:29:12-23 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpSemis.hs:29:12-23 })
+            (EpAnn
+             (EpaSpan { DumpSemis.hs:29:12-23 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsFunTy
              (EpAnn
               (EpaSpan { DumpSemis.hs:29:12-23 })
@@ -1469,12 +1457,12 @@
                 (EpaSpan { DumpSemis.hs:29:18-19 }))
                (HsNormalTok)))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpSemis.hs:29:12-16 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { DumpSemis.hs:29:12-16 })
+              (EpAnn
+               (EpaSpan { DumpSemis.hs:29:12-16 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { DumpSemis.hs:29:12-16 })
@@ -1483,21 +1471,21 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpSemis.hs:29:12-16 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { DumpSemis.hs:29:12-16 })
+                (EpAnn
+                 (EpaSpan { DumpSemis.hs:29:12-16 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: trans}))))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpSemis.hs:29:21-23 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { DumpSemis.hs:29:21-23 })
+              (EpAnn
+               (EpaSpan { DumpSemis.hs:29:21-23 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { DumpSemis.hs:29:21-23 })
@@ -1506,12 +1494,12 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpSemis.hs:29:21-23 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { DumpSemis.hs:29:21-23 })
+                (EpAnn
+                 (EpaSpan { DumpSemis.hs:29:21-23 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: Int}))))))))))]
       {Bag(LocatedA (HsBind GhcPs)):
@@ -1520,12 +1508,12 @@
       []
       [])))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpSemis.hs:31:1-30 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { DumpSemis.hs:31:1-30 })
+    (EpAnn
+     (EpaSpan { DumpSemis.hs:31:1-30 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (SigD
      (NoExtField)
      (TypeSig
@@ -1537,67 +1525,67 @@
        (EpaComments
         []))
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpSemis.hs:31:1 })
-                     (NameAnnTrailing
-                      [])
-                     (EpaComments
-                      [])) { DumpSemis.hs:31:1 })
+        (EpAnn
+         (EpaSpan { DumpSemis.hs:31:1 })
+         (NameAnnTrailing
+          [])
+         (EpaComments
+          []))
         (Unqual
          {OccName: f}))]
       (HsWC
        (NoExtField)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpSemis.hs:31:6-30 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { DumpSemis.hs:31:6-30 })
+        (EpAnn
+         (EpaSpan { DumpSemis.hs:31:6-30 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (HsSig
          (NoExtField)
          (HsOuterImplicit
           (NoExtField))
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpSemis.hs:31:6-30 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpSemis.hs:31:6-30 })
+          (EpAnn
+           (EpaSpan { DumpSemis.hs:31:6-30 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsQualTy
            (NoExtField)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpSemis.hs:31:6-20 })
-                         (AnnContext
-                          (Just
-                           ((,)
-                            (NormalSyntax)
-                            (EpaSpan { DumpSemis.hs:31:22-23 })))
-                          [(EpaSpan { DumpSemis.hs:31:6 })
-                          ,(EpaSpan { DumpSemis.hs:31:7 })]
-                          [(EpaSpan { DumpSemis.hs:31:19 })
-                          ,(EpaSpan { DumpSemis.hs:31:20 })])
-                         (EpaComments
-                          [])) { DumpSemis.hs:31:6-20 })
+            (EpAnn
+             (EpaSpan { DumpSemis.hs:31:6-20 })
+             (AnnContext
+              (Just
+               ((,)
+                (NormalSyntax)
+                (EpaSpan { DumpSemis.hs:31:22-23 })))
+              [(EpaSpan { DumpSemis.hs:31:6 })
+              ,(EpaSpan { DumpSemis.hs:31:7 })]
+              [(EpaSpan { DumpSemis.hs:31:19 })
+              ,(EpaSpan { DumpSemis.hs:31:20 })])
+             (EpaComments
+              []))
             [(L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpSemis.hs:31:8-11 })
-                           (AnnListItem
-                            [(AddCommaAnn
-                              (EpaSpan { DumpSemis.hs:31:12 }))])
-                           (EpaComments
-                            [])) { DumpSemis.hs:31:8-11 })
+              (EpAnn
+               (EpaSpan { DumpSemis.hs:31:8-11 })
+               (AnnListItem
+                [(AddCommaAnn
+                  (EpaSpan { DumpSemis.hs:31:12 }))])
+               (EpaComments
+                []))
               (HsAppTy
                (NoExtField)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpSemis.hs:31:8-9 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpSemis.hs:31:8-9 })
+                (EpAnn
+                 (EpaSpan { DumpSemis.hs:31:8-9 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsTyVar
                  (EpAnn
                   (EpaSpan { DumpSemis.hs:31:8-9 })
@@ -1606,21 +1594,21 @@
                    []))
                  (NotPromoted)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpSemis.hs:31:8-9 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { DumpSemis.hs:31:8-9 })
+                  (EpAnn
+                   (EpaSpan { DumpSemis.hs:31:8-9 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: Eq}))))
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpSemis.hs:31:11 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpSemis.hs:31:11 })
+                (EpAnn
+                 (EpaSpan { DumpSemis.hs:31:11 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsTyVar
                  (EpAnn
                   (EpaSpan { DumpSemis.hs:31:11 })
@@ -1629,30 +1617,30 @@
                    []))
                  (NotPromoted)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpSemis.hs:31:11 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { DumpSemis.hs:31:11 })
+                  (EpAnn
+                   (EpaSpan { DumpSemis.hs:31:11 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: a}))))))
             ,(L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpSemis.hs:31:14-18 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { DumpSemis.hs:31:14-18 })
+              (EpAnn
+               (EpaSpan { DumpSemis.hs:31:14-18 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsAppTy
                (NoExtField)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpSemis.hs:31:14-16 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpSemis.hs:31:14-16 })
+                (EpAnn
+                 (EpaSpan { DumpSemis.hs:31:14-16 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsTyVar
                  (EpAnn
                   (EpaSpan { DumpSemis.hs:31:14-16 })
@@ -1661,21 +1649,21 @@
                    []))
                  (NotPromoted)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpSemis.hs:31:14-16 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { DumpSemis.hs:31:14-16 })
+                  (EpAnn
+                   (EpaSpan { DumpSemis.hs:31:14-16 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: Ord}))))
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpSemis.hs:31:18 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpSemis.hs:31:18 })
+                (EpAnn
+                 (EpaSpan { DumpSemis.hs:31:18 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsTyVar
                  (EpAnn
                   (EpaSpan { DumpSemis.hs:31:18 })
@@ -1684,21 +1672,21 @@
                    []))
                  (NotPromoted)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpSemis.hs:31:18 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { DumpSemis.hs:31:18 })
+                  (EpAnn
+                   (EpaSpan { DumpSemis.hs:31:18 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: a}))))))])
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { DumpSemis.hs:31:25-30 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { DumpSemis.hs:31:25-30 })
+            (EpAnn
+             (EpaSpan { DumpSemis.hs:31:25-30 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsFunTy
              (EpAnn
               (EpaSpan { DumpSemis.hs:31:25-30 })
@@ -1711,12 +1699,12 @@
                 (EpaSpan { DumpSemis.hs:31:27-28 }))
                (HsNormalTok)))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpSemis.hs:31:25 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { DumpSemis.hs:31:25 })
+              (EpAnn
+               (EpaSpan { DumpSemis.hs:31:25 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { DumpSemis.hs:31:25 })
@@ -1725,21 +1713,21 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpSemis.hs:31:25 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { DumpSemis.hs:31:25 })
+                (EpAnn
+                 (EpaSpan { DumpSemis.hs:31:25 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: a}))))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { DumpSemis.hs:31:30 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { DumpSemis.hs:31:30 })
+              (EpAnn
+               (EpaSpan { DumpSemis.hs:31:30 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { DumpSemis.hs:31:30 })
@@ -1748,59 +1736,59 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpSemis.hs:31:30 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { DumpSemis.hs:31:30 })
+                (EpAnn
+                 (EpaSpan { DumpSemis.hs:31:30 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: a}))))))))))))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpSemis.hs:32:1-7 })
-                 (AnnListItem
-                  [(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:33:1 }))
-                  ,(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:34:6 }))
-                  ,(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:34:7 }))])
-                 (EpaComments
-                  [])) { DumpSemis.hs:32:1-7 })
+    (EpAnn
+     (EpaSpan { DumpSemis.hs:32:1-7 })
+     (AnnListItem
+      [(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:33:1 }))
+      ,(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:34:6 }))
+      ,(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:34:7 }))])
+     (EpaComments
+      []))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpSemis.hs:32:1 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { DumpSemis.hs:32:1 })
+       (EpAnn
+        (EpaSpan { DumpSemis.hs:32:1 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: f}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpSemis.hs:32:1-7 })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { DumpSemis.hs:32:1-7 })
+        (EpAnn
+         (EpaSpan { DumpSemis.hs:32:1-7 })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpSemis.hs:32:1-7 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpSemis.hs:32:1-7 })
+          (EpAnn
+           (EpaSpan { DumpSemis.hs:32:1-7 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { DumpSemis.hs:32:1-7 })
@@ -1809,45 +1797,43 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpSemis.hs:32:1 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpSemis.hs:32:1 })
+             (EpAnn
+              (EpaSpan { DumpSemis.hs:32:1 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: f}))
             (Prefix)
             (NoSrcStrict))
            [(L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpSemis.hs:32:3 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpSemis.hs:32:3 })
+             (EpAnn
+              (EpaSpan { DumpSemis.hs:32:3 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (VarPat
               (NoExtField)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpSemis.hs:32:3 })
-                            (NameAnnTrailing
-                             [])
-                            (EpaComments
-                             [])) { DumpSemis.hs:32:3 })
+               (EpAnn
+                (EpaSpan { DumpSemis.hs:32:3 })
+                (NameAnnTrailing
+                 [])
+                (EpaComments
+                 []))
                (Unqual
                 {OccName: x}))))]
            (GRHSs
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { DumpSemis.hs:32:5-7 })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { DumpSemis.hs:32:5-7 })
+              (EpAnn
+               (EpaSpan { DumpSemis.hs:32:5-7 })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { DumpSemis.hs:32:5-7 })
@@ -1858,68 +1844,68 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpSemis.hs:32:7 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpSemis.hs:32:7 })
+                (EpAnn
+                 (EpaSpan { DumpSemis.hs:32:7 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsVar
                  (NoExtField)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpSemis.hs:32:7 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { DumpSemis.hs:32:7 })
+                  (EpAnn
+                   (EpaSpan { DumpSemis.hs:32:7 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: x}))))))]
             (EmptyLocalBinds
              (NoExtField)))))])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpSemis.hs:34:8-35 })
-                 (AnnListItem
-                  [(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:34:36 }))
-                  ,(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:35:1 }))])
-                 (EpaComments
-                  [])) { DumpSemis.hs:34:8-35 })
+    (EpAnn
+     (EpaSpan { DumpSemis.hs:34:8-35 })
+     (AnnListItem
+      [(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:34:36 }))
+      ,(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:35:1 }))])
+     (EpaComments
+      []))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpSemis.hs:34:8 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { DumpSemis.hs:34:8 })
+       (EpAnn
+        (EpaSpan { DumpSemis.hs:34:8 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: x}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpSemis.hs:34:8-35 })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { DumpSemis.hs:34:8-35 })
+        (EpAnn
+         (EpaSpan { DumpSemis.hs:34:8-35 })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpSemis.hs:34:8-35 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpSemis.hs:34:8-35 })
+          (EpAnn
+           (EpaSpan { DumpSemis.hs:34:8-35 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { DumpSemis.hs:34:8-35 })
@@ -1928,12 +1914,12 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpSemis.hs:34:8 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpSemis.hs:34:8 })
+             (EpAnn
+              (EpaSpan { DumpSemis.hs:34:8 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: x}))
             (Prefix)
@@ -1943,13 +1929,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { DumpSemis.hs:34:9-35 })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { DumpSemis.hs:34:9-35 })
+              (EpAnn
+               (EpaSpan { DumpSemis.hs:34:9-35 })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { DumpSemis.hs:34:9-35 })
@@ -1960,12 +1944,12 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpSemis.hs:34:10-35 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpSemis.hs:34:10-35 })
+                (EpAnn
+                 (EpaSpan { DumpSemis.hs:34:10-35 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsLet
                  (EpAnn
                   (EpaSpan { DumpSemis.hs:34:10-35 })
@@ -1998,46 +1982,46 @@
                    (NoAnnSortKey)
                    {Bag(LocatedA (HsBind GhcPs)):
                     [(L
-                      (SrcSpanAnn (EpAnn
-                                   (EpaSpan { DumpSemis.hs:34:19-21 })
-                                   (AnnListItem
-                                    [(AddSemiAnn
-                                      (EpaSpan { DumpSemis.hs:34:22 }))
-                                    ,(AddSemiAnn
-                                      (EpaSpan { DumpSemis.hs:34:23 }))])
-                                   (EpaComments
-                                    [])) { DumpSemis.hs:34:19-21 })
+                      (EpAnn
+                       (EpaSpan { DumpSemis.hs:34:19-21 })
+                       (AnnListItem
+                        [(AddSemiAnn
+                          (EpaSpan { DumpSemis.hs:34:22 }))
+                        ,(AddSemiAnn
+                          (EpaSpan { DumpSemis.hs:34:23 }))])
+                       (EpaComments
+                        []))
                       (FunBind
                        (NoExtField)
                        (L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpSemis.hs:34:19 })
-                                     (NameAnnTrailing
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpSemis.hs:34:19 })
+                        (EpAnn
+                         (EpaSpan { DumpSemis.hs:34:19 })
+                         (NameAnnTrailing
+                          [])
+                         (EpaComments
+                          []))
                         (Unqual
                          {OccName: y}))
                        (MG
                         (FromSource)
                         (L
-                         (SrcSpanAnn (EpAnn
-                                      (EpaSpan { DumpSemis.hs:34:19-21 })
-                                      (AnnList
-                                       (Nothing)
-                                       (Nothing)
-                                       (Nothing)
-                                       []
-                                       [])
-                                      (EpaComments
-                                       [])) { DumpSemis.hs:34:19-21 })
+                         (EpAnn
+                          (EpaSpan { DumpSemis.hs:34:19-21 })
+                          (AnnList
+                           (Nothing)
+                           (Nothing)
+                           (Nothing)
+                           []
+                           [])
+                          (EpaComments
+                           []))
                          [(L
-                           (SrcSpanAnn (EpAnn
-                                        (EpaSpan { DumpSemis.hs:34:19-21 })
-                                        (AnnListItem
-                                         [])
-                                        (EpaComments
-                                         [])) { DumpSemis.hs:34:19-21 })
+                           (EpAnn
+                            (EpaSpan { DumpSemis.hs:34:19-21 })
+                            (AnnListItem
+                             [])
+                            (EpaComments
+                             []))
                            (Match
                             (EpAnn
                              (EpaSpan { DumpSemis.hs:34:19-21 })
@@ -2046,12 +2030,12 @@
                               []))
                             (FunRhs
                              (L
-                              (SrcSpanAnn (EpAnn
-                                           (EpaSpan { DumpSemis.hs:34:19 })
-                                           (NameAnnTrailing
-                                            [])
-                                           (EpaComments
-                                            [])) { DumpSemis.hs:34:19 })
+                              (EpAnn
+                               (EpaSpan { DumpSemis.hs:34:19 })
+                               (NameAnnTrailing
+                                [])
+                               (EpaComments
+                                []))
                               (Unqual
                                {OccName: y}))
                              (Prefix)
@@ -2061,13 +2045,11 @@
                              (EpaComments
                               [])
                              [(L
-                               (SrcSpanAnn
-                                (EpAnn
-                                 (EpaSpan { DumpSemis.hs:34:20-21 })
-                                 (NoEpAnns)
-                                 (EpaComments
-                                  []))
-                                { DumpSemis.hs:34:20-21 })
+                               (EpAnn
+                                (EpaSpan { DumpSemis.hs:34:20-21 })
+                                (NoEpAnns)
+                                (EpaComments
+                                 []))
                                (GRHS
                                 (EpAnn
                                  (EpaSpan { DumpSemis.hs:34:20-21 })
@@ -2078,12 +2060,12 @@
                                   []))
                                 []
                                 (L
-                                 (SrcSpanAnn (EpAnn
-                                              (EpaSpan { DumpSemis.hs:34:21 })
-                                              (AnnListItem
-                                               [])
-                                              (EpaComments
-                                               [])) { DumpSemis.hs:34:21 })
+                                 (EpAnn
+                                  (EpaSpan { DumpSemis.hs:34:21 })
+                                  (AnnListItem
+                                   [])
+                                  (EpaComments
+                                   []))
                                  (HsOverLit
                                   (EpAnn
                                    (EpaSpan { DumpSemis.hs:34:21 })
@@ -2100,50 +2082,50 @@
                              (EmptyLocalBinds
                               (NoExtField)))))]))))
                     ,(L
-                      (SrcSpanAnn (EpAnn
-                                   (EpaSpan { DumpSemis.hs:34:24-26 })
-                                   (AnnListItem
-                                    [(AddSemiAnn
-                                      (EpaSpan { DumpSemis.hs:34:27 }))
-                                    ,(AddSemiAnn
-                                      (EpaSpan { DumpSemis.hs:34:28 }))
-                                    ,(AddSemiAnn
-                                      (EpaSpan { DumpSemis.hs:34:29 }))
-                                    ,(AddSemiAnn
-                                      (EpaSpan { DumpSemis.hs:34:30 }))])
-                                   (EpaComments
-                                    [])) { DumpSemis.hs:34:24-26 })
+                      (EpAnn
+                       (EpaSpan { DumpSemis.hs:34:24-26 })
+                       (AnnListItem
+                        [(AddSemiAnn
+                          (EpaSpan { DumpSemis.hs:34:27 }))
+                        ,(AddSemiAnn
+                          (EpaSpan { DumpSemis.hs:34:28 }))
+                        ,(AddSemiAnn
+                          (EpaSpan { DumpSemis.hs:34:29 }))
+                        ,(AddSemiAnn
+                          (EpaSpan { DumpSemis.hs:34:30 }))])
+                       (EpaComments
+                        []))
                       (FunBind
                        (NoExtField)
                        (L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpSemis.hs:34:24 })
-                                     (NameAnnTrailing
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpSemis.hs:34:24 })
+                        (EpAnn
+                         (EpaSpan { DumpSemis.hs:34:24 })
+                         (NameAnnTrailing
+                          [])
+                         (EpaComments
+                          []))
                         (Unqual
                          {OccName: z}))
                        (MG
                         (FromSource)
                         (L
-                         (SrcSpanAnn (EpAnn
-                                      (EpaSpan { DumpSemis.hs:34:24-26 })
-                                      (AnnList
-                                       (Nothing)
-                                       (Nothing)
-                                       (Nothing)
-                                       []
-                                       [])
-                                      (EpaComments
-                                       [])) { DumpSemis.hs:34:24-26 })
+                         (EpAnn
+                          (EpaSpan { DumpSemis.hs:34:24-26 })
+                          (AnnList
+                           (Nothing)
+                           (Nothing)
+                           (Nothing)
+                           []
+                           [])
+                          (EpaComments
+                           []))
                          [(L
-                           (SrcSpanAnn (EpAnn
-                                        (EpaSpan { DumpSemis.hs:34:24-26 })
-                                        (AnnListItem
-                                         [])
-                                        (EpaComments
-                                         [])) { DumpSemis.hs:34:24-26 })
+                           (EpAnn
+                            (EpaSpan { DumpSemis.hs:34:24-26 })
+                            (AnnListItem
+                             [])
+                            (EpaComments
+                             []))
                            (Match
                             (EpAnn
                              (EpaSpan { DumpSemis.hs:34:24-26 })
@@ -2152,12 +2134,12 @@
                               []))
                             (FunRhs
                              (L
-                              (SrcSpanAnn (EpAnn
-                                           (EpaSpan { DumpSemis.hs:34:24 })
-                                           (NameAnnTrailing
-                                            [])
-                                           (EpaComments
-                                            [])) { DumpSemis.hs:34:24 })
+                              (EpAnn
+                               (EpaSpan { DumpSemis.hs:34:24 })
+                               (NameAnnTrailing
+                                [])
+                               (EpaComments
+                                []))
                               (Unqual
                                {OccName: z}))
                              (Prefix)
@@ -2167,13 +2149,11 @@
                              (EpaComments
                               [])
                              [(L
-                               (SrcSpanAnn
-                                (EpAnn
-                                 (EpaSpan { DumpSemis.hs:34:25-26 })
-                                 (NoEpAnns)
-                                 (EpaComments
-                                  []))
-                                { DumpSemis.hs:34:25-26 })
+                               (EpAnn
+                                (EpaSpan { DumpSemis.hs:34:25-26 })
+                                (NoEpAnns)
+                                (EpaComments
+                                 []))
                                (GRHS
                                 (EpAnn
                                  (EpaSpan { DumpSemis.hs:34:25-26 })
@@ -2184,12 +2164,12 @@
                                   []))
                                 []
                                 (L
-                                 (SrcSpanAnn (EpAnn
-                                              (EpaSpan { DumpSemis.hs:34:26 })
-                                              (AnnListItem
-                                               [])
-                                              (EpaComments
-                                               [])) { DumpSemis.hs:34:26 })
+                                 (EpAnn
+                                  (EpaSpan { DumpSemis.hs:34:26 })
+                                  (AnnListItem
+                                   [])
+                                  (EpaComments
+                                   []))
                                  (HsOverLit
                                   (EpAnn
                                    (EpaSpan { DumpSemis.hs:34:26 })
@@ -2211,66 +2191,66 @@
                    (EpaSpan { DumpSemis.hs:34:32-33 }))
                   (HsTok))
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpSemis.hs:34:35 })
-                               (AnnListItem
-                                [])
-                               (EpaComments
-                                [])) { DumpSemis.hs:34:35 })
+                  (EpAnn
+                   (EpaSpan { DumpSemis.hs:34:35 })
+                   (AnnListItem
+                    [])
+                   (EpaComments
+                    []))
                   (HsVar
                    (NoExtField)
                    (L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { DumpSemis.hs:34:35 })
-                                 (NameAnnTrailing
-                                  [])
-                                 (EpaComments
-                                  [])) { DumpSemis.hs:34:35 })
+                    (EpAnn
+                     (EpaSpan { DumpSemis.hs:34:35 })
+                     (NameAnnTrailing
+                      [])
+                     (EpaComments
+                      []))
                     (Unqual
                      {OccName: y}))))))))]
             (EmptyLocalBinds
              (NoExtField)))))])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { DumpSemis.hs:(36,1)-(44,4) })
-                 (AnnListItem
-                  [(AddSemiAnn
-                    (EpaSpan { DumpSemis.hs:45:1 }))])
-                 (EpaComments
-                  [])) { DumpSemis.hs:(36,1)-(44,4) })
+    (EpAnn
+     (EpaSpan { DumpSemis.hs:(36,1)-(44,4) })
+     (AnnListItem
+      [(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:45:1 }))])
+     (EpaComments
+      []))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { DumpSemis.hs:36:1-3 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { DumpSemis.hs:36:1-3 })
+       (EpAnn
+        (EpaSpan { DumpSemis.hs:36:1-3 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: fot}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpSemis.hs:(36,1)-(44,4) })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { DumpSemis.hs:(36,1)-(44,4) })
+        (EpAnn
+         (EpaSpan { DumpSemis.hs:(36,1)-(44,4) })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpSemis.hs:(36,1)-(44,4) })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { DumpSemis.hs:(36,1)-(44,4) })
+          (EpAnn
+           (EpaSpan { DumpSemis.hs:(36,1)-(44,4) })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { DumpSemis.hs:(36,1)-(44,4) })
@@ -2279,45 +2259,43 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpSemis.hs:36:1-3 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { DumpSemis.hs:36:1-3 })
+             (EpAnn
+              (EpaSpan { DumpSemis.hs:36:1-3 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: fot}))
             (Prefix)
             (NoSrcStrict))
            [(L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpSemis.hs:36:5 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpSemis.hs:36:5 })
+             (EpAnn
+              (EpaSpan { DumpSemis.hs:36:5 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (VarPat
               (NoExtField)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { DumpSemis.hs:36:5 })
-                            (NameAnnTrailing
-                             [])
-                            (EpaComments
-                             [])) { DumpSemis.hs:36:5 })
+               (EpAnn
+                (EpaSpan { DumpSemis.hs:36:5 })
+                (NameAnnTrailing
+                 [])
+                (EpaComments
+                 []))
                (Unqual
                 {OccName: x}))))]
            (GRHSs
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { DumpSemis.hs:(36,7)-(44,4) })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { DumpSemis.hs:(36,7)-(44,4) })
+              (EpAnn
+               (EpaSpan { DumpSemis.hs:(36,7)-(44,4) })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { DumpSemis.hs:(36,7)-(44,4) })
@@ -2328,12 +2306,12 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpSemis.hs:(37,3)-(44,4) })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { DumpSemis.hs:(37,3)-(44,4) })
+                (EpAnn
+                 (EpaSpan { DumpSemis.hs:(37,3)-(44,4) })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsCase
                  (EpAnn
                   (EpaSpan { DumpSemis.hs:(37,3)-(44,4) })
@@ -2344,49 +2322,49 @@
                   (EpaComments
                    []))
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { DumpSemis.hs:37:8 })
-                               (AnnListItem
-                                [])
-                               (EpaComments
-                                [])) { DumpSemis.hs:37:8 })
+                  (EpAnn
+                   (EpaSpan { DumpSemis.hs:37:8 })
+                   (AnnListItem
+                    [])
+                   (EpaComments
+                    []))
                   (HsVar
                    (NoExtField)
                    (L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { DumpSemis.hs:37:8 })
-                                 (NameAnnTrailing
-                                  [])
-                                 (EpaComments
-                                  [])) { DumpSemis.hs:37:8 })
+                    (EpAnn
+                     (EpaSpan { DumpSemis.hs:37:8 })
+                     (NameAnnTrailing
+                      [])
+                     (EpaComments
+                      []))
                     (Unqual
                      {OccName: x}))))
                  (MG
                   (FromSource)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpSemis.hs:(38,4)-(44,4) })
-                                (AnnList
-                                 (Just
-                                  (EpaSpan { DumpSemis.hs:(38,6)-(43,13) }))
-                                 (Just
-                                  (AddEpAnn AnnOpenC (EpaSpan { DumpSemis.hs:38:4 })))
-                                 (Just
-                                  (AddEpAnn AnnCloseC (EpaSpan { DumpSemis.hs:44:4 })))
-                                 [(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:38:6 }))
-                                 ,(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:38:7 }))
-                                 ,(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:38:8 }))]
-                                 [])
-                                (EpaComments
-                                 [])) { DumpSemis.hs:(38,4)-(44,4) })
+                   (EpAnn
+                    (EpaSpan { DumpSemis.hs:(38,4)-(44,4) })
+                    (AnnList
+                     (Just
+                      (EpaSpan { DumpSemis.hs:(38,6)-(43,13) }))
+                     (Just
+                      (AddEpAnn AnnOpenC (EpaSpan { DumpSemis.hs:38:4 })))
+                     (Just
+                      (AddEpAnn AnnCloseC (EpaSpan { DumpSemis.hs:44:4 })))
+                     [(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:38:6 }))
+                     ,(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:38:7 }))
+                     ,(AddEpAnn AnnSemi (EpaSpan { DumpSemis.hs:38:8 }))]
+                     [])
+                    (EpaComments
+                     []))
                    [(L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpSemis.hs:39:6-13 })
-                                  (AnnListItem
-                                   [(AddSemiAnn
-                                     (EpaSpan { DumpSemis.hs:39:14 }))])
-                                  (EpaComments
-                                   [])) { DumpSemis.hs:39:6-13 })
+                     (EpAnn
+                      (EpaSpan { DumpSemis.hs:39:6-13 })
+                      (AnnListItem
+                       [(AddSemiAnn
+                         (EpaSpan { DumpSemis.hs:39:14 }))])
+                      (EpaComments
+                       []))
                      (Match
                       (EpAnn
                        (EpaSpan { DumpSemis.hs:39:6-13 })
@@ -2395,12 +2373,12 @@
                         []))
                       (CaseAlt)
                       [(L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpSemis.hs:39:6 })
-                                     (AnnListItem
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpSemis.hs:39:6 })
+                        (EpAnn
+                         (EpaSpan { DumpSemis.hs:39:6 })
+                         (AnnListItem
+                          [])
+                         (EpaComments
+                          []))
                         (NPat
                          (EpAnn
                           (EpaDelta (SameLine 0) [])
@@ -2408,13 +2386,11 @@
                           (EpaComments
                            []))
                          (L
-                          (SrcSpanAnn
-                           (EpAnn
-                            (EpaSpan { DumpSemis.hs:39:6 })
-                            (NoEpAnns)
-                            (EpaComments
-                             []))
-                           { DumpSemis.hs:39:6 })
+                          (EpAnn
+                           (EpaSpan { DumpSemis.hs:39:6 })
+                           (NoEpAnns)
+                           (EpaComments
+                            []))
                           (OverLit
                            (NoExtField)
                            (HsIntegral
@@ -2428,13 +2404,11 @@
                        (EpaComments
                         [])
                        [(L
-                         (SrcSpanAnn
-                          (EpAnn
-                           (EpaSpan { DumpSemis.hs:39:8-13 })
-                           (NoEpAnns)
-                           (EpaComments
-                            []))
-                          { DumpSemis.hs:39:8-13 })
+                         (EpAnn
+                          (EpaSpan { DumpSemis.hs:39:8-13 })
+                          (NoEpAnns)
+                          (EpaComments
+                           []))
                          (GRHS
                           (EpAnn
                            (EpaSpan { DumpSemis.hs:39:8-13 })
@@ -2445,12 +2419,12 @@
                             []))
                           []
                           (L
-                           (SrcSpanAnn (EpAnn
-                                        (EpaSpan { DumpSemis.hs:39:11-13 })
-                                        (AnnListItem
-                                         [])
-                                        (EpaComments
-                                         [])) { DumpSemis.hs:39:11-13 })
+                           (EpAnn
+                            (EpaSpan { DumpSemis.hs:39:11-13 })
+                            (AnnListItem
+                             [])
+                            (EpaComments
+                             []))
                            (HsLit
                             (EpAnn
                              (EpaSpan { DumpSemis.hs:39:11-13 })
@@ -2463,13 +2437,13 @@
                        (EmptyLocalBinds
                         (NoExtField)))))
                    ,(L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpSemis.hs:40:6-13 })
-                                  (AnnListItem
-                                   [(AddSemiAnn
-                                     (EpaSpan { DumpSemis.hs:41:4 }))])
-                                  (EpaComments
-                                   [])) { DumpSemis.hs:40:6-13 })
+                     (EpAnn
+                      (EpaSpan { DumpSemis.hs:40:6-13 })
+                      (AnnListItem
+                       [(AddSemiAnn
+                         (EpaSpan { DumpSemis.hs:41:4 }))])
+                      (EpaComments
+                       []))
                      (Match
                       (EpAnn
                        (EpaSpan { DumpSemis.hs:40:6-13 })
@@ -2478,12 +2452,12 @@
                         []))
                       (CaseAlt)
                       [(L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpSemis.hs:40:6 })
-                                     (AnnListItem
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpSemis.hs:40:6 })
+                        (EpAnn
+                         (EpaSpan { DumpSemis.hs:40:6 })
+                         (AnnListItem
+                          [])
+                         (EpaComments
+                          []))
                         (NPat
                          (EpAnn
                           (EpaDelta (SameLine 0) [])
@@ -2491,13 +2465,11 @@
                           (EpaComments
                            []))
                          (L
-                          (SrcSpanAnn
-                           (EpAnn
-                            (EpaSpan { DumpSemis.hs:40:6 })
-                            (NoEpAnns)
-                            (EpaComments
-                             []))
-                           { DumpSemis.hs:40:6 })
+                          (EpAnn
+                           (EpaSpan { DumpSemis.hs:40:6 })
+                           (NoEpAnns)
+                           (EpaComments
+                            []))
                           (OverLit
                            (NoExtField)
                            (HsIntegral
@@ -2511,13 +2483,11 @@
                        (EpaComments
                         [])
                        [(L
-                         (SrcSpanAnn
-                          (EpAnn
-                           (EpaSpan { DumpSemis.hs:40:8-13 })
-                           (NoEpAnns)
-                           (EpaComments
-                            []))
-                          { DumpSemis.hs:40:8-13 })
+                         (EpAnn
+                          (EpaSpan { DumpSemis.hs:40:8-13 })
+                          (NoEpAnns)
+                          (EpaComments
+                           []))
                          (GRHS
                           (EpAnn
                            (EpaSpan { DumpSemis.hs:40:8-13 })
@@ -2528,12 +2498,12 @@
                             []))
                           []
                           (L
-                           (SrcSpanAnn (EpAnn
-                                        (EpaSpan { DumpSemis.hs:40:11-13 })
-                                        (AnnListItem
-                                         [])
-                                        (EpaComments
-                                         [])) { DumpSemis.hs:40:11-13 })
+                           (EpAnn
+                            (EpaSpan { DumpSemis.hs:40:11-13 })
+                            (AnnListItem
+                             [])
+                            (EpaComments
+                             []))
                            (HsLit
                             (EpAnn
                              (EpaSpan { DumpSemis.hs:40:11-13 })
@@ -2546,15 +2516,15 @@
                        (EmptyLocalBinds
                         (NoExtField)))))
                    ,(L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpSemis.hs:41:6-13 })
-                                  (AnnListItem
-                                   [(AddSemiAnn
-                                     (EpaSpan { DumpSemis.hs:41:15 }))
-                                   ,(AddSemiAnn
-                                     (EpaSpan { DumpSemis.hs:42:4 }))])
-                                  (EpaComments
-                                   [])) { DumpSemis.hs:41:6-13 })
+                     (EpAnn
+                      (EpaSpan { DumpSemis.hs:41:6-13 })
+                      (AnnListItem
+                       [(AddSemiAnn
+                         (EpaSpan { DumpSemis.hs:41:15 }))
+                       ,(AddSemiAnn
+                         (EpaSpan { DumpSemis.hs:42:4 }))])
+                      (EpaComments
+                       []))
                      (Match
                       (EpAnn
                        (EpaSpan { DumpSemis.hs:41:6-13 })
@@ -2563,12 +2533,12 @@
                         []))
                       (CaseAlt)
                       [(L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpSemis.hs:41:6 })
-                                     (AnnListItem
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpSemis.hs:41:6 })
+                        (EpAnn
+                         (EpaSpan { DumpSemis.hs:41:6 })
+                         (AnnListItem
+                          [])
+                         (EpaComments
+                          []))
                         (NPat
                          (EpAnn
                           (EpaDelta (SameLine 0) [])
@@ -2576,13 +2546,11 @@
                           (EpaComments
                            []))
                          (L
-                          (SrcSpanAnn
-                           (EpAnn
-                            (EpaSpan { DumpSemis.hs:41:6 })
-                            (NoEpAnns)
-                            (EpaComments
-                             []))
-                           { DumpSemis.hs:41:6 })
+                          (EpAnn
+                           (EpaSpan { DumpSemis.hs:41:6 })
+                           (NoEpAnns)
+                           (EpaComments
+                            []))
                           (OverLit
                            (NoExtField)
                            (HsIntegral
@@ -2596,13 +2564,11 @@
                        (EpaComments
                         [])
                        [(L
-                         (SrcSpanAnn
-                          (EpAnn
-                           (EpaSpan { DumpSemis.hs:41:8-13 })
-                           (NoEpAnns)
-                           (EpaComments
-                            []))
-                          { DumpSemis.hs:41:8-13 })
+                         (EpAnn
+                          (EpaSpan { DumpSemis.hs:41:8-13 })
+                          (NoEpAnns)
+                          (EpaComments
+                           []))
                          (GRHS
                           (EpAnn
                            (EpaSpan { DumpSemis.hs:41:8-13 })
@@ -2613,12 +2579,12 @@
                             []))
                           []
                           (L
-                           (SrcSpanAnn (EpAnn
-                                        (EpaSpan { DumpSemis.hs:41:11-13 })
-                                        (AnnListItem
-                                         [])
-                                        (EpaComments
-                                         [])) { DumpSemis.hs:41:11-13 })
+                           (EpAnn
+                            (EpaSpan { DumpSemis.hs:41:11-13 })
+                            (AnnListItem
+                             [])
+                            (EpaComments
+                             []))
                            (HsLit
                             (EpAnn
                              (EpaSpan { DumpSemis.hs:41:11-13 })
@@ -2631,17 +2597,17 @@
                        (EmptyLocalBinds
                         (NoExtField)))))
                    ,(L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpSemis.hs:42:6-13 })
-                                  (AnnListItem
-                                   [(AddSemiAnn
-                                     (EpaSpan { DumpSemis.hs:43:11 }))
-                                   ,(AddSemiAnn
-                                     (EpaSpan { DumpSemis.hs:43:12 }))
-                                   ,(AddSemiAnn
-                                     (EpaSpan { DumpSemis.hs:43:13 }))])
-                                  (EpaComments
-                                   [])) { DumpSemis.hs:42:6-13 })
+                     (EpAnn
+                      (EpaSpan { DumpSemis.hs:42:6-13 })
+                      (AnnListItem
+                       [(AddSemiAnn
+                         (EpaSpan { DumpSemis.hs:43:11 }))
+                       ,(AddSemiAnn
+                         (EpaSpan { DumpSemis.hs:43:12 }))
+                       ,(AddSemiAnn
+                         (EpaSpan { DumpSemis.hs:43:13 }))])
+                      (EpaComments
+                       []))
                      (Match
                       (EpAnn
                        (EpaSpan { DumpSemis.hs:42:6-13 })
@@ -2650,12 +2616,12 @@
                         []))
                       (CaseAlt)
                       [(L
-                        (SrcSpanAnn (EpAnn
-                                     (EpaSpan { DumpSemis.hs:42:6 })
-                                     (AnnListItem
-                                      [])
-                                     (EpaComments
-                                      [])) { DumpSemis.hs:42:6 })
+                        (EpAnn
+                         (EpaSpan { DumpSemis.hs:42:6 })
+                         (AnnListItem
+                          [])
+                         (EpaComments
+                          []))
                         (NPat
                          (EpAnn
                           (EpaDelta (SameLine 0) [])
@@ -2663,13 +2629,11 @@
                           (EpaComments
                            []))
                          (L
-                          (SrcSpanAnn
-                           (EpAnn
-                            (EpaSpan { DumpSemis.hs:42:6 })
-                            (NoEpAnns)
-                            (EpaComments
-                             []))
-                           { DumpSemis.hs:42:6 })
+                          (EpAnn
+                           (EpaSpan { DumpSemis.hs:42:6 })
+                           (NoEpAnns)
+                           (EpaComments
+                            []))
                           (OverLit
                            (NoExtField)
                            (HsIntegral
@@ -2683,13 +2647,11 @@
                        (EpaComments
                         [])
                        [(L
-                         (SrcSpanAnn
-                          (EpAnn
-                           (EpaSpan { DumpSemis.hs:42:8-13 })
-                           (NoEpAnns)
-                           (EpaComments
-                            []))
-                          { DumpSemis.hs:42:8-13 })
+                         (EpAnn
+                          (EpaSpan { DumpSemis.hs:42:8-13 })
+                          (NoEpAnns)
+                          (EpaComments
+                           []))
                          (GRHS
                           (EpAnn
                            (EpaSpan { DumpSemis.hs:42:8-13 })
@@ -2700,12 +2662,12 @@
                             []))
                           []
                           (L
-                           (SrcSpanAnn (EpAnn
-                                        (EpaSpan { DumpSemis.hs:42:11-13 })
-                                        (AnnListItem
-                                         [])
-                                        (EpaComments
-                                         [])) { DumpSemis.hs:42:11-13 })
+                           (EpAnn
+                            (EpaSpan { DumpSemis.hs:42:11-13 })
+                            (AnnListItem
+                             [])
+                            (EpaComments
+                             []))
                            (HsLit
                             (EpAnn
                              (EpaSpan { DumpSemis.hs:42:11-13 })
diff --git a/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr b/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr
index 3131ae0f9072..7c9fb5ba89d6 100644
--- a/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr
@@ -3,22 +3,22 @@
 
 {Bag(LocatedA (HsBind Var)):
  [(L
-   (SrcSpanAnn (EpAnn
-                (EpaSpan { <no location info> })
-                (AnnListItem
-                 [])
-                (EpaComments
-                 [])) { <no location info> })
+   (EpAnn
+    (EpaSpan { <no location info> })
+    (AnnListItem
+     [])
+    (EpaComments
+     []))
    (VarBind
     (NoExtField)
     {Var: DumpTypecheckedAst.$tcT}
     (L
-     (SrcSpanAnn (EpAnn
-                  (EpaSpan { <no location info> })
-                  (AnnListItem
-                   [])
-                  (EpaComments
-                   [])) { <no location info> })
+     (EpAnn
+      (EpaSpan { <no location info> })
+      (AnnListItem
+       [])
+      (EpaComments
+       []))
      (HsApp
       (EpAnn
        (EpaDelta (SameLine 0) [])
@@ -26,12 +26,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsApp
         (EpAnn
          (EpaDelta (SameLine 0) [])
@@ -39,12 +39,12 @@
          (EpaComments
           []))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsApp
           (EpAnn
            (EpaDelta (SameLine 0) [])
@@ -52,12 +52,12 @@
            (EpaComments
             []))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsApp
             (EpAnn
              (EpaDelta (SameLine 0) [])
@@ -65,12 +65,12 @@
              (EpaComments
               []))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { <no location info> })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { <no location info> })
+             (EpAnn
+              (EpaSpan { <no location info> })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsApp
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -78,12 +78,12 @@
                (EpaComments
                 []))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsApp
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -91,24 +91,24 @@
                  (EpaComments
                   []))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { <no location info> })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { <no location info> })
+                 (EpAnn
+                  (EpaSpan { <no location info> })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (XExpr
                   (ConLikeTc
                    ({abstract:ConLike})
                    []
                    [])))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { <no location info> })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { <no location info> })
+                 (EpAnn
+                  (EpaSpan { <no location info> })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsLit
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -117,12 +117,12 @@
                     []))
                   {HsWord{64}Prim (1374752024144278257) (NoSourceText)}))))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsLit
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -131,29 +131,29 @@
                   []))
                 {HsWord{64}Prim (13654949607623281177) (NoSourceText)}))))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { <no location info> })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { <no location info> })
+             (EpAnn
+              (EpaSpan { <no location info> })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsVar
               (NoExtField)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (NameAnnTrailing
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (NameAnnTrailing
+                 [])
+                (EpaComments
+                 []))
                {Var: DumpTypecheckedAst.$trModule})))))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsPar
             (EpAnn
              (EpaDelta (SameLine 0) [])
@@ -164,12 +164,12 @@
              (NoTokenLoc)
              (HsTok))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { <no location info> })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { <no location info> })
+             (EpAnn
+              (EpaSpan { <no location info> })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsApp
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -177,24 +177,24 @@
                (EpaComments
                 []))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (XExpr
                 (ConLikeTc
                  ({abstract:ConLike})
                  []
                  [])))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsLit
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -208,12 +208,12 @@
              (NoTokenLoc)
              (HsTok))))))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsLit
           (EpAnn
            (EpaDelta (SameLine 0) [])
@@ -222,39 +222,39 @@
             []))
           {HsInt{64}Prim (1) (NoSourceText)}))))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsVar
         (NoExtField)
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (NameAnnTrailing
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (NameAnnTrailing
+           [])
+          (EpaComments
+           []))
          {Var: $krep})))))))
  ,(L
-   (SrcSpanAnn (EpAnn
-                (EpaSpan { <no location info> })
-                (AnnListItem
-                 [])
-                (EpaComments
-                 [])) { <no location info> })
+   (EpAnn
+    (EpaSpan { <no location info> })
+    (AnnListItem
+     [])
+    (EpaComments
+     []))
    (VarBind
     (NoExtField)
     {Var: DumpTypecheckedAst.$tc'MkT}
     (L
-     (SrcSpanAnn (EpAnn
-                  (EpaSpan { <no location info> })
-                  (AnnListItem
-                   [])
-                  (EpaComments
-                   [])) { <no location info> })
+     (EpAnn
+      (EpaSpan { <no location info> })
+      (AnnListItem
+       [])
+      (EpaComments
+       []))
      (HsApp
       (EpAnn
        (EpaDelta (SameLine 0) [])
@@ -262,12 +262,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsApp
         (EpAnn
          (EpaDelta (SameLine 0) [])
@@ -275,12 +275,12 @@
          (EpaComments
           []))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsApp
           (EpAnn
            (EpaDelta (SameLine 0) [])
@@ -288,12 +288,12 @@
            (EpaComments
             []))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsApp
             (EpAnn
              (EpaDelta (SameLine 0) [])
@@ -301,12 +301,12 @@
              (EpaComments
               []))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { <no location info> })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { <no location info> })
+             (EpAnn
+              (EpaSpan { <no location info> })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsApp
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -314,12 +314,12 @@
                (EpaComments
                 []))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsApp
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -327,24 +327,24 @@
                  (EpaComments
                   []))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { <no location info> })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { <no location info> })
+                 (EpAnn
+                  (EpaSpan { <no location info> })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (XExpr
                   (ConLikeTc
                    ({abstract:ConLike})
                    []
                    [])))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { <no location info> })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { <no location info> })
+                 (EpAnn
+                  (EpaSpan { <no location info> })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsLit
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -353,12 +353,12 @@
                     []))
                   {HsWord{64}Prim (10715337633704422415) (NoSourceText)}))))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsLit
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -367,29 +367,29 @@
                   []))
                 {HsWord{64}Prim (12411373583424111944) (NoSourceText)}))))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { <no location info> })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { <no location info> })
+             (EpAnn
+              (EpaSpan { <no location info> })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsVar
               (NoExtField)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (NameAnnTrailing
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (NameAnnTrailing
+                 [])
+                (EpaComments
+                 []))
                {Var: DumpTypecheckedAst.$trModule})))))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsPar
             (EpAnn
              (EpaDelta (SameLine 0) [])
@@ -400,12 +400,12 @@
              (NoTokenLoc)
              (HsTok))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { <no location info> })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { <no location info> })
+             (EpAnn
+              (EpaSpan { <no location info> })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsApp
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -413,24 +413,24 @@
                (EpaComments
                 []))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (XExpr
                 (ConLikeTc
                  ({abstract:ConLike})
                  []
                  [])))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsLit
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -444,12 +444,12 @@
              (NoTokenLoc)
              (HsTok))))))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsLit
           (EpAnn
            (EpaDelta (SameLine 0) [])
@@ -458,39 +458,39 @@
             []))
           {HsInt{64}Prim (3) (NoSourceText)}))))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsVar
         (NoExtField)
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (NameAnnTrailing
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (NameAnnTrailing
+           [])
+          (EpaComments
+           []))
          {Var: $krep})))))))
  ,(L
-   (SrcSpanAnn (EpAnn
-                (EpaSpan { <no location info> })
-                (AnnListItem
-                 [])
-                (EpaComments
-                 [])) { <no location info> })
+   (EpAnn
+    (EpaSpan { <no location info> })
+    (AnnListItem
+     [])
+    (EpaComments
+     []))
    (VarBind
     (NoExtField)
     {Var: DumpTypecheckedAst.$tcPeano}
     (L
-     (SrcSpanAnn (EpAnn
-                  (EpaSpan { <no location info> })
-                  (AnnListItem
-                   [])
-                  (EpaComments
-                   [])) { <no location info> })
+     (EpAnn
+      (EpaSpan { <no location info> })
+      (AnnListItem
+       [])
+      (EpaComments
+       []))
      (HsApp
       (EpAnn
        (EpaDelta (SameLine 0) [])
@@ -498,12 +498,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsApp
         (EpAnn
          (EpaDelta (SameLine 0) [])
@@ -511,12 +511,12 @@
          (EpaComments
           []))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsApp
           (EpAnn
            (EpaDelta (SameLine 0) [])
@@ -524,12 +524,12 @@
            (EpaComments
             []))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsApp
             (EpAnn
              (EpaDelta (SameLine 0) [])
@@ -537,12 +537,12 @@
              (EpaComments
               []))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { <no location info> })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { <no location info> })
+             (EpAnn
+              (EpaSpan { <no location info> })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsApp
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -550,12 +550,12 @@
                (EpaComments
                 []))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsApp
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -563,24 +563,24 @@
                  (EpaComments
                   []))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { <no location info> })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { <no location info> })
+                 (EpAnn
+                  (EpaSpan { <no location info> })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (XExpr
                   (ConLikeTc
                    ({abstract:ConLike})
                    []
                    [])))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { <no location info> })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { <no location info> })
+                 (EpAnn
+                  (EpaSpan { <no location info> })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsLit
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -589,12 +589,12 @@
                     []))
                   {HsWord{64}Prim (14073232900889011755) (NoSourceText)}))))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsLit
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -603,29 +603,29 @@
                   []))
                 {HsWord{64}Prim (2739668351064589274) (NoSourceText)}))))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { <no location info> })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { <no location info> })
+             (EpAnn
+              (EpaSpan { <no location info> })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsVar
               (NoExtField)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (NameAnnTrailing
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (NameAnnTrailing
+                 [])
+                (EpaComments
+                 []))
                {Var: DumpTypecheckedAst.$trModule})))))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsPar
             (EpAnn
              (EpaDelta (SameLine 0) [])
@@ -636,12 +636,12 @@
              (NoTokenLoc)
              (HsTok))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { <no location info> })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { <no location info> })
+             (EpAnn
+              (EpaSpan { <no location info> })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsApp
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -649,24 +649,24 @@
                (EpaComments
                 []))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (XExpr
                 (ConLikeTc
                  ({abstract:ConLike})
                  []
                  [])))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsLit
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -680,12 +680,12 @@
              (NoTokenLoc)
              (HsTok))))))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsLit
           (EpAnn
            (EpaDelta (SameLine 0) [])
@@ -694,39 +694,39 @@
             []))
           {HsInt{64}Prim (0) (NoSourceText)}))))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsVar
         (NoExtField)
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (NameAnnTrailing
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (NameAnnTrailing
+           [])
+          (EpaComments
+           []))
          {Var: GHC.Types.krep$*})))))))
  ,(L
-   (SrcSpanAnn (EpAnn
-                (EpaSpan { <no location info> })
-                (AnnListItem
-                 [])
-                (EpaComments
-                 [])) { <no location info> })
+   (EpAnn
+    (EpaSpan { <no location info> })
+    (AnnListItem
+     [])
+    (EpaComments
+     []))
    (VarBind
     (NoExtField)
     {Var: DumpTypecheckedAst.$tc'Zero}
     (L
-     (SrcSpanAnn (EpAnn
-                  (EpaSpan { <no location info> })
-                  (AnnListItem
-                   [])
-                  (EpaComments
-                   [])) { <no location info> })
+     (EpAnn
+      (EpaSpan { <no location info> })
+      (AnnListItem
+       [])
+      (EpaComments
+       []))
      (HsApp
       (EpAnn
        (EpaDelta (SameLine 0) [])
@@ -734,12 +734,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsApp
         (EpAnn
          (EpaDelta (SameLine 0) [])
@@ -747,12 +747,12 @@
          (EpaComments
           []))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsApp
           (EpAnn
            (EpaDelta (SameLine 0) [])
@@ -760,12 +760,12 @@
            (EpaComments
             []))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsApp
             (EpAnn
              (EpaDelta (SameLine 0) [])
@@ -773,12 +773,12 @@
              (EpaComments
               []))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { <no location info> })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { <no location info> })
+             (EpAnn
+              (EpaSpan { <no location info> })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsApp
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -786,12 +786,12 @@
                (EpaComments
                 []))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsApp
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -799,24 +799,24 @@
                  (EpaComments
                   []))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { <no location info> })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { <no location info> })
+                 (EpAnn
+                  (EpaSpan { <no location info> })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (XExpr
                   (ConLikeTc
                    ({abstract:ConLike})
                    []
                    [])))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { <no location info> })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { <no location info> })
+                 (EpAnn
+                  (EpaSpan { <no location info> })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsLit
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -825,12 +825,12 @@
                     []))
                   {HsWord{64}Prim (13760111476013868540) (NoSourceText)}))))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsLit
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -839,29 +839,29 @@
                   []))
                 {HsWord{64}Prim (12314848029315386153) (NoSourceText)}))))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { <no location info> })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { <no location info> })
+             (EpAnn
+              (EpaSpan { <no location info> })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsVar
               (NoExtField)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (NameAnnTrailing
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (NameAnnTrailing
+                 [])
+                (EpaComments
+                 []))
                {Var: DumpTypecheckedAst.$trModule})))))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsPar
             (EpAnn
              (EpaDelta (SameLine 0) [])
@@ -872,12 +872,12 @@
              (NoTokenLoc)
              (HsTok))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { <no location info> })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { <no location info> })
+             (EpAnn
+              (EpaSpan { <no location info> })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsApp
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -885,24 +885,24 @@
                (EpaComments
                 []))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (XExpr
                 (ConLikeTc
                  ({abstract:ConLike})
                  []
                  [])))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsLit
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -916,12 +916,12 @@
              (NoTokenLoc)
              (HsTok))))))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsLit
           (EpAnn
            (EpaDelta (SameLine 0) [])
@@ -930,39 +930,39 @@
             []))
           {HsInt{64}Prim (0) (NoSourceText)}))))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsVar
         (NoExtField)
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (NameAnnTrailing
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (NameAnnTrailing
+           [])
+          (EpaComments
+           []))
          {Var: $krep})))))))
  ,(L
-   (SrcSpanAnn (EpAnn
-                (EpaSpan { <no location info> })
-                (AnnListItem
-                 [])
-                (EpaComments
-                 [])) { <no location info> })
+   (EpAnn
+    (EpaSpan { <no location info> })
+    (AnnListItem
+     [])
+    (EpaComments
+     []))
    (VarBind
     (NoExtField)
     {Var: DumpTypecheckedAst.$tc'Succ}
     (L
-     (SrcSpanAnn (EpAnn
-                  (EpaSpan { <no location info> })
-                  (AnnListItem
-                   [])
-                  (EpaComments
-                   [])) { <no location info> })
+     (EpAnn
+      (EpaSpan { <no location info> })
+      (AnnListItem
+       [])
+      (EpaComments
+       []))
      (HsApp
       (EpAnn
        (EpaDelta (SameLine 0) [])
@@ -970,12 +970,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsApp
         (EpAnn
          (EpaDelta (SameLine 0) [])
@@ -983,12 +983,12 @@
          (EpaComments
           []))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsApp
           (EpAnn
            (EpaDelta (SameLine 0) [])
@@ -996,12 +996,12 @@
            (EpaComments
             []))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsApp
             (EpAnn
              (EpaDelta (SameLine 0) [])
@@ -1009,12 +1009,12 @@
              (EpaComments
               []))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { <no location info> })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { <no location info> })
+             (EpAnn
+              (EpaSpan { <no location info> })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsApp
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -1022,12 +1022,12 @@
                (EpaComments
                 []))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsApp
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -1035,24 +1035,24 @@
                  (EpaComments
                   []))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { <no location info> })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { <no location info> })
+                 (EpAnn
+                  (EpaSpan { <no location info> })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (XExpr
                   (ConLikeTc
                    ({abstract:ConLike})
                    []
                    [])))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { <no location info> })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { <no location info> })
+                 (EpAnn
+                  (EpaSpan { <no location info> })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsLit
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -1061,12 +1061,12 @@
                     []))
                   {HsWord{64}Prim (1143980031331647856) (NoSourceText)}))))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsLit
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -1075,29 +1075,29 @@
                   []))
                 {HsWord{64}Prim (14802086722010293686) (NoSourceText)}))))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { <no location info> })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { <no location info> })
+             (EpAnn
+              (EpaSpan { <no location info> })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsVar
               (NoExtField)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (NameAnnTrailing
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (NameAnnTrailing
+                 [])
+                (EpaComments
+                 []))
                {Var: DumpTypecheckedAst.$trModule})))))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsPar
             (EpAnn
              (EpaDelta (SameLine 0) [])
@@ -1108,12 +1108,12 @@
              (NoTokenLoc)
              (HsTok))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { <no location info> })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { <no location info> })
+             (EpAnn
+              (EpaSpan { <no location info> })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsApp
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -1121,24 +1121,24 @@
                (EpaComments
                 []))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (XExpr
                 (ConLikeTc
                  ({abstract:ConLike})
                  []
                  [])))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsLit
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -1152,12 +1152,12 @@
              (NoTokenLoc)
              (HsTok))))))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsLit
           (EpAnn
            (EpaDelta (SameLine 0) [])
@@ -1166,39 +1166,39 @@
             []))
           {HsInt{64}Prim (0) (NoSourceText)}))))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsVar
         (NoExtField)
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (NameAnnTrailing
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (NameAnnTrailing
+           [])
+          (EpaComments
+           []))
          {Var: $krep})))))))
  ,(L
-   (SrcSpanAnn (EpAnn
-                (EpaSpan { <no location info> })
-                (AnnListItem
-                 [])
-                (EpaComments
-                 [])) { <no location info> })
+   (EpAnn
+    (EpaSpan { <no location info> })
+    (AnnListItem
+     [])
+    (EpaComments
+     []))
    (VarBind
     (NoExtField)
     {Var: $krep}
     (L
-     (SrcSpanAnn (EpAnn
-                  (EpaSpan { <no location info> })
-                  (AnnListItem
-                   [])
-                  (EpaComments
-                   [])) { <no location info> })
+     (EpAnn
+      (EpaSpan { <no location info> })
+      (AnnListItem
+       [])
+      (EpaComments
+       []))
      (HsApp
       (EpAnn
        (EpaDelta (SameLine 0) [])
@@ -1206,24 +1206,24 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (XExpr
         (ConLikeTc
          ({abstract:ConLike})
          []
          [])))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsLit
         (EpAnn
          (EpaDelta (SameLine 0) [])
@@ -1237,22 +1237,22 @@
           (False)
           (2)))))))))
  ,(L
-   (SrcSpanAnn (EpAnn
-                (EpaSpan { <no location info> })
-                (AnnListItem
-                 [])
-                (EpaComments
-                 [])) { <no location info> })
+   (EpAnn
+    (EpaSpan { <no location info> })
+    (AnnListItem
+     [])
+    (EpaComments
+     []))
    (VarBind
     (NoExtField)
     {Var: $krep}
     (L
-     (SrcSpanAnn (EpAnn
-                  (EpaSpan { <no location info> })
-                  (AnnListItem
-                   [])
-                  (EpaComments
-                   [])) { <no location info> })
+     (EpAnn
+      (EpaSpan { <no location info> })
+      (AnnListItem
+       [])
+      (EpaComments
+       []))
      (HsApp
       (EpAnn
        (EpaDelta (SameLine 0) [])
@@ -1260,24 +1260,24 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (XExpr
         (ConLikeTc
          ({abstract:ConLike})
          []
          [])))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsLit
         (EpAnn
          (EpaDelta (SameLine 0) [])
@@ -1291,22 +1291,22 @@
           (False)
           (1)))))))))
  ,(L
-   (SrcSpanAnn (EpAnn
-                (EpaSpan { <no location info> })
-                (AnnListItem
-                 [])
-                (EpaComments
-                 [])) { <no location info> })
+   (EpAnn
+    (EpaSpan { <no location info> })
+    (AnnListItem
+     [])
+    (EpaComments
+     []))
    (VarBind
     (NoExtField)
     {Var: $krep}
     (L
-     (SrcSpanAnn (EpAnn
-                  (EpaSpan { <no location info> })
-                  (AnnListItem
-                   [])
-                  (EpaComments
-                   [])) { <no location info> })
+     (EpAnn
+      (EpaSpan { <no location info> })
+      (AnnListItem
+       [])
+      (EpaComments
+       []))
      (HsApp
       (EpAnn
        (EpaDelta (SameLine 0) [])
@@ -1314,24 +1314,24 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (XExpr
         (ConLikeTc
          ({abstract:ConLike})
          []
          [])))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsLit
         (EpAnn
          (EpaDelta (SameLine 0) [])
@@ -1345,22 +1345,22 @@
           (False)
           (0)))))))))
  ,(L
-   (SrcSpanAnn (EpAnn
-                (EpaSpan { <no location info> })
-                (AnnListItem
-                 [])
-                (EpaComments
-                 [])) { <no location info> })
+   (EpAnn
+    (EpaSpan { <no location info> })
+    (AnnListItem
+     [])
+    (EpaComments
+     []))
    (VarBind
     (NoExtField)
     {Var: $krep}
     (L
-     (SrcSpanAnn (EpAnn
-                  (EpaSpan { <no location info> })
-                  (AnnListItem
-                   [])
-                  (EpaComments
-                   [])) { <no location info> })
+     (EpAnn
+      (EpaSpan { <no location info> })
+      (AnnListItem
+       [])
+      (EpaComments
+       []))
      (HsApp
       (EpAnn
        (EpaDelta (SameLine 0) [])
@@ -1368,12 +1368,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsApp
         (EpAnn
          (EpaDelta (SameLine 0) [])
@@ -1381,68 +1381,68 @@
          (EpaComments
           []))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (XExpr
           (ConLikeTc
            ({abstract:ConLike})
            []
            [])))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsVar
           (NoExtField)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            {Var: $krep})))))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsVar
         (NoExtField)
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (NameAnnTrailing
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (NameAnnTrailing
+           [])
+          (EpaComments
+           []))
          {Var: $krep})))))))
  ,(L
-   (SrcSpanAnn (EpAnn
-                (EpaSpan { <no location info> })
-                (AnnListItem
-                 [])
-                (EpaComments
-                 [])) { <no location info> })
+   (EpAnn
+    (EpaSpan { <no location info> })
+    (AnnListItem
+     [])
+    (EpaComments
+     []))
    (VarBind
     (NoExtField)
     {Var: $krep}
     (L
-     (SrcSpanAnn (EpAnn
-                  (EpaSpan { <no location info> })
-                  (AnnListItem
-                   [])
-                  (EpaComments
-                   [])) { <no location info> })
+     (EpAnn
+      (EpaSpan { <no location info> })
+      (AnnListItem
+       [])
+      (EpaComments
+       []))
      (HsApp
       (EpAnn
        (EpaDelta (SameLine 0) [])
@@ -1450,12 +1450,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsApp
         (EpAnn
          (EpaDelta (SameLine 0) [])
@@ -1463,68 +1463,68 @@
          (EpaComments
           []))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (XExpr
           (ConLikeTc
            ({abstract:ConLike})
            []
            [])))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsVar
           (NoExtField)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            {Var: $krep})))))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsVar
         (NoExtField)
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (NameAnnTrailing
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (NameAnnTrailing
+           [])
+          (EpaComments
+           []))
          {Var: GHC.Types.krep$*})))))))
  ,(L
-   (SrcSpanAnn (EpAnn
-                (EpaSpan { <no location info> })
-                (AnnListItem
-                 [])
-                (EpaComments
-                 [])) { <no location info> })
+   (EpAnn
+    (EpaSpan { <no location info> })
+    (AnnListItem
+     [])
+    (EpaComments
+     []))
    (VarBind
     (NoExtField)
     {Var: $krep}
     (L
-     (SrcSpanAnn (EpAnn
-                  (EpaSpan { <no location info> })
-                  (AnnListItem
-                   [])
-                  (EpaComments
-                   [])) { <no location info> })
+     (EpAnn
+      (EpaSpan { <no location info> })
+      (AnnListItem
+       [])
+      (EpaComments
+       []))
      (HsApp
       (EpAnn
        (EpaDelta (SameLine 0) [])
@@ -1532,12 +1532,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsApp
         (EpAnn
          (EpaDelta (SameLine 0) [])
@@ -1545,68 +1545,68 @@
          (EpaComments
           []))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (XExpr
           (ConLikeTc
            ({abstract:ConLike})
            []
            [])))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsVar
           (NoExtField)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            {Var: $krep})))))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsVar
         (NoExtField)
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (NameAnnTrailing
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (NameAnnTrailing
+           [])
+          (EpaComments
+           []))
          {Var: $krep})))))))
  ,(L
-   (SrcSpanAnn (EpAnn
-                (EpaSpan { <no location info> })
-                (AnnListItem
-                 [])
-                (EpaComments
-                 [])) { <no location info> })
+   (EpAnn
+    (EpaSpan { <no location info> })
+    (AnnListItem
+     [])
+    (EpaComments
+     []))
    (VarBind
     (NoExtField)
     {Var: $krep}
     (L
-     (SrcSpanAnn (EpAnn
-                  (EpaSpan { <no location info> })
-                  (AnnListItem
-                   [])
-                  (EpaComments
-                   [])) { <no location info> })
+     (EpAnn
+      (EpaSpan { <no location info> })
+      (AnnListItem
+       [])
+      (EpaComments
+       []))
      (HsApp
       (EpAnn
        (EpaDelta (SameLine 0) [])
@@ -1614,12 +1614,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsApp
         (EpAnn
          (EpaDelta (SameLine 0) [])
@@ -1627,68 +1627,68 @@
          (EpaComments
           []))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (XExpr
           (ConLikeTc
            ({abstract:ConLike})
            []
            [])))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsVar
           (NoExtField)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            {Var: $krep})))))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsVar
         (NoExtField)
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (NameAnnTrailing
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (NameAnnTrailing
+           [])
+          (EpaComments
+           []))
          {Var: $krep})))))))
  ,(L
-   (SrcSpanAnn (EpAnn
-                (EpaSpan { <no location info> })
-                (AnnListItem
-                 [])
-                (EpaComments
-                 [])) { <no location info> })
+   (EpAnn
+    (EpaSpan { <no location info> })
+    (AnnListItem
+     [])
+    (EpaComments
+     []))
    (VarBind
     (NoExtField)
     {Var: $krep}
     (L
-     (SrcSpanAnn (EpAnn
-                  (EpaSpan { <no location info> })
-                  (AnnListItem
-                   [])
-                  (EpaComments
-                   [])) { <no location info> })
+     (EpAnn
+      (EpaSpan { <no location info> })
+      (AnnListItem
+       [])
+      (EpaComments
+       []))
      (HsApp
       (EpAnn
        (EpaDelta (SameLine 0) [])
@@ -1696,12 +1696,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsApp
         (EpAnn
          (EpaDelta (SameLine 0) [])
@@ -1709,68 +1709,68 @@
          (EpaComments
           []))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (XExpr
           (ConLikeTc
            ({abstract:ConLike})
            []
            [])))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsVar
           (NoExtField)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            {Var: $krep})))))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsVar
         (NoExtField)
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (NameAnnTrailing
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (NameAnnTrailing
+           [])
+          (EpaComments
+           []))
          {Var: $krep})))))))
  ,(L
-   (SrcSpanAnn (EpAnn
-                (EpaSpan { <no location info> })
-                (AnnListItem
-                 [])
-                (EpaComments
-                 [])) { <no location info> })
+   (EpAnn
+    (EpaSpan { <no location info> })
+    (AnnListItem
+     [])
+    (EpaComments
+     []))
    (VarBind
     (NoExtField)
     {Var: $krep}
     (L
-     (SrcSpanAnn (EpAnn
-                  (EpaSpan { <no location info> })
-                  (AnnListItem
-                   [])
-                  (EpaComments
-                   [])) { <no location info> })
+     (EpAnn
+      (EpaSpan { <no location info> })
+      (AnnListItem
+       [])
+      (EpaComments
+       []))
      (HsApp
       (EpAnn
        (EpaDelta (SameLine 0) [])
@@ -1778,12 +1778,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsApp
         (EpAnn
          (EpaDelta (SameLine 0) [])
@@ -1791,41 +1791,41 @@
          (EpaComments
           []))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (XExpr
           (ConLikeTc
            ({abstract:ConLike})
            []
            [])))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsVar
           (NoExtField)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            {Var: DumpTypecheckedAst.$tcT})))))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsPar
         (EpAnn
          (EpaDelta (SameLine 0) [])
@@ -1836,12 +1836,12 @@
          (NoTokenLoc)
          (HsTok))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsApp
           (EpAnn
            (EpaDelta (SameLine 0) [])
@@ -1849,12 +1849,12 @@
            (EpaComments
             []))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsApp
             (EpAnn
              (EpaDelta (SameLine 0) [])
@@ -1862,12 +1862,12 @@
              (EpaComments
               []))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { <no location info> })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { <no location info> })
+             (EpAnn
+              (EpaSpan { <no location info> })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (XExpr
               (WrapExpr
                (HsWrap
@@ -1881,29 +1881,29 @@
                   []
                   []))))))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { <no location info> })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { <no location info> })
+             (EpAnn
+              (EpaSpan { <no location info> })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsVar
               (NoExtField)
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (NameAnnTrailing
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (NameAnnTrailing
+                 [])
+                (EpaComments
+                 []))
                {Var: $krep})))))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsPar
             (EpAnn
              (EpaDelta (SameLine 0) [])
@@ -1914,12 +1914,12 @@
              (NoTokenLoc)
              (HsTok))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { <no location info> })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { <no location info> })
+             (EpAnn
+              (EpaSpan { <no location info> })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsApp
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -1927,12 +1927,12 @@
                (EpaComments
                 []))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsApp
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -1940,12 +1940,12 @@
                  (EpaComments
                   []))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { <no location info> })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { <no location info> })
+                 (EpAnn
+                  (EpaSpan { <no location info> })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (XExpr
                   (WrapExpr
                    (HsWrap
@@ -1959,29 +1959,29 @@
                       []
                       []))))))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { <no location info> })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { <no location info> })
+                 (EpAnn
+                  (EpaSpan { <no location info> })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsVar
                   (NoExtField)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { <no location info> })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { <no location info> })
+                   (EpAnn
+                    (EpaSpan { <no location info> })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    {Var: $krep})))))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { <no location info> })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { <no location info> })
+               (EpAnn
+                (EpaSpan { <no location info> })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsPar
                 (EpAnn
                  (EpaDelta (SameLine 0) [])
@@ -1992,12 +1992,12 @@
                  (NoTokenLoc)
                  (HsTok))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { <no location info> })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { <no location info> })
+                 (EpAnn
+                  (EpaSpan { <no location info> })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsApp
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -2005,12 +2005,12 @@
                    (EpaComments
                     []))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { <no location info> })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { <no location info> })
+                   (EpAnn
+                    (EpaSpan { <no location info> })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsApp
                     (EpAnn
                      (EpaDelta (SameLine 0) [])
@@ -2018,12 +2018,12 @@
                      (EpaComments
                       []))
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { <no location info> })
-                                  (AnnListItem
-                                   [])
-                                  (EpaComments
-                                   [])) { <no location info> })
+                     (EpAnn
+                      (EpaSpan { <no location info> })
+                      (AnnListItem
+                       [])
+                      (EpaComments
+                       []))
                      (XExpr
                       (WrapExpr
                        (HsWrap
@@ -2037,29 +2037,29 @@
                           []
                           []))))))
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { <no location info> })
-                                  (AnnListItem
-                                   [])
-                                  (EpaComments
-                                   [])) { <no location info> })
+                     (EpAnn
+                      (EpaSpan { <no location info> })
+                      (AnnListItem
+                       [])
+                      (EpaComments
+                       []))
                      (HsVar
                       (NoExtField)
                       (L
-                       (SrcSpanAnn (EpAnn
-                                    (EpaSpan { <no location info> })
-                                    (NameAnnTrailing
-                                     [])
-                                    (EpaComments
-                                     [])) { <no location info> })
+                       (EpAnn
+                        (EpaSpan { <no location info> })
+                        (NameAnnTrailing
+                         [])
+                        (EpaComments
+                         []))
                        {Var: $krep})))))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { <no location info> })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { <no location info> })
+                   (EpAnn
+                    (EpaSpan { <no location info> })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (XExpr
                     (WrapExpr
                      (HsWrap
@@ -2082,22 +2082,22 @@
          (NoTokenLoc)
          (HsTok))))))))
  ,(L
-   (SrcSpanAnn (EpAnn
-                (EpaSpan { <no location info> })
-                (AnnListItem
-                 [])
-                (EpaComments
-                 [])) { <no location info> })
+   (EpAnn
+    (EpaSpan { <no location info> })
+    (AnnListItem
+     [])
+    (EpaComments
+     []))
    (VarBind
     (NoExtField)
     {Var: $krep}
     (L
-     (SrcSpanAnn (EpAnn
-                  (EpaSpan { <no location info> })
-                  (AnnListItem
-                   [])
-                  (EpaComments
-                   [])) { <no location info> })
+     (EpAnn
+      (EpaSpan { <no location info> })
+      (AnnListItem
+       [])
+      (EpaComments
+       []))
      (HsApp
       (EpAnn
        (EpaDelta (SameLine 0) [])
@@ -2105,12 +2105,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsApp
         (EpAnn
          (EpaDelta (SameLine 0) [])
@@ -2118,41 +2118,41 @@
          (EpaComments
           []))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (XExpr
           (ConLikeTc
            ({abstract:ConLike})
            []
            [])))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsVar
           (NoExtField)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            {Var: DumpTypecheckedAst.$tcPeano})))))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (XExpr
         (WrapExpr
          (HsWrap
@@ -2166,22 +2166,22 @@
             []
             []))))))))))
  ,(L
-   (SrcSpanAnn (EpAnn
-                (EpaSpan { <no location info> })
-                (AnnListItem
-                 [])
-                (EpaComments
-                 [])) { <no location info> })
+   (EpAnn
+    (EpaSpan { <no location info> })
+    (AnnListItem
+     [])
+    (EpaComments
+     []))
    (VarBind
     (NoExtField)
     {Var: DumpTypecheckedAst.$trModule}
     (L
-     (SrcSpanAnn (EpAnn
-                  (EpaSpan { <no location info> })
-                  (AnnListItem
-                   [])
-                  (EpaComments
-                   [])) { <no location info> })
+     (EpAnn
+      (EpaSpan { <no location info> })
+      (AnnListItem
+       [])
+      (EpaComments
+       []))
      (HsApp
       (EpAnn
        (EpaDelta (SameLine 0) [])
@@ -2189,12 +2189,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsApp
         (EpAnn
          (EpaDelta (SameLine 0) [])
@@ -2202,24 +2202,24 @@
          (EpaComments
           []))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (XExpr
           (ConLikeTc
            ({abstract:ConLike})
            []
            [])))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsPar
           (EpAnn
            (EpaDelta (SameLine 0) [])
@@ -2230,12 +2230,12 @@
            (NoTokenLoc)
            (HsTok))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsApp
             (EpAnn
              (EpaDelta (SameLine 0) [])
@@ -2243,24 +2243,24 @@
              (EpaComments
               []))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { <no location info> })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { <no location info> })
+             (EpAnn
+              (EpaSpan { <no location info> })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (XExpr
               (ConLikeTc
                ({abstract:ConLike})
                []
                [])))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { <no location info> })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { <no location info> })
+             (EpAnn
+              (EpaSpan { <no location info> })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsLit
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -2274,12 +2274,12 @@
            (NoTokenLoc)
            (HsTok))))))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { <no location info> })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { <no location info> })
+       (EpAnn
+        (EpaSpan { <no location info> })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsPar
         (EpAnn
          (EpaDelta (SameLine 0) [])
@@ -2290,12 +2290,12 @@
          (NoTokenLoc)
          (HsTok))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { <no location info> })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { <no location info> })
+         (EpAnn
+          (EpaSpan { <no location info> })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsApp
           (EpAnn
            (EpaDelta (SameLine 0) [])
@@ -2303,24 +2303,24 @@
            (EpaComments
             []))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (XExpr
             (ConLikeTc
              ({abstract:ConLike})
              []
              [])))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { <no location info> })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { <no location info> })
+           (EpAnn
+            (EpaSpan { <no location info> })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsLit
             (EpAnn
              (EpaDelta (SameLine 0) [])
@@ -2334,12 +2334,12 @@
          (NoTokenLoc)
          (HsTok))))))))
  ,(L
-   (SrcSpanAnn (EpAnn
-                (EpaSpan { DumpTypecheckedAst.hs:20:1-23 })
-                (AnnListItem
-                 [])
-                (EpaComments
-                 [])) { DumpTypecheckedAst.hs:20:1-23 })
+   (EpAnn
+    (EpaSpan { DumpTypecheckedAst.hs:20:1-23 })
+    (AnnListItem
+     [])
+    (EpaComments
+     []))
    (XHsBindsLR
     (AbsBinds
      []
@@ -2353,23 +2353,23 @@
      [({abstract:TcEvBinds})]
      {Bag(LocatedA (HsBind Var)):
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { DumpTypecheckedAst.hs:20:1-23 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { DumpTypecheckedAst.hs:20:1-23 })
+        (EpAnn
+         (EpaSpan { DumpTypecheckedAst.hs:20:1-23 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (FunBind
          ((,)
           (WpHole)
           [])
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { DumpTypecheckedAst.hs:20:1-4 })
-                       (NameAnnTrailing
-                        [])
-                       (EpaComments
-                        [])) { DumpTypecheckedAst.hs:20:1-4 })
+          (EpAnn
+           (EpaSpan { DumpTypecheckedAst.hs:20:1-4 })
+           (NameAnnTrailing
+            [])
+           (EpaComments
+            []))
           {Var: main})
          (MG
           (MatchGroupTc
@@ -2381,23 +2381,23 @@
               [])])
            (FromSource))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { DumpTypecheckedAst.hs:20:1-23 })
-                        (AnnList
-                         (Nothing)
-                         (Nothing)
-                         (Nothing)
-                         []
-                         [])
-                        (EpaComments
-                         [])) { DumpTypecheckedAst.hs:20:1-23 })
+           (EpAnn
+            (EpaSpan { DumpTypecheckedAst.hs:20:1-23 })
+            (AnnList
+             (Nothing)
+             (Nothing)
+             (Nothing)
+             []
+             [])
+            (EpaComments
+             []))
            [(L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { DumpTypecheckedAst.hs:20:1-23 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { DumpTypecheckedAst.hs:20:1-23 })
+             (EpAnn
+              (EpaSpan { DumpTypecheckedAst.hs:20:1-23 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (Match
               (EpAnn
                (EpaDelta (SameLine 0) [])
@@ -2406,12 +2406,12 @@
                 []))
               (FunRhs
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { DumpTypecheckedAst.hs:20:1-4 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { DumpTypecheckedAst.hs:20:1-4 })
+                (EpAnn
+                 (EpaSpan { DumpTypecheckedAst.hs:20:1-4 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 {Name: main})
                (Prefix)
                (NoSrcStrict))
@@ -2420,13 +2420,11 @@
                (EpaComments
                 [])
                [(L
-                 (SrcSpanAnn
-                  (EpAnn
-                   (EpaSpan { DumpTypecheckedAst.hs:20:6-23 })
-                   (NoEpAnns)
-                   (EpaComments
-                    []))
-                  { DumpTypecheckedAst.hs:20:6-23 })
+                 (EpAnn
+                  (EpaSpan { DumpTypecheckedAst.hs:20:6-23 })
+                  (NoEpAnns)
+                  (EpaComments
+                   []))
                  (GRHS
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -2437,12 +2435,12 @@
                     []))
                   []
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { DumpTypecheckedAst.hs:20:8-23 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { DumpTypecheckedAst.hs:20:8-23 })
+                   (EpAnn
+                    (EpaSpan { DumpTypecheckedAst.hs:20:8-23 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsApp
                     (EpAnn
                      (EpaDelta (SameLine 0) [])
@@ -2450,29 +2448,29 @@
                      (EpaComments
                       []))
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpTypecheckedAst.hs:20:8-15 })
-                                  (AnnListItem
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpTypecheckedAst.hs:20:8-15 })
+                     (EpAnn
+                      (EpaSpan { DumpTypecheckedAst.hs:20:8-15 })
+                      (AnnListItem
+                       [])
+                      (EpaComments
+                       []))
                      (HsVar
                       (NoExtField)
                       (L
-                       (SrcSpanAnn (EpAnn
-                                    (EpaSpan { <no location info> })
-                                    (NameAnnTrailing
-                                     [])
-                                    (EpaComments
-                                     [])) { <no location info> })
+                       (EpAnn
+                        (EpaSpan { <no location info> })
+                        (NameAnnTrailing
+                         [])
+                        (EpaComments
+                         []))
                        {Var: putStrLn})))
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { DumpTypecheckedAst.hs:20:17-23 })
-                                  (AnnListItem
-                                   [])
-                                  (EpaComments
-                                   [])) { DumpTypecheckedAst.hs:20:17-23 })
+                     (EpAnn
+                      (EpaSpan { DumpTypecheckedAst.hs:20:17-23 })
+                      (AnnListItem
+                       [])
+                      (EpaComments
+                       []))
                      (HsLit
                       (EpAnn
                        (EpaSpan { DumpTypecheckedAst.hs:20:17-23 })
diff --git a/testsuite/tests/parser/should_compile/KindSigs.stderr b/testsuite/tests/parser/should_compile/KindSigs.stderr
index ec52b49df1b3..9bf89f79c620 100644
--- a/testsuite/tests/parser/should_compile/KindSigs.stderr
+++ b/testsuite/tests/parser/should_compile/KindSigs.stderr
@@ -24,21 +24,21 @@
    (Nothing))
   (Just
    (L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { KindSigs.hs:6:8-15 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { KindSigs.hs:6:8-15 })
+    (EpAnn
+     (EpaSpan { KindSigs.hs:6:8-15 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     {ModuleName: KindSigs}))
   (Nothing)
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { KindSigs.hs:8:1-16 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { KindSigs.hs:8:1-16 })
+    (EpAnn
+     (EpaSpan { KindSigs.hs:8:1-16 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (ImportDecl
      (XImportDeclPass
       (EpAnn
@@ -55,12 +55,12 @@
       (NoSourceText)
       (False))
      (L
-      (SrcSpanAnn (EpAnn
-                   (EpaSpan { KindSigs.hs:8:8-16 })
-                   (AnnListItem
-                    [])
-                   (EpaComments
-                    [])) { KindSigs.hs:8:8-16 })
+      (EpAnn
+       (EpaSpan { KindSigs.hs:8:8-16 })
+       (AnnListItem
+        [])
+       (EpaComments
+        []))
       {ModuleName: Data.Kind})
      (NoRawPkgQual)
      (NotBoot)
@@ -69,12 +69,12 @@
      (Nothing)
      (Nothing)))]
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { KindSigs.hs:(11,1)-(12,21) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { KindSigs.hs:(11,1)-(12,21) })
+    (EpAnn
+     (EpaSpan { KindSigs.hs:(11,1)-(12,21) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (FamDecl
@@ -90,12 +90,12 @@
        (ClosedTypeFamily
         (Just
          [(L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { KindSigs.hs:12:3-21 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { KindSigs.hs:12:3-21 })
+           (EpAnn
+            (EpaSpan { KindSigs.hs:12:3-21 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (FamEqn
             (EpAnn
              (EpaSpan { KindSigs.hs:12:3-21 })
@@ -103,24 +103,24 @@
              (EpaComments
               []))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { KindSigs.hs:12:3-5 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { KindSigs.hs:12:3-5 })
+             (EpAnn
+              (EpaSpan { KindSigs.hs:12:3-5 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: Foo}))
             (HsOuterImplicit
              (NoExtField))
             [(HsValArg
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { KindSigs.hs:12:7 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { KindSigs.hs:12:7 })
+               (EpAnn
+                (EpaSpan { KindSigs.hs:12:7 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsTyVar
                 (EpAnn
                  (EpaSpan { KindSigs.hs:12:7 })
@@ -129,22 +129,22 @@
                   []))
                 (NotPromoted)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { KindSigs.hs:12:7 })
-                              (NameAnnTrailing
-                               [])
-                              (EpaComments
-                               [])) { KindSigs.hs:12:7 })
+                 (EpAnn
+                  (EpaSpan { KindSigs.hs:12:7 })
+                  (NameAnnTrailing
+                   [])
+                  (EpaComments
+                   []))
                  (Unqual
                   {OccName: a})))))]
             (Prefix)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { KindSigs.hs:12:11-21 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { KindSigs.hs:12:11-21 })
+             (EpAnn
+              (EpaSpan { KindSigs.hs:12:11-21 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsKindSig
               (EpAnn
                (EpaSpan { KindSigs.hs:12:11-21 })
@@ -152,12 +152,12 @@
                (EpaComments
                 []))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { KindSigs.hs:12:11-13 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { KindSigs.hs:12:11-13 })
+               (EpAnn
+                (EpaSpan { KindSigs.hs:12:11-13 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsTyVar
                 (EpAnn
                  (EpaSpan { KindSigs.hs:12:11-13 })
@@ -166,21 +166,21 @@
                   []))
                 (NotPromoted)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { KindSigs.hs:12:11-13 })
-                              (NameAnnTrailing
-                               [])
-                              (EpaComments
-                               [])) { KindSigs.hs:12:11-13 })
+                 (EpAnn
+                  (EpaSpan { KindSigs.hs:12:11-13 })
+                  (NameAnnTrailing
+                   [])
+                  (EpaComments
+                   []))
                  (Unqual
                   {OccName: Int}))))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { KindSigs.hs:12:18-21 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { KindSigs.hs:12:18-21 })
+               (EpAnn
+                (EpaSpan { KindSigs.hs:12:18-21 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsTyVar
                 (EpAnn
                  (EpaSpan { KindSigs.hs:12:18-21 })
@@ -189,33 +189,33 @@
                   []))
                 (NotPromoted)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { KindSigs.hs:12:18-21 })
-                              (NameAnnTrailing
-                               [])
-                              (EpaComments
-                               [])) { KindSigs.hs:12:18-21 })
+                 (EpAnn
+                  (EpaSpan { KindSigs.hs:12:18-21 })
+                  (NameAnnTrailing
+                   [])
+                  (EpaComments
+                   []))
                  (Unqual
                   {OccName: Type}))))))))]))
        (TopLevel)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { KindSigs.hs:11:13-15 })
-                     (NameAnnTrailing
-                      [])
-                     (EpaComments
-                      [])) { KindSigs.hs:11:13-15 })
+        (EpAnn
+         (EpaSpan { KindSigs.hs:11:13-15 })
+         (NameAnnTrailing
+          [])
+         (EpaComments
+          []))
         (Unqual
          {OccName: Foo}))
        (HsQTvs
         (NoExtField)
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { KindSigs.hs:11:17 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { KindSigs.hs:11:17 })
+          (EpAnn
+           (EpaSpan { KindSigs.hs:11:17 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (UserTyVar
            (EpAnn
             (EpaSpan { KindSigs.hs:11:17 })
@@ -224,33 +224,31 @@
              []))
            (HsBndrRequired)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:11:17 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:11:17 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:11:17 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: a}))))])
        (Prefix)
        (L
-        (SrcSpanAnn
-         (EpAnn
-          (EpaSpan { <no location info> })
-          (NoEpAnns)
-          (EpaComments
-           []))
-         { <no location info> })
+        (EpAnn
+         (EpaSpan { <no location info> })
+         (NoEpAnns)
+         (EpaComments
+          []))
         (NoSig
          (NoExtField)))
        (Nothing)))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { KindSigs.hs:15:1-51 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { KindSigs.hs:15:1-51 })
+    (EpAnn
+     (EpaSpan { KindSigs.hs:15:1-51 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (SynDecl
@@ -261,23 +259,23 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { KindSigs.hs:15:6-8 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { KindSigs.hs:15:6-8 })
+       (EpAnn
+        (EpaSpan { KindSigs.hs:15:6-8 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: Bar}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { KindSigs.hs:15:10 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { KindSigs.hs:15:10 })
+         (EpAnn
+          (EpaSpan { KindSigs.hs:15:10 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (UserTyVar
           (EpAnn
            (EpaSpan { KindSigs.hs:15:10 })
@@ -286,22 +284,22 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { KindSigs.hs:15:10 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { KindSigs.hs:15:10 })
+           (EpAnn
+            (EpaSpan { KindSigs.hs:15:10 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: a}))))])
       (Prefix)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { KindSigs.hs:15:14-51 })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { KindSigs.hs:15:14-51 })
+       (EpAnn
+        (EpaSpan { KindSigs.hs:15:14-51 })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsTupleTy
         (EpAnn
          (EpaSpan { KindSigs.hs:15:14-51 })
@@ -313,13 +311,13 @@
           []))
         (HsBoxedOrConstraintTuple)
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { KindSigs.hs:15:16-26 })
-                       (AnnListItem
-                        [(AddCommaAnn
-                          (EpaSpan { KindSigs.hs:15:27 }))])
-                       (EpaComments
-                        [])) { KindSigs.hs:15:16-26 })
+          (EpAnn
+           (EpaSpan { KindSigs.hs:15:16-26 })
+           (AnnListItem
+            [(AddCommaAnn
+              (EpaSpan { KindSigs.hs:15:27 }))])
+           (EpaComments
+            []))
           (HsKindSig
            (EpAnn
             (EpaSpan { KindSigs.hs:15:16-26 })
@@ -327,12 +325,12 @@
             (EpaComments
              []))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:15:16-18 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:15:16-18 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:15:16-18 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { KindSigs.hs:15:16-18 })
@@ -341,21 +339,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:15:16-18 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:15:16-18 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:15:16-18 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: Int}))))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:15:23-26 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:15:23-26 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:15:23-26 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { KindSigs.hs:15:23-26 })
@@ -364,22 +362,22 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:15:23-26 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:15:23-26 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:15:23-26 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: Type}))))))
         ,(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { KindSigs.hs:15:29-32 })
-                       (AnnListItem
-                        [(AddCommaAnn
-                          (EpaSpan { KindSigs.hs:15:33 }))])
-                       (EpaComments
-                        [])) { KindSigs.hs:15:29-32 })
+          (EpAnn
+           (EpaSpan { KindSigs.hs:15:29-32 })
+           (AnnListItem
+            [(AddCommaAnn
+              (EpaSpan { KindSigs.hs:15:33 }))])
+           (EpaComments
+            []))
           (HsTyVar
            (EpAnn
             (EpaSpan { KindSigs.hs:15:29-32 })
@@ -388,21 +386,21 @@
              []))
            (NotPromoted)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:15:29-32 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:15:29-32 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:15:29-32 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: Bool}))))
         ,(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { KindSigs.hs:15:35-49 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { KindSigs.hs:15:35-49 })
+          (EpAnn
+           (EpaSpan { KindSigs.hs:15:35-49 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsKindSig
            (EpAnn
             (EpaSpan { KindSigs.hs:15:35-49 })
@@ -410,21 +408,21 @@
             (EpaComments
              []))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:15:35-41 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:15:35-41 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:15:35-41 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsAppTy
              (NoExtField)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:15:35-39 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:15:35-39 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:15:35-39 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { KindSigs.hs:15:35-39 })
@@ -433,21 +431,21 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { KindSigs.hs:15:35-39 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { KindSigs.hs:15:35-39 })
+                (EpAnn
+                 (EpaSpan { KindSigs.hs:15:35-39 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: Maybe}))))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:15:41 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:15:41 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:15:41 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { KindSigs.hs:15:41 })
@@ -456,21 +454,21 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { KindSigs.hs:15:41 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { KindSigs.hs:15:41 })
+                (EpAnn
+                 (EpaSpan { KindSigs.hs:15:41 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: a}))))))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:15:46-49 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:15:46-49 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:15:46-49 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { KindSigs.hs:15:46-49 })
@@ -479,21 +477,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:15:46-49 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:15:46-49 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:15:46-49 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: Type}))))))])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { KindSigs.hs:16:1-54 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { KindSigs.hs:16:1-54 })
+    (EpAnn
+     (EpaSpan { KindSigs.hs:16:1-54 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (SynDecl
@@ -504,23 +502,23 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { KindSigs.hs:16:6-9 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { KindSigs.hs:16:6-9 })
+       (EpAnn
+        (EpaSpan { KindSigs.hs:16:6-9 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: Bar'}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { KindSigs.hs:16:11 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { KindSigs.hs:16:11 })
+         (EpAnn
+          (EpaSpan { KindSigs.hs:16:11 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (UserTyVar
           (EpAnn
            (EpaSpan { KindSigs.hs:16:11 })
@@ -529,22 +527,22 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { KindSigs.hs:16:11 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { KindSigs.hs:16:11 })
+           (EpAnn
+            (EpaSpan { KindSigs.hs:16:11 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: a}))))])
       (Prefix)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { KindSigs.hs:16:15-54 })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { KindSigs.hs:16:15-54 })
+       (EpAnn
+        (EpaSpan { KindSigs.hs:16:15-54 })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsTupleTy
         (EpAnn
          (EpaSpan { KindSigs.hs:16:15-54 })
@@ -556,13 +554,13 @@
           []))
         (HsUnboxedTuple)
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { KindSigs.hs:16:18-28 })
-                       (AnnListItem
-                        [(AddCommaAnn
-                          (EpaSpan { KindSigs.hs:16:29 }))])
-                       (EpaComments
-                        [])) { KindSigs.hs:16:18-28 })
+          (EpAnn
+           (EpaSpan { KindSigs.hs:16:18-28 })
+           (AnnListItem
+            [(AddCommaAnn
+              (EpaSpan { KindSigs.hs:16:29 }))])
+           (EpaComments
+            []))
           (HsKindSig
            (EpAnn
             (EpaSpan { KindSigs.hs:16:18-28 })
@@ -570,12 +568,12 @@
             (EpaComments
              []))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:16:18-20 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:16:18-20 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:16:18-20 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { KindSigs.hs:16:18-20 })
@@ -584,21 +582,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:16:18-20 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:16:18-20 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:16:18-20 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: Int}))))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:16:25-28 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:16:25-28 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:16:25-28 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { KindSigs.hs:16:25-28 })
@@ -607,22 +605,22 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:16:25-28 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:16:25-28 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:16:25-28 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: Type}))))))
         ,(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { KindSigs.hs:16:31-34 })
-                       (AnnListItem
-                        [(AddCommaAnn
-                          (EpaSpan { KindSigs.hs:16:35 }))])
-                       (EpaComments
-                        [])) { KindSigs.hs:16:31-34 })
+          (EpAnn
+           (EpaSpan { KindSigs.hs:16:31-34 })
+           (AnnListItem
+            [(AddCommaAnn
+              (EpaSpan { KindSigs.hs:16:35 }))])
+           (EpaComments
+            []))
           (HsTyVar
            (EpAnn
             (EpaSpan { KindSigs.hs:16:31-34 })
@@ -631,21 +629,21 @@
              []))
            (NotPromoted)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:16:31-34 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:16:31-34 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:16:31-34 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: Bool}))))
         ,(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { KindSigs.hs:16:37-51 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { KindSigs.hs:16:37-51 })
+          (EpAnn
+           (EpaSpan { KindSigs.hs:16:37-51 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsKindSig
            (EpAnn
             (EpaSpan { KindSigs.hs:16:37-51 })
@@ -653,21 +651,21 @@
             (EpaComments
              []))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:16:37-43 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:16:37-43 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:16:37-43 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsAppTy
              (NoExtField)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:16:37-41 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:16:37-41 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:16:37-41 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { KindSigs.hs:16:37-41 })
@@ -676,21 +674,21 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { KindSigs.hs:16:37-41 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { KindSigs.hs:16:37-41 })
+                (EpAnn
+                 (EpaSpan { KindSigs.hs:16:37-41 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: Maybe}))))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:16:43 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:16:43 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:16:43 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { KindSigs.hs:16:43 })
@@ -699,21 +697,21 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { KindSigs.hs:16:43 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { KindSigs.hs:16:43 })
+                (EpAnn
+                 (EpaSpan { KindSigs.hs:16:43 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: a}))))))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:16:48-51 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:16:48-51 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:16:48-51 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { KindSigs.hs:16:48-51 })
@@ -722,21 +720,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:16:48-51 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:16:48-51 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:16:48-51 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: Type}))))))])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { KindSigs.hs:19:1-26 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { KindSigs.hs:19:1-26 })
+    (EpAnn
+     (EpaSpan { KindSigs.hs:19:1-26 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (SynDecl
@@ -747,12 +745,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { KindSigs.hs:19:6-8 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { KindSigs.hs:19:6-8 })
+       (EpAnn
+        (EpaSpan { KindSigs.hs:19:6-8 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: Baz}))
       (HsQTvs
@@ -760,12 +758,12 @@
        [])
       (Prefix)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { KindSigs.hs:19:12-26 })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { KindSigs.hs:19:12-26 })
+       (EpAnn
+        (EpaSpan { KindSigs.hs:19:12-26 })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsListTy
         (EpAnn
          (EpaSpan { KindSigs.hs:19:12-26 })
@@ -776,12 +774,12 @@
          (EpaComments
           []))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { KindSigs.hs:19:14-24 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { KindSigs.hs:19:14-24 })
+         (EpAnn
+          (EpaSpan { KindSigs.hs:19:14-24 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsKindSig
           (EpAnn
            (EpaSpan { KindSigs.hs:19:14-24 })
@@ -789,12 +787,12 @@
            (EpaComments
             []))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { KindSigs.hs:19:14-16 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { KindSigs.hs:19:14-16 })
+           (EpAnn
+            (EpaSpan { KindSigs.hs:19:14-16 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsTyVar
             (EpAnn
              (EpaSpan { KindSigs.hs:19:14-16 })
@@ -803,21 +801,21 @@
               []))
             (NotPromoted)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { KindSigs.hs:19:14-16 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { KindSigs.hs:19:14-16 })
+             (EpAnn
+              (EpaSpan { KindSigs.hs:19:14-16 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: Int}))))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { KindSigs.hs:19:21-24 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { KindSigs.hs:19:21-24 })
+           (EpAnn
+            (EpaSpan { KindSigs.hs:19:21-24 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsTyVar
             (EpAnn
              (EpaSpan { KindSigs.hs:19:21-24 })
@@ -826,21 +824,21 @@
               []))
             (NotPromoted)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { KindSigs.hs:19:21-24 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { KindSigs.hs:19:21-24 })
+             (EpAnn
+              (EpaSpan { KindSigs.hs:19:21-24 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: Type})))))))))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { KindSigs.hs:22:1-44 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { KindSigs.hs:22:1-44 })
+    (EpAnn
+     (EpaSpan { KindSigs.hs:22:1-44 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (SigD
      (NoExtField)
      (TypeSig
@@ -852,34 +850,34 @@
        (EpaComments
         []))
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { KindSigs.hs:22:1-3 })
-                     (NameAnnTrailing
-                      [])
-                     (EpaComments
-                      [])) { KindSigs.hs:22:1-3 })
+        (EpAnn
+         (EpaSpan { KindSigs.hs:22:1-3 })
+         (NameAnnTrailing
+          [])
+         (EpaComments
+          []))
         (Unqual
          {OccName: qux}))]
       (HsWC
        (NoExtField)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { KindSigs.hs:22:8-44 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { KindSigs.hs:22:8-44 })
+        (EpAnn
+         (EpaSpan { KindSigs.hs:22:8-44 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (HsSig
          (NoExtField)
          (HsOuterImplicit
           (NoExtField))
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { KindSigs.hs:22:8-44 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { KindSigs.hs:22:8-44 })
+          (EpAnn
+           (EpaSpan { KindSigs.hs:22:8-44 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsFunTy
            (EpAnn
             (EpaSpan { KindSigs.hs:22:8-44 })
@@ -892,12 +890,12 @@
               (EpaSpan { KindSigs.hs:22:22-23 }))
              (HsNormalTok)))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:22:8-20 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:22:8-20 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:22:8-20 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsParTy
              (EpAnn
               (EpaSpan { KindSigs.hs:22:8-20 })
@@ -908,12 +906,12 @@
               (EpaComments
                []))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:22:9-19 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:22:9-19 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:22:9-19 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsKindSig
                (EpAnn
                 (EpaSpan { KindSigs.hs:22:9-19 })
@@ -921,12 +919,12 @@
                 (EpaComments
                  []))
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { KindSigs.hs:22:9-11 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { KindSigs.hs:22:9-11 })
+                (EpAnn
+                 (EpaSpan { KindSigs.hs:22:9-11 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsTyVar
                  (EpAnn
                   (EpaSpan { KindSigs.hs:22:9-11 })
@@ -935,21 +933,21 @@
                    []))
                  (NotPromoted)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { KindSigs.hs:22:9-11 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { KindSigs.hs:22:9-11 })
+                  (EpAnn
+                   (EpaSpan { KindSigs.hs:22:9-11 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: Int}))))
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { KindSigs.hs:22:16-19 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { KindSigs.hs:22:16-19 })
+                (EpAnn
+                 (EpaSpan { KindSigs.hs:22:16-19 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsTyVar
                  (EpAnn
                   (EpaSpan { KindSigs.hs:22:16-19 })
@@ -958,21 +956,21 @@
                    []))
                  (NotPromoted)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { KindSigs.hs:22:16-19 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { KindSigs.hs:22:16-19 })
-                  (Unqual
+                  (EpAnn
+                   (EpaSpan { KindSigs.hs:22:16-19 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
+                  (Unqual
                    {OccName: Type}))))))))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:22:25-44 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:22:25-44 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:22:25-44 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsFunTy
              (EpAnn
               (EpaSpan { KindSigs.hs:22:25-44 })
@@ -985,12 +983,12 @@
                 (EpaSpan { KindSigs.hs:22:30-31 }))
                (HsNormalTok)))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:22:25-28 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:22:25-28 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:22:25-28 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { KindSigs.hs:22:25-28 })
@@ -999,21 +997,21 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { KindSigs.hs:22:25-28 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { KindSigs.hs:22:25-28 })
+                (EpAnn
+                 (EpaSpan { KindSigs.hs:22:25-28 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: Bool}))))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:22:33-44 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:22:33-44 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:22:33-44 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsParTy
                (EpAnn
                 (EpaSpan { KindSigs.hs:22:33-44 })
@@ -1024,12 +1022,12 @@
                 (EpaComments
                  []))
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { KindSigs.hs:22:34-43 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { KindSigs.hs:22:34-43 })
+                (EpAnn
+                 (EpaSpan { KindSigs.hs:22:34-43 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsKindSig
                  (EpAnn
                   (EpaSpan { KindSigs.hs:22:34-43 })
@@ -1037,12 +1035,12 @@
                   (EpaComments
                    []))
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { KindSigs.hs:22:34-35 })
-                               (AnnListItem
-                                [])
-                               (EpaComments
-                                [])) { KindSigs.hs:22:34-35 })
+                  (EpAnn
+                   (EpaSpan { KindSigs.hs:22:34-35 })
+                   (AnnListItem
+                    [])
+                   (EpaComments
+                    []))
                   (HsTupleTy
                    (EpAnn
                     (EpaSpan { KindSigs.hs:22:34-35 })
@@ -1055,12 +1053,12 @@
                    (HsBoxedOrConstraintTuple)
                    []))
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { KindSigs.hs:22:40-43 })
-                               (AnnListItem
-                                [])
-                               (EpaComments
-                                [])) { KindSigs.hs:22:40-43 })
+                  (EpAnn
+                   (EpaSpan { KindSigs.hs:22:40-43 })
+                   (AnnListItem
+                    [])
+                   (EpaComments
+                    []))
                   (HsTyVar
                    (EpAnn
                     (EpaSpan { KindSigs.hs:22:40-43 })
@@ -1069,54 +1067,54 @@
                      []))
                    (NotPromoted)
                    (L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { KindSigs.hs:22:40-43 })
-                                 (NameAnnTrailing
-                                  [])
-                                 (EpaComments
-                                  [])) { KindSigs.hs:22:40-43 })
+                    (EpAnn
+                     (EpaSpan { KindSigs.hs:22:40-43 })
+                     (NameAnnTrailing
+                      [])
+                     (EpaComments
+                      []))
                     (Unqual
                      {OccName: Type}))))))))))))))))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { KindSigs.hs:23:1-12 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { KindSigs.hs:23:1-12 })
+    (EpAnn
+     (EpaSpan { KindSigs.hs:23:1-12 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { KindSigs.hs:23:1-3 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { KindSigs.hs:23:1-3 })
+       (EpAnn
+        (EpaSpan { KindSigs.hs:23:1-3 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: qux}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { KindSigs.hs:23:1-12 })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { KindSigs.hs:23:1-12 })
+        (EpAnn
+         (EpaSpan { KindSigs.hs:23:1-12 })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { KindSigs.hs:23:1-12 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { KindSigs.hs:23:1-12 })
+          (EpAnn
+           (EpaSpan { KindSigs.hs:23:1-12 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { KindSigs.hs:23:1-12 })
@@ -1125,45 +1123,43 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { KindSigs.hs:23:1-3 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { KindSigs.hs:23:1-3 })
+             (EpAnn
+              (EpaSpan { KindSigs.hs:23:1-3 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: qux}))
             (Prefix)
             (NoSrcStrict))
            [(L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { KindSigs.hs:23:5 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { KindSigs.hs:23:5 })
+             (EpAnn
+              (EpaSpan { KindSigs.hs:23:5 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (WildPat
               (NoExtField)))
            ,(L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { KindSigs.hs:23:7 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { KindSigs.hs:23:7 })
+             (EpAnn
+              (EpaSpan { KindSigs.hs:23:7 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (WildPat
               (NoExtField)))]
            (GRHSs
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { KindSigs.hs:23:9-12 })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { KindSigs.hs:23:9-12 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:23:9-12 })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { KindSigs.hs:23:9-12 })
@@ -1174,35 +1170,35 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { KindSigs.hs:23:11-12 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { KindSigs.hs:23:11-12 })
+                (EpAnn
+                 (EpaSpan { KindSigs.hs:23:11-12 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsVar
                  (NoExtField)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { KindSigs.hs:23:11-12 })
-                               (NameAnnOnly
-                                (NameParens)
-                                (EpaSpan { KindSigs.hs:23:11 })
-                                (EpaSpan { KindSigs.hs:23:12 })
-                                [])
-                               (EpaComments
-                                [])) { KindSigs.hs:23:11-12 })
+                  (EpAnn
+                   (EpaSpan { KindSigs.hs:23:11-12 })
+                   (NameAnnOnly
+                    (NameParens)
+                    (EpaSpan { KindSigs.hs:23:11 })
+                    (EpaSpan { KindSigs.hs:23:12 })
+                    [])
+                   (EpaComments
+                    []))
                   (Exact
                    {Name: ()}))))))]
             (EmptyLocalBinds
              (NoExtField)))))])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { KindSigs.hs:26:1-29 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { KindSigs.hs:26:1-29 })
+    (EpAnn
+     (EpaSpan { KindSigs.hs:26:1-29 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (SynDecl
@@ -1213,12 +1209,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { KindSigs.hs:26:6-9 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { KindSigs.hs:26:6-9 })
+       (EpAnn
+        (EpaSpan { KindSigs.hs:26:6-9 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: Quux}))
       (HsQTvs
@@ -1226,12 +1222,12 @@
        [])
       (Prefix)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { KindSigs.hs:26:13-29 })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { KindSigs.hs:26:13-29 })
+       (EpAnn
+        (EpaSpan { KindSigs.hs:26:13-29 })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsExplicitListTy
         (EpAnn
          (EpaSpan { KindSigs.hs:26:13-29 })
@@ -1242,12 +1238,12 @@
           []))
         (IsPromoted)
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { KindSigs.hs:26:16-27 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { KindSigs.hs:26:16-27 })
+          (EpAnn
+           (EpaSpan { KindSigs.hs:26:16-27 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsKindSig
            (EpAnn
             (EpaSpan { KindSigs.hs:26:16-27 })
@@ -1255,12 +1251,12 @@
             (EpaComments
              []))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:26:16-19 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:26:16-19 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:26:16-19 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { KindSigs.hs:26:16-19 })
@@ -1269,21 +1265,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:26:16-19 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:26:16-19 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:26:16-19 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: True}))))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:26:24-27 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:26:24-27 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:26:24-27 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { KindSigs.hs:26:24-27 })
@@ -1292,21 +1288,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:26:24-27 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:26:24-27 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:26:24-27 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: Bool}))))))])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { KindSigs.hs:27:1-45 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { KindSigs.hs:27:1-45 })
+    (EpAnn
+     (EpaSpan { KindSigs.hs:27:1-45 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (SynDecl
@@ -1317,12 +1313,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { KindSigs.hs:27:6-10 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { KindSigs.hs:27:6-10 })
+       (EpAnn
+        (EpaSpan { KindSigs.hs:27:6-10 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: Quux'}))
       (HsQTvs
@@ -1330,12 +1326,12 @@
        [])
       (Prefix)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { KindSigs.hs:27:14-45 })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { KindSigs.hs:27:14-45 })
+       (EpAnn
+        (EpaSpan { KindSigs.hs:27:14-45 })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsExplicitListTy
         (EpAnn
          (EpaSpan { KindSigs.hs:27:14-45 })
@@ -1345,13 +1341,13 @@
           []))
         (NotPromoted)
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { KindSigs.hs:27:16-27 })
-                       (AnnListItem
-                        [(AddCommaAnn
-                          (EpaSpan { KindSigs.hs:27:28 }))])
-                       (EpaComments
-                        [])) { KindSigs.hs:27:16-27 })
+          (EpAnn
+           (EpaSpan { KindSigs.hs:27:16-27 })
+           (AnnListItem
+            [(AddCommaAnn
+              (EpaSpan { KindSigs.hs:27:28 }))])
+           (EpaComments
+            []))
           (HsKindSig
            (EpAnn
             (EpaSpan { KindSigs.hs:27:16-27 })
@@ -1359,12 +1355,12 @@
             (EpaComments
              []))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:27:16-19 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:27:16-19 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:27:16-19 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { KindSigs.hs:27:16-19 })
@@ -1373,21 +1369,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:27:16-19 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:27:16-19 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:27:16-19 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: True}))))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:27:24-27 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:27:24-27 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:27:24-27 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { KindSigs.hs:27:24-27 })
@@ -1396,21 +1392,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:27:24-27 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:27:24-27 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:27:24-27 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: Bool}))))))
         ,(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { KindSigs.hs:27:30-42 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { KindSigs.hs:27:30-42 })
+          (EpAnn
+           (EpaSpan { KindSigs.hs:27:30-42 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsKindSig
            (EpAnn
             (EpaSpan { KindSigs.hs:27:30-42 })
@@ -1418,12 +1414,12 @@
             (EpaComments
              []))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:27:30-34 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:27:30-34 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:27:30-34 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { KindSigs.hs:27:30-34 })
@@ -1432,21 +1428,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:27:30-34 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:27:30-34 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:27:30-34 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: False}))))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:27:39-42 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:27:39-42 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:27:39-42 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { KindSigs.hs:27:39-42 })
@@ -1455,21 +1451,21 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:27:39-42 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:27:39-42 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:27:39-42 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: Bool}))))))])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { KindSigs.hs:28:1-44 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { KindSigs.hs:28:1-44 })
+    (EpAnn
+     (EpaSpan { KindSigs.hs:28:1-44 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (SynDecl
@@ -1480,23 +1476,23 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { KindSigs.hs:28:6-10 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { KindSigs.hs:28:6-10 })
+       (EpAnn
+        (EpaSpan { KindSigs.hs:28:6-10 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: Quuux}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { KindSigs.hs:28:12 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { KindSigs.hs:28:12 })
+         (EpAnn
+          (EpaSpan { KindSigs.hs:28:12 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (UserTyVar
           (EpAnn
            (EpaSpan { KindSigs.hs:28:12 })
@@ -1505,22 +1501,22 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { KindSigs.hs:28:12 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { KindSigs.hs:28:12 })
+           (EpAnn
+            (EpaSpan { KindSigs.hs:28:12 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: b}))))])
       (Prefix)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { KindSigs.hs:28:16-44 })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { KindSigs.hs:28:16-44 })
+       (EpAnn
+        (EpaSpan { KindSigs.hs:28:16-44 })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsExplicitTupleTy
         (EpAnn
          (EpaSpan { KindSigs.hs:28:16-44 })
@@ -1530,13 +1526,13 @@
          (EpaComments
           []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { KindSigs.hs:28:19-39 })
-                       (AnnListItem
-                        [(AddCommaAnn
-                          (EpaSpan { KindSigs.hs:28:40 }))])
-                       (EpaComments
-                        [])) { KindSigs.hs:28:19-39 })
+          (EpAnn
+           (EpaSpan { KindSigs.hs:28:19-39 })
+           (AnnListItem
+            [(AddCommaAnn
+              (EpaSpan { KindSigs.hs:28:40 }))])
+           (EpaComments
+            []))
           (HsKindSig
            (EpAnn
             (EpaSpan { KindSigs.hs:28:19-39 })
@@ -1544,12 +1540,12 @@
             (EpaComments
              []))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:28:19-29 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:28:19-29 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:28:19-29 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsExplicitListTy
              (EpAnn
               (EpaSpan { KindSigs.hs:28:19-29 })
@@ -1559,13 +1555,13 @@
                []))
              (NotPromoted)
              [(L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { KindSigs.hs:28:20-22 })
-                            (AnnListItem
-                             [(AddCommaAnn
-                               (EpaSpan { KindSigs.hs:28:23 }))])
-                            (EpaComments
-                             [])) { KindSigs.hs:28:20-22 })
+               (EpAnn
+                (EpaSpan { KindSigs.hs:28:20-22 })
+                (AnnListItem
+                 [(AddCommaAnn
+                   (EpaSpan { KindSigs.hs:28:23 }))])
+                (EpaComments
+                 []))
                (HsTyVar
                 (EpAnn
                  (EpaSpan { KindSigs.hs:28:20-22 })
@@ -1574,21 +1570,21 @@
                   []))
                 (NotPromoted)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { KindSigs.hs:28:20-22 })
-                              (NameAnnTrailing
-                               [])
-                              (EpaComments
-                               [])) { KindSigs.hs:28:20-22 })
+                 (EpAnn
+                  (EpaSpan { KindSigs.hs:28:20-22 })
+                  (NameAnnTrailing
+                   [])
+                  (EpaComments
+                   []))
                  (Unqual
                   {OccName: Int}))))
              ,(L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { KindSigs.hs:28:25-28 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { KindSigs.hs:28:25-28 })
+               (EpAnn
+                (EpaSpan { KindSigs.hs:28:25-28 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsTyVar
                 (EpAnn
                  (EpaSpan { KindSigs.hs:28:25-28 })
@@ -1597,21 +1593,21 @@
                   []))
                 (NotPromoted)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { KindSigs.hs:28:25-28 })
-                              (NameAnnTrailing
-                               [])
-                              (EpaComments
-                               [])) { KindSigs.hs:28:25-28 })
+                 (EpAnn
+                  (EpaSpan { KindSigs.hs:28:25-28 })
+                  (NameAnnTrailing
+                   [])
+                  (EpaComments
+                   []))
                  (Unqual
                   {OccName: Bool}))))]))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:28:34-39 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:28:34-39 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:28:34-39 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsListTy
              (EpAnn
               (EpaSpan { KindSigs.hs:28:34-39 })
@@ -1622,12 +1618,12 @@
               (EpaComments
                []))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:28:35-38 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:28:35-38 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:28:35-38 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { KindSigs.hs:28:35-38 })
@@ -1636,21 +1632,21 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { KindSigs.hs:28:35-38 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { KindSigs.hs:28:35-38 })
+                (EpAnn
+                 (EpaSpan { KindSigs.hs:28:35-38 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: Type}))))))))
         ,(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { KindSigs.hs:28:42 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { KindSigs.hs:28:42 })
+          (EpAnn
+           (EpaSpan { KindSigs.hs:28:42 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsTyVar
            (EpAnn
             (EpaSpan { KindSigs.hs:28:42 })
@@ -1659,21 +1655,21 @@
              []))
            (NotPromoted)
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:28:42 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:28:42 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:28:42 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: b}))))])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { KindSigs.hs:31:1-31 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { KindSigs.hs:31:1-31 })
+    (EpAnn
+     (EpaSpan { KindSigs.hs:31:1-31 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (SynDecl
@@ -1684,12 +1680,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { KindSigs.hs:31:6-17 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { KindSigs.hs:31:6-17 })
+       (EpAnn
+        (EpaSpan { KindSigs.hs:31:6-17 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: Sarsaparilla}))
       (HsQTvs
@@ -1697,12 +1693,12 @@
        [])
       (Prefix)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { KindSigs.hs:31:21-31 })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { KindSigs.hs:31:21-31 })
+       (EpAnn
+        (EpaSpan { KindSigs.hs:31:21-31 })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (HsKindSig
         (EpAnn
          (EpaSpan { KindSigs.hs:31:21-31 })
@@ -1710,12 +1706,12 @@
          (EpaComments
           []))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { KindSigs.hs:31:21-23 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { KindSigs.hs:31:21-23 })
+         (EpAnn
+          (EpaSpan { KindSigs.hs:31:21-23 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsTyVar
           (EpAnn
            (EpaSpan { KindSigs.hs:31:21-23 })
@@ -1724,21 +1720,21 @@
             []))
           (NotPromoted)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { KindSigs.hs:31:21-23 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { KindSigs.hs:31:21-23 })
+           (EpAnn
+            (EpaSpan { KindSigs.hs:31:21-23 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: Int}))))
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { KindSigs.hs:31:28-31 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { KindSigs.hs:31:28-31 })
+         (EpAnn
+          (EpaSpan { KindSigs.hs:31:28-31 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (HsTyVar
           (EpAnn
            (EpaSpan { KindSigs.hs:31:28-31 })
@@ -1747,21 +1743,21 @@
             []))
           (NotPromoted)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { KindSigs.hs:31:28-31 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { KindSigs.hs:31:28-31 })
+           (EpAnn
+            (EpaSpan { KindSigs.hs:31:28-31 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: Type})))))))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { KindSigs.hs:34:1-22 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { KindSigs.hs:34:1-22 })
+    (EpAnn
+     (EpaSpan { KindSigs.hs:34:1-22 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (SigD
      (NoExtField)
      (TypeSig
@@ -1773,34 +1769,34 @@
        (EpaComments
         []))
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { KindSigs.hs:34:1-4 })
-                     (NameAnnTrailing
-                      [])
-                     (EpaComments
-                      [])) { KindSigs.hs:34:1-4 })
+        (EpAnn
+         (EpaSpan { KindSigs.hs:34:1-4 })
+         (NameAnnTrailing
+          [])
+         (EpaComments
+          []))
         (Unqual
          {OccName: true}))]
       (HsWC
        (NoExtField)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { KindSigs.hs:34:9-22 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { KindSigs.hs:34:9-22 })
+        (EpAnn
+         (EpaSpan { KindSigs.hs:34:9-22 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (HsSig
          (NoExtField)
          (HsOuterImplicit
           (NoExtField))
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { KindSigs.hs:34:9-22 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { KindSigs.hs:34:9-22 })
+          (EpAnn
+           (EpaSpan { KindSigs.hs:34:9-22 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsParTy
            (EpAnn
             (EpaSpan { KindSigs.hs:34:9-22 })
@@ -1811,12 +1807,12 @@
             (EpaComments
              []))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { KindSigs.hs:34:10-21 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { KindSigs.hs:34:10-21 })
+            (EpAnn
+             (EpaSpan { KindSigs.hs:34:10-21 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsKindSig
              (EpAnn
               (EpaSpan { KindSigs.hs:34:10-21 })
@@ -1824,12 +1820,12 @@
               (EpaComments
                []))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:34:10-13 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:34:10-13 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:34:10-13 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { KindSigs.hs:34:10-13 })
@@ -1838,21 +1834,21 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { KindSigs.hs:34:10-13 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { KindSigs.hs:34:10-13 })
+                (EpAnn
+                 (EpaSpan { KindSigs.hs:34:10-13 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: Bool}))))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { KindSigs.hs:34:18-21 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { KindSigs.hs:34:18-21 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:34:18-21 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { KindSigs.hs:34:18-21 })
@@ -1861,54 +1857,54 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { KindSigs.hs:34:18-21 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { KindSigs.hs:34:18-21 })
+                (EpAnn
+                 (EpaSpan { KindSigs.hs:34:18-21 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: Type}))))))))))))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { KindSigs.hs:35:1-11 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { KindSigs.hs:35:1-11 })
+    (EpAnn
+     (EpaSpan { KindSigs.hs:35:1-11 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { KindSigs.hs:35:1-4 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { KindSigs.hs:35:1-4 })
+       (EpAnn
+        (EpaSpan { KindSigs.hs:35:1-4 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: true}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { KindSigs.hs:35:1-11 })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { KindSigs.hs:35:1-11 })
+        (EpAnn
+         (EpaSpan { KindSigs.hs:35:1-11 })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { KindSigs.hs:35:1-11 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { KindSigs.hs:35:1-11 })
+          (EpAnn
+           (EpaSpan { KindSigs.hs:35:1-11 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { KindSigs.hs:35:1-11 })
@@ -1917,12 +1913,12 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { KindSigs.hs:35:1-4 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { KindSigs.hs:35:1-4 })
+             (EpAnn
+              (EpaSpan { KindSigs.hs:35:1-4 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: true}))
             (Prefix)
@@ -1932,13 +1928,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { KindSigs.hs:35:6-11 })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { KindSigs.hs:35:6-11 })
+              (EpAnn
+               (EpaSpan { KindSigs.hs:35:6-11 })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { KindSigs.hs:35:6-11 })
@@ -1949,21 +1943,21 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { KindSigs.hs:35:8-11 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { KindSigs.hs:35:8-11 })
+                (EpAnn
+                 (EpaSpan { KindSigs.hs:35:8-11 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsVar
                  (NoExtField)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { KindSigs.hs:35:8-11 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { KindSigs.hs:35:8-11 })
+                  (EpAnn
+                   (EpaSpan { KindSigs.hs:35:8-11 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: True}))))))]
             (EmptyLocalBinds
diff --git a/testsuite/tests/parser/should_compile/T14189.stderr b/testsuite/tests/parser/should_compile/T14189.stderr
index 881f50bae7cc..b317a73ce46a 100644
--- a/testsuite/tests/parser/should_compile/T14189.stderr
+++ b/testsuite/tests/parser/should_compile/T14189.stderr
@@ -13,24 +13,24 @@
    [(TyClGroup
      (NoExtField)
      [(L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T14189.hs:6:1-42 })
-                    (AnnListItem
-                     [])
-                    (EpaComments
-                     [])) { T14189.hs:6:1-42 })
+       (EpAnn
+        (EpaSpan { T14189.hs:6:1-42 })
+        (AnnListItem
+         [])
+        (EpaComments
+         []))
        (DataDecl
         (DataDeclRn
          (True)
          {NameSet:
           [{Name: GHC.Types.Int}]})
         (L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T14189.hs:6:6-11 })
-                      (NameAnnTrailing
-                       [])
-                      (EpaComments
-                       [])) { T14189.hs:6:6-11 })
+         (EpAnn
+          (EpaSpan { T14189.hs:6:6-11 })
+          (NameAnnTrailing
+           [])
+          (EpaComments
+           []))
          {Name: T14189.MyType})
         (HsQTvs
          []
@@ -44,13 +44,13 @@
          (DataTypeCons
           (False)
           [(L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T14189.hs:6:15-20 })
-                         (AnnListItem
-                          [(AddVbarAnn
-                            (EpaSpan { T14189.hs:6:22 }))])
-                         (EpaComments
-                          [])) { T14189.hs:6:15-20 })
+            (EpAnn
+             (EpaSpan { T14189.hs:6:15-20 })
+             (AnnListItem
+              [(AddVbarAnn
+                (EpaSpan { T14189.hs:6:22 }))])
+             (EpaComments
+              []))
             (ConDeclH98
              (EpAnn
               (EpaDelta (SameLine 0) [])
@@ -58,12 +58,12 @@
               (EpaComments
                []))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T14189.hs:6:15-16 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T14189.hs:6:15-16 })
+              (EpAnn
+               (EpaSpan { T14189.hs:6:15-16 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               {Name: T14189.MT})
              (False)
              []
@@ -80,12 +80,12 @@
                    (NoTokenLoc)
                    (HsNormalTok))))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { T14189.hs:6:18-20 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { T14189.hs:6:18-20 })
+                 (EpAnn
+                  (EpaSpan { T14189.hs:6:18-20 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsTyVar
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -94,22 +94,22 @@
                     []))
                   (NotPromoted)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { T14189.hs:6:18-20 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { T14189.hs:6:18-20 })
+                   (EpAnn
+                    (EpaSpan { T14189.hs:6:18-20 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    {Name: GHC.Types.Int}))))])
              (Nothing)))
           ,(L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T14189.hs:6:24-25 })
-                         (AnnListItem
-                          [(AddVbarAnn
-                            (EpaSpan { T14189.hs:6:27 }))])
-                         (EpaComments
-                          [])) { T14189.hs:6:24-25 })
+            (EpAnn
+             (EpaSpan { T14189.hs:6:24-25 })
+             (AnnListItem
+              [(AddVbarAnn
+                (EpaSpan { T14189.hs:6:27 }))])
+             (EpaComments
+              []))
             (ConDeclH98
              (EpAnn
               (EpaDelta (SameLine 0) [])
@@ -117,12 +117,12 @@
               (EpaComments
                []))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T14189.hs:6:24-25 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T14189.hs:6:24-25 })
+              (EpAnn
+               (EpaSpan { T14189.hs:6:24-25 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               {Name: T14189.NT})
              (False)
              []
@@ -132,12 +132,12 @@
               [])
              (Nothing)))
           ,(L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T14189.hs:6:29-42 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T14189.hs:6:29-42 })
+            (EpAnn
+             (EpaSpan { T14189.hs:6:29-42 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (ConDeclH98
              (EpAnn
               (EpaDelta (SameLine 0) [])
@@ -145,38 +145,38 @@
               (EpaComments
                []))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T14189.hs:6:29 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T14189.hs:6:29 })
+              (EpAnn
+               (EpaSpan { T14189.hs:6:29 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               {Name: T14189.F})
              (False)
              []
              (Nothing)
              (RecCon
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { T14189.hs:6:31-42 })
-                            (AnnList
-                             (Just
-                              (EpaSpan { T14189.hs:6:33-40 }))
-                             (Just
-                              (AddEpAnn AnnOpenC (EpaSpan { T14189.hs:6:31 })))
-                             (Just
-                              (AddEpAnn AnnCloseC (EpaSpan { T14189.hs:6:42 })))
-                             []
-                             [])
-                            (EpaComments
-                             [])) { T14189.hs:6:31-42 })
+               (EpAnn
+                (EpaSpan { T14189.hs:6:31-42 })
+                (AnnList
+                 (Just
+                  (EpaSpan { T14189.hs:6:33-40 }))
+                 (Just
+                  (AddEpAnn AnnOpenC (EpaSpan { T14189.hs:6:31 })))
+                 (Just
+                  (AddEpAnn AnnCloseC (EpaSpan { T14189.hs:6:42 })))
+                 []
+                 [])
+                (EpaComments
+                 []))
                [(L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { T14189.hs:6:33-40 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { T14189.hs:6:33-40 })
+                 (EpAnn
+                  (EpaSpan { T14189.hs:6:33-40 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (ConDeclField
                   (EpAnn
                    (EpaDelta (SameLine 0) [])
@@ -184,30 +184,30 @@
                    (EpaComments
                     []))
                   [(L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { T14189.hs:6:33 })
-                                 (AnnListItem
-                                  [])
-                                 (EpaComments
-                                  [])) { T14189.hs:6:33 })
+                    (EpAnn
+                     (EpaSpan { T14189.hs:6:33 })
+                     (AnnListItem
+                      [])
+                     (EpaComments
+                      []))
                     (FieldOcc
                      {Name: T14189.f}
                      (L
-                      (SrcSpanAnn (EpAnn
-                                   (EpaSpan { T14189.hs:6:33 })
-                                   (NameAnnTrailing
-                                    [])
-                                   (EpaComments
-                                    [])) { T14189.hs:6:33 })
+                      (EpAnn
+                       (EpaSpan { T14189.hs:6:33 })
+                       (NameAnnTrailing
+                        [])
+                       (EpaComments
+                        []))
                       (Unqual
                        {OccName: f}))))]
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { T14189.hs:6:38-40 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { T14189.hs:6:38-40 })
+                   (EpAnn
+                    (EpaSpan { T14189.hs:6:38-40 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaDelta (SameLine 0) [])
@@ -216,12 +216,12 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { T14189.hs:6:38-40 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { T14189.hs:6:38-40 })
+                     (EpAnn
+                      (EpaSpan { T14189.hs:6:38-40 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      {Name: GHC.Types.Int})))
                   (Nothing)))]))
              (Nothing)))])
@@ -238,12 +238,12 @@
    []
    [])
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T14189.hs:1:8-13 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T14189.hs:1:8-13 })
+    (EpAnn
+     (EpaSpan { T14189.hs:1:8-13 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (ImportDecl
      (XImportDeclPass
       (EpAnn
@@ -260,12 +260,12 @@
       (NoSourceText)
       (True))
      (L
-      (SrcSpanAnn (EpAnn
-                   (EpaSpan { T14189.hs:1:8-13 })
-                   (AnnListItem
-                    [])
-                   (EpaComments
-                    [])) { T14189.hs:1:8-13 })
+      (EpAnn
+       (EpaSpan { T14189.hs:1:8-13 })
+       (AnnListItem
+        [])
+       (EpaComments
+        []))
       {ModuleName: Prelude})
      (NoPkgQual)
      (NotBoot)
@@ -276,12 +276,12 @@
   (Just
    [((,)
      (L
-      (SrcSpanAnn (EpAnn
-                   (EpaSpan { T14189.hs:3:3-15 })
-                   (AnnListItem
-                    [])
-                   (EpaComments
-                    [])) { T14189.hs:3:3-15 })
+      (EpAnn
+       (EpaSpan { T14189.hs:3:3-15 })
+       (AnnListItem
+        [])
+       (EpaComments
+        []))
       (IEThingWith
        ((,)
         (Nothing)
@@ -292,57 +292,57 @@
          (EpaComments
           [])))
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T14189.hs:3:3-8 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T14189.hs:3:3-8 })
+        (EpAnn
+         (EpaSpan { T14189.hs:3:3-8 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (IEName
          (NoExtField)
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T14189.hs:3:3-8 })
-                       (NameAnnTrailing
-                        [])
-                       (EpaComments
-                        [])) { T14189.hs:3:3-8 })
+          (EpAnn
+           (EpaSpan { T14189.hs:3:3-8 })
+           (NameAnnTrailing
+            [])
+           (EpaComments
+            []))
           {Name: T14189.MyType})))
        (NoIEWildcard)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T14189.hs:3:11 })
-                      (AnnListItem
-                       [(AddCommaAnn
-                         (EpaSpan { T14189.hs:3:12 }))])
-                      (EpaComments
-                       [])) { T14189.hs:3:11 })
+         (EpAnn
+          (EpaSpan { T14189.hs:3:11 })
+          (AnnListItem
+           [(AddCommaAnn
+             (EpaSpan { T14189.hs:3:12 }))])
+          (EpaComments
+           []))
          (IEName
           (NoExtField)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T14189.hs:3:11 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T14189.hs:3:11 })
+           (EpAnn
+            (EpaSpan { T14189.hs:3:11 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            {Name: T14189.f})))
        ,(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T14189.hs:3:13-14 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T14189.hs:3:13-14 })
+         (EpAnn
+          (EpaSpan { T14189.hs:3:13-14 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (IEName
           (NoExtField)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T14189.hs:3:13-14 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T14189.hs:3:13-14 })
+           (EpAnn
+            (EpaSpan { T14189.hs:3:13-14 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            {Name: T14189.NT})))]))
      [(AvailTC
        {Name: T14189.MyType}
diff --git a/testsuite/tests/parser/should_compile/T15323.stderr b/testsuite/tests/parser/should_compile/T15323.stderr
index 386e3b923600..917c5dd7e9a2 100644
--- a/testsuite/tests/parser/should_compile/T15323.stderr
+++ b/testsuite/tests/parser/should_compile/T15323.stderr
@@ -24,22 +24,22 @@
    (Nothing))
   (Just
    (L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T15323.hs:3:8-13 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T15323.hs:3:8-13 })
+    (EpAnn
+     (EpaSpan { T15323.hs:3:8-13 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     {ModuleName: T15323}))
   (Nothing)
   []
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T15323.hs:(5,1)-(6,54) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T15323.hs:(5,1)-(6,54) })
+    (EpAnn
+     (EpaSpan { T15323.hs:(5,1)-(6,54) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (DataDecl
@@ -50,23 +50,23 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T15323.hs:5:6-17 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T15323.hs:5:6-17 })
+       (EpAnn
+        (EpaSpan { T15323.hs:5:6-17 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: MaybeDefault}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T15323.hs:5:19 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T15323.hs:5:19 })
+         (EpAnn
+          (EpaSpan { T15323.hs:5:19 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (UserTyVar
           (EpAnn
            (EpaSpan { T15323.hs:5:19 })
@@ -75,12 +75,12 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T15323.hs:5:19 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T15323.hs:5:19 })
+           (EpAnn
+            (EpaSpan { T15323.hs:5:19 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: v}))))])
       (Prefix)
@@ -92,12 +92,12 @@
        (DataTypeCons
         (False)
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T15323.hs:6:5-54 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T15323.hs:6:5-54 })
+          (EpAnn
+           (EpaSpan { T15323.hs:6:5-54 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (ConDeclGADT
            (EpAnn
             (EpaSpan { T15323.hs:6:5-54 })
@@ -106,12 +106,12 @@
              []))
            (:|
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { T15323.hs:6:5-14 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { T15323.hs:6:5-14 })
+             (EpAnn
+              (EpaSpan { T15323.hs:6:5-14 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: TestParens}))
             [])
@@ -120,12 +120,12 @@
              (EpaSpan { T15323.hs:6:17-18 }))
             (HsNormalTok))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T15323.hs:6:20-29 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T15323.hs:6:20-29 })
+            (EpAnn
+             (EpaSpan { T15323.hs:6:20-29 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsOuterExplicit
              (EpAnn
               (EpaSpan { T15323.hs:6:20-29 })
@@ -135,12 +135,12 @@
               (EpaComments
                []))
              [(L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { T15323.hs:6:27 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { T15323.hs:6:27 })
+               (EpAnn
+                (EpaSpan { T15323.hs:6:27 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (UserTyVar
                 (EpAnn
                  (EpaSpan { T15323.hs:6:27 })
@@ -149,34 +149,34 @@
                   []))
                 (SpecifiedSpec)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { T15323.hs:6:27 })
-                              (NameAnnTrailing
-                               [])
-                              (EpaComments
-                               [])) { T15323.hs:6:27 })
+                 (EpAnn
+                  (EpaSpan { T15323.hs:6:27 })
+                  (NameAnnTrailing
+                   [])
+                  (EpaComments
+                   []))
                  (Unqual
                   {OccName: v}))))]))
            (Just
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { T15323.hs:6:31-36 })
-                          (AnnContext
-                           (Just
-                            ((,)
-                             (NormalSyntax)
-                             (EpaSpan { T15323.hs:6:38-39 })))
-                           []
-                           [])
-                          (EpaComments
-                           [])) { T15323.hs:6:31-36 })
+             (EpAnn
+              (EpaSpan { T15323.hs:6:31-36 })
+              (AnnContext
+               (Just
+                ((,)
+                 (NormalSyntax)
+                 (EpaSpan { T15323.hs:6:38-39 })))
+               []
+               [])
+              (EpaComments
+               []))
              [(L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { T15323.hs:6:31-36 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { T15323.hs:6:31-36 })
+               (EpAnn
+                (EpaSpan { T15323.hs:6:31-36 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsParTy
                 (EpAnn
                  (EpaSpan { T15323.hs:6:31-36 })
@@ -187,21 +187,21 @@
                  (EpaComments
                   []))
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { T15323.hs:6:32-35 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { T15323.hs:6:32-35 })
+                 (EpAnn
+                  (EpaSpan { T15323.hs:6:32-35 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (HsAppTy
                   (NoExtField)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { T15323.hs:6:32-33 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { T15323.hs:6:32-33 })
+                   (EpAnn
+                    (EpaSpan { T15323.hs:6:32-33 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { T15323.hs:6:32-33 })
@@ -210,21 +210,21 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { T15323.hs:6:32-33 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { T15323.hs:6:32-33 })
+                     (EpAnn
+                      (EpaSpan { T15323.hs:6:32-33 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: Eq}))))
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { T15323.hs:6:35 })
-                                (AnnListItem
-                                 [])
-                                (EpaComments
-                                 [])) { T15323.hs:6:35 })
+                   (EpAnn
+                    (EpaSpan { T15323.hs:6:35 })
+                    (AnnListItem
+                     [])
+                    (EpaComments
+                     []))
                    (HsTyVar
                     (EpAnn
                      (EpaSpan { T15323.hs:6:35 })
@@ -233,32 +233,32 @@
                       []))
                     (NotPromoted)
                     (L
-                     (SrcSpanAnn (EpAnn
-                                  (EpaSpan { T15323.hs:6:35 })
-                                  (NameAnnTrailing
-                                   [])
-                                  (EpaComments
-                                   [])) { T15323.hs:6:35 })
+                     (EpAnn
+                      (EpaSpan { T15323.hs:6:35 })
+                      (NameAnnTrailing
+                       [])
+                      (EpaComments
+                       []))
                      (Unqual
                       {OccName: v}))))))))]))
            (PrefixConGADT
             [])
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T15323.hs:6:41-54 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T15323.hs:6:41-54 })
+            (EpAnn
+             (EpaSpan { T15323.hs:6:41-54 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsAppTy
              (NoExtField)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T15323.hs:6:41-52 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { T15323.hs:6:41-52 })
+              (EpAnn
+               (EpaSpan { T15323.hs:6:41-52 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { T15323.hs:6:41-52 })
@@ -267,21 +267,21 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T15323.hs:6:41-52 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { T15323.hs:6:41-52 })
+                (EpAnn
+                 (EpaSpan { T15323.hs:6:41-52 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: MaybeDefault}))))
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T15323.hs:6:54 })
-                           (AnnListItem
-                            [])
-                           (EpaComments
-                            [])) { T15323.hs:6:54 })
+              (EpAnn
+               (EpaSpan { T15323.hs:6:54 })
+               (AnnListItem
+                [])
+               (EpaComments
+                []))
               (HsTyVar
                (EpAnn
                 (EpaSpan { T15323.hs:6:54 })
@@ -290,12 +290,12 @@
                  []))
                (NotPromoted)
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T15323.hs:6:54 })
-                             (NameAnnTrailing
-                              [])
-                             (EpaComments
-                              [])) { T15323.hs:6:54 })
+                (EpAnn
+                 (EpaSpan { T15323.hs:6:54 })
+                 (NameAnnTrailing
+                  [])
+                 (EpaComments
+                  []))
                 (Unqual
                  {OccName: v}))))))
            (Nothing)))])
diff --git a/testsuite/tests/parser/should_compile/T20452.stderr b/testsuite/tests/parser/should_compile/T20452.stderr
index f9d64c530edb..bcb698e2f63d 100644
--- a/testsuite/tests/parser/should_compile/T20452.stderr
+++ b/testsuite/tests/parser/should_compile/T20452.stderr
@@ -24,22 +24,22 @@
    (Nothing))
   (Just
    (L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T20452.hs:3:8-13 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T20452.hs:3:8-13 })
+    (EpAnn
+     (EpaSpan { T20452.hs:3:8-13 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     {ModuleName: T20452}))
   (Nothing)
   []
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T20452.hs:5:1-31 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T20452.hs:5:1-31 })
+    (EpAnn
+     (EpaSpan { T20452.hs:5:1-31 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (DataDecl
@@ -50,23 +50,23 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T20452.hs:5:6-11 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T20452.hs:5:6-11 })
+       (EpAnn
+        (EpaSpan { T20452.hs:5:6-11 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: Proxy1}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T20452.hs:5:14-21 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T20452.hs:5:14-21 })
+         (EpAnn
+          (EpaSpan { T20452.hs:5:14-21 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (KindedTyVar
           (EpAnn
            (EpaSpan { T20452.hs:5:14-21 })
@@ -77,21 +77,21 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T20452.hs:5:15 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T20452.hs:5:15 })
+           (EpAnn
+            (EpaSpan { T20452.hs:5:15 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: a}))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T20452.hs:5:20 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { T20452.hs:5:20 })
+           (EpAnn
+            (EpaSpan { T20452.hs:5:20 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsTyVar
             (EpAnn
              (EpaSpan { T20452.hs:5:20 })
@@ -100,12 +100,12 @@
               []))
             (NotPromoted)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { T20452.hs:5:20 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { T20452.hs:5:20 })
+             (EpAnn
+              (EpaSpan { T20452.hs:5:20 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: k}))))))])
       (Prefix)
@@ -117,12 +117,12 @@
        (DataTypeCons
         (False)
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T20452.hs:5:26-31 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T20452.hs:5:26-31 })
+          (EpAnn
+           (EpaSpan { T20452.hs:5:26-31 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (ConDeclH98
            (EpAnn
             (EpaSpan { T20452.hs:5:26-31 })
@@ -130,12 +130,12 @@
             (EpaComments
              []))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T20452.hs:5:26-31 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { T20452.hs:5:26-31 })
+            (EpAnn
+             (EpaSpan { T20452.hs:5:26-31 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: Proxy1}))
            (False)
@@ -147,12 +147,12 @@
            (Nothing)))])
        []))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T20452.hs:6:1-31 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T20452.hs:6:1-31 })
+    (EpAnn
+     (EpaSpan { T20452.hs:6:1-31 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (DataDecl
@@ -163,23 +163,23 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T20452.hs:6:6-11 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T20452.hs:6:6-11 })
+       (EpAnn
+        (EpaSpan { T20452.hs:6:6-11 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: Proxy2}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T20452.hs:6:13-22 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T20452.hs:6:13-22 })
+         (EpAnn
+          (EpaSpan { T20452.hs:6:13-22 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (KindedTyVar
           (EpAnn
            (EpaSpan { T20452.hs:6:13-22 })
@@ -192,21 +192,21 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T20452.hs:6:15 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T20452.hs:6:15 })
+           (EpAnn
+            (EpaSpan { T20452.hs:6:15 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: a}))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T20452.hs:6:20 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { T20452.hs:6:20 })
+           (EpAnn
+            (EpaSpan { T20452.hs:6:20 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsTyVar
             (EpAnn
              (EpaSpan { T20452.hs:6:20 })
@@ -215,12 +215,12 @@
               []))
             (NotPromoted)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { T20452.hs:6:20 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { T20452.hs:6:20 })
+             (EpAnn
+              (EpaSpan { T20452.hs:6:20 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: k}))))))])
       (Prefix)
@@ -232,12 +232,12 @@
        (DataTypeCons
         (False)
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T20452.hs:6:26-31 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T20452.hs:6:26-31 })
+          (EpAnn
+           (EpaSpan { T20452.hs:6:26-31 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (ConDeclH98
            (EpAnn
             (EpaSpan { T20452.hs:6:26-31 })
@@ -245,12 +245,12 @@
             (EpaComments
              []))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T20452.hs:6:26-31 })
-                         (NameAnnTrailing
-                          [])
-                         (EpaComments
-                          [])) { T20452.hs:6:26-31 })
+            (EpAnn
+             (EpaSpan { T20452.hs:6:26-31 })
+             (NameAnnTrailing
+              [])
+             (EpaComments
+              []))
             (Unqual
              {OccName: Proxy2}))
            (False)
@@ -262,12 +262,12 @@
            (Nothing)))])
        []))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T20452.hs:8:1-85 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T20452.hs:8:1-85 })
+    (EpAnn
+     (EpaSpan { T20452.hs:8:1-85 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (ClassDecl
@@ -292,23 +292,23 @@
         (HsTok)))
       (Nothing)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T20452.hs:8:7-12 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T20452.hs:8:7-12 })
+       (EpAnn
+        (EpaSpan { T20452.hs:8:7-12 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: Prods1}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T20452.hs:8:15-26 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T20452.hs:8:15-26 })
+         (EpAnn
+          (EpaSpan { T20452.hs:8:15-26 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (KindedTyVar
           (EpAnn
            (EpaSpan { T20452.hs:8:15-26 })
@@ -319,21 +319,21 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T20452.hs:8:16-18 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T20452.hs:8:16-18 })
+           (EpAnn
+            (EpaSpan { T20452.hs:8:16-18 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: lhs}))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T20452.hs:8:23-25 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { T20452.hs:8:23-25 })
+           (EpAnn
+            (EpaSpan { T20452.hs:8:23-25 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsTyVar
             (EpAnn
              (EpaSpan { T20452.hs:8:23-25 })
@@ -342,21 +342,21 @@
               []))
             (NotPromoted)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { T20452.hs:8:23-25 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { T20452.hs:8:23-25 })
+             (EpAnn
+              (EpaSpan { T20452.hs:8:23-25 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: Int}))))))
        ,(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T20452.hs:8:30-45 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T20452.hs:8:30-45 })
+         (EpAnn
+          (EpaSpan { T20452.hs:8:30-45 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (KindedTyVar
           (EpAnn
            (EpaSpan { T20452.hs:8:30-45 })
@@ -367,21 +367,21 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T20452.hs:8:31-34 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T20452.hs:8:31-34 })
+           (EpAnn
+            (EpaSpan { T20452.hs:8:31-34 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: name}))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T20452.hs:8:39-44 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { T20452.hs:8:39-44 })
+           (EpAnn
+            (EpaSpan { T20452.hs:8:39-44 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsTyVar
             (EpAnn
              (EpaSpan { T20452.hs:8:39-44 })
@@ -390,21 +390,21 @@
               []))
             (NotPromoted)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { T20452.hs:8:39-44 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { T20452.hs:8:39-44 })
+             (EpAnn
+              (EpaSpan { T20452.hs:8:39-44 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: String}))))))
        ,(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T20452.hs:8:49-75 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T20452.hs:8:49-75 })
+         (EpAnn
+          (EpaSpan { T20452.hs:8:49-75 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (KindedTyVar
           (EpAnn
            (EpaSpan { T20452.hs:8:49-75 })
@@ -415,21 +415,21 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T20452.hs:8:50-52 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T20452.hs:8:50-52 })
+           (EpAnn
+            (EpaSpan { T20452.hs:8:50-52 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: rhs}))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T20452.hs:8:57-74 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { T20452.hs:8:57-74 })
+           (EpAnn
+            (EpaSpan { T20452.hs:8:57-74 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsListTy
             (EpAnn
              (EpaSpan { T20452.hs:8:57-74 })
@@ -440,12 +440,12 @@
              (EpaComments
               []))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { T20452.hs:8:58-73 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { T20452.hs:8:58-73 })
+             (EpAnn
+              (EpaSpan { T20452.hs:8:58-73 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsTupleTy
               (EpAnn
                (EpaSpan { T20452.hs:8:58-73 })
@@ -457,13 +457,13 @@
                 []))
               (HsBoxedOrConstraintTuple)
               [(L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T20452.hs:8:59-64 })
-                             (AnnListItem
-                              [(AddCommaAnn
-                                (EpaSpan { T20452.hs:8:65 }))])
-                             (EpaComments
-                              [])) { T20452.hs:8:59-64 })
+                (EpAnn
+                 (EpaSpan { T20452.hs:8:59-64 })
+                 (AnnListItem
+                  [(AddCommaAnn
+                    (EpaSpan { T20452.hs:8:65 }))])
+                 (EpaComments
+                  []))
                 (HsTyVar
                  (EpAnn
                   (EpaSpan { T20452.hs:8:59-64 })
@@ -472,21 +472,21 @@
                    []))
                  (NotPromoted)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { T20452.hs:8:59-64 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { T20452.hs:8:59-64 })
+                  (EpAnn
+                   (EpaSpan { T20452.hs:8:59-64 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: String}))))
               ,(L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T20452.hs:8:67-72 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { T20452.hs:8:67-72 })
+                (EpAnn
+                 (EpaSpan { T20452.hs:8:67-72 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsTyVar
                  (EpAnn
                   (EpaSpan { T20452.hs:8:67-72 })
@@ -495,12 +495,12 @@
                    []))
                  (NotPromoted)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { T20452.hs:8:67-72 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { T20452.hs:8:67-72 })
+                  (EpAnn
+                   (EpaSpan { T20452.hs:8:67-72 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: String}))))]))))))])
       (Prefix)
@@ -512,12 +512,12 @@
       []
       [])))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T20452.hs:9:1-85 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T20452.hs:9:1-85 })
+    (EpAnn
+     (EpaSpan { T20452.hs:9:1-85 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (ClassDecl
@@ -542,23 +542,23 @@
         (HsTok)))
       (Nothing)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T20452.hs:9:7-12 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T20452.hs:9:7-12 })
+       (EpAnn
+        (EpaSpan { T20452.hs:9:7-12 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: Prods2}))
       (HsQTvs
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T20452.hs:9:14-27 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T20452.hs:9:14-27 })
+         (EpAnn
+          (EpaSpan { T20452.hs:9:14-27 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (KindedTyVar
           (EpAnn
            (EpaSpan { T20452.hs:9:14-27 })
@@ -571,21 +571,21 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T20452.hs:9:16-18 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T20452.hs:9:16-18 })
+           (EpAnn
+            (EpaSpan { T20452.hs:9:16-18 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: lhs}))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T20452.hs:9:23-25 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { T20452.hs:9:23-25 })
+           (EpAnn
+            (EpaSpan { T20452.hs:9:23-25 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsTyVar
             (EpAnn
              (EpaSpan { T20452.hs:9:23-25 })
@@ -594,21 +594,21 @@
               []))
             (NotPromoted)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { T20452.hs:9:23-25 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { T20452.hs:9:23-25 })
+             (EpAnn
+              (EpaSpan { T20452.hs:9:23-25 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: Int}))))))
        ,(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T20452.hs:9:29-46 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T20452.hs:9:29-46 })
+         (EpAnn
+          (EpaSpan { T20452.hs:9:29-46 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (KindedTyVar
           (EpAnn
            (EpaSpan { T20452.hs:9:29-46 })
@@ -621,21 +621,21 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T20452.hs:9:31-34 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T20452.hs:9:31-34 })
+           (EpAnn
+            (EpaSpan { T20452.hs:9:31-34 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: name}))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T20452.hs:9:39-44 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { T20452.hs:9:39-44 })
+           (EpAnn
+            (EpaSpan { T20452.hs:9:39-44 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsTyVar
             (EpAnn
              (EpaSpan { T20452.hs:9:39-44 })
@@ -644,21 +644,21 @@
               []))
             (NotPromoted)
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { T20452.hs:9:39-44 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { T20452.hs:9:39-44 })
+             (EpAnn
+              (EpaSpan { T20452.hs:9:39-44 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: String}))))))
        ,(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T20452.hs:9:48-76 })
-                      (AnnListItem
-                       [])
-                      (EpaComments
-                       [])) { T20452.hs:9:48-76 })
+         (EpAnn
+          (EpaSpan { T20452.hs:9:48-76 })
+          (AnnListItem
+           [])
+          (EpaComments
+           []))
          (KindedTyVar
           (EpAnn
            (EpaSpan { T20452.hs:9:48-76 })
@@ -671,21 +671,21 @@
             []))
           (HsBndrRequired)
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T20452.hs:9:50-52 })
-                        (NameAnnTrailing
-                         [])
-                        (EpaComments
-                         [])) { T20452.hs:9:50-52 })
+           (EpAnn
+            (EpaSpan { T20452.hs:9:50-52 })
+            (NameAnnTrailing
+             [])
+            (EpaComments
+             []))
            (Unqual
             {OccName: rhs}))
           (L
-           (SrcSpanAnn (EpAnn
-                        (EpaSpan { T20452.hs:9:57-74 })
-                        (AnnListItem
-                         [])
-                        (EpaComments
-                         [])) { T20452.hs:9:57-74 })
+           (EpAnn
+            (EpaSpan { T20452.hs:9:57-74 })
+            (AnnListItem
+             [])
+            (EpaComments
+             []))
            (HsListTy
             (EpAnn
              (EpaSpan { T20452.hs:9:57-74 })
@@ -696,12 +696,12 @@
              (EpaComments
               []))
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { T20452.hs:9:58-73 })
-                          (AnnListItem
-                           [])
-                          (EpaComments
-                           [])) { T20452.hs:9:58-73 })
+             (EpAnn
+              (EpaSpan { T20452.hs:9:58-73 })
+              (AnnListItem
+               [])
+              (EpaComments
+               []))
              (HsTupleTy
               (EpAnn
                (EpaSpan { T20452.hs:9:58-73 })
@@ -713,13 +713,13 @@
                 []))
               (HsBoxedOrConstraintTuple)
               [(L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T20452.hs:9:59-64 })
-                             (AnnListItem
-                              [(AddCommaAnn
-                                (EpaSpan { T20452.hs:9:65 }))])
-                             (EpaComments
-                              [])) { T20452.hs:9:59-64 })
+                (EpAnn
+                 (EpaSpan { T20452.hs:9:59-64 })
+                 (AnnListItem
+                  [(AddCommaAnn
+                    (EpaSpan { T20452.hs:9:65 }))])
+                 (EpaComments
+                  []))
                 (HsTyVar
                  (EpAnn
                   (EpaSpan { T20452.hs:9:59-64 })
@@ -728,21 +728,21 @@
                    []))
                  (NotPromoted)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { T20452.hs:9:59-64 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { T20452.hs:9:59-64 })
+                  (EpAnn
+                   (EpaSpan { T20452.hs:9:59-64 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: String}))))
               ,(L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T20452.hs:9:67-72 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { T20452.hs:9:67-72 })
+                (EpAnn
+                 (EpaSpan { T20452.hs:9:67-72 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsTyVar
                  (EpAnn
                   (EpaSpan { T20452.hs:9:67-72 })
@@ -751,12 +751,12 @@
                    []))
                  (NotPromoted)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { T20452.hs:9:67-72 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { T20452.hs:9:67-72 })
+                  (EpAnn
+                   (EpaSpan { T20452.hs:9:67-72 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: String}))))]))))))])
       (Prefix)
diff --git a/testsuite/tests/parser/should_compile/T20718.stderr b/testsuite/tests/parser/should_compile/T20718.stderr
index 41bf1b3c0b45..b487bc0550de 100644
--- a/testsuite/tests/parser/should_compile/T20718.stderr
+++ b/testsuite/tests/parser/should_compile/T20718.stderr
@@ -58,55 +58,55 @@
    (Nothing))
   (Just
    (L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T20718.hs:3:8-13 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T20718.hs:3:8-13 })
+    (EpAnn
+     (EpaSpan { T20718.hs:3:8-13 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     {ModuleName: T20718}))
   (Nothing)
   []
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T20718.hs:8:1-5 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T20718.hs:8:1-5 })
+    (EpAnn
+     (EpaSpan { T20718.hs:8:1-5 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T20718.hs:8:1 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T20718.hs:8:1 })
+       (EpAnn
+        (EpaSpan { T20718.hs:8:1 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: x}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T20718.hs:8:1-5 })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { T20718.hs:8:1-5 })
+        (EpAnn
+         (EpaSpan { T20718.hs:8:1-5 })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T20718.hs:8:1-5 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T20718.hs:8:1-5 })
+          (EpAnn
+           (EpaSpan { T20718.hs:8:1-5 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { T20718.hs:8:1-5 })
@@ -115,12 +115,12 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { T20718.hs:8:1 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { T20718.hs:8:1 })
+             (EpAnn
+              (EpaSpan { T20718.hs:8:1 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: x}))
             (Prefix)
@@ -130,13 +130,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { T20718.hs:8:3-5 })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { T20718.hs:8:3-5 })
+              (EpAnn
+               (EpaSpan { T20718.hs:8:3-5 })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { T20718.hs:8:3-5 })
@@ -147,12 +145,12 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T20718.hs:8:5 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { T20718.hs:8:5 })
+                (EpAnn
+                 (EpaSpan { T20718.hs:8:5 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsOverLit
                  (EpAnn
                   (EpaSpan { T20718.hs:8:5 })
diff --git a/testsuite/tests/parser/should_compile/T20718b.stderr b/testsuite/tests/parser/should_compile/T20718b.stderr
index 8bca7b3563f1..69fb41bcdced 100644
--- a/testsuite/tests/parser/should_compile/T20718b.stderr
+++ b/testsuite/tests/parser/should_compile/T20718b.stderr
@@ -47,12 +47,12 @@
    (Nothing))
   (Just
    (L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T20718b.hs:4:8-14 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T20718b.hs:4:8-14 })
+    (EpAnn
+     (EpaSpan { T20718b.hs:4:8-14 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     {ModuleName: T20718b}))
   (Nothing)
   []
diff --git a/testsuite/tests/parser/should_compile/T20846.stderr b/testsuite/tests/parser/should_compile/T20846.stderr
index 7334677b85a4..b70174f6a32a 100644
--- a/testsuite/tests/parser/should_compile/T20846.stderr
+++ b/testsuite/tests/parser/should_compile/T20846.stderr
@@ -24,22 +24,22 @@
    (Nothing))
   (Just
    (L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T20846.hs:1:8-13 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T20846.hs:1:8-13 })
+    (EpAnn
+     (EpaSpan { T20846.hs:1:8-13 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     {ModuleName: T20846}))
   (Nothing)
   []
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T20846.hs:3:1-11 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T20846.hs:3:1-11 })
+    (EpAnn
+     (EpaSpan { T20846.hs:3:1-11 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (SigD
      (NoExtField)
      (FixSig
@@ -51,59 +51,59 @@
       (FixitySig
        (NoExtField)
        [(L
-         (SrcSpanAnn (EpAnn
-                      (EpaSpan { T20846.hs:3:8-11 })
-                      (NameAnnTrailing
-                       [])
-                      (EpaComments
-                       [])) { T20846.hs:3:8-11 })
+         (EpAnn
+          (EpaSpan { T20846.hs:3:8-11 })
+          (NameAnnTrailing
+           [])
+          (EpaComments
+           []))
          (Unqual
           {OccName: ++++}))]
        {Fixity: infixr 9}))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T20846.hs:4:1-18 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T20846.hs:4:1-18 })
+    (EpAnn
+     (EpaSpan { T20846.hs:4:1-18 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T20846.hs:4:1-6 })
-                    (NameAnn
-                     (NameParens)
-                     (EpaSpan { T20846.hs:4:1 })
-                     (EpaSpan { T20846.hs:4:2-5 })
-                     (EpaSpan { T20846.hs:4:6 })
-                     [])
-                    (EpaComments
-                     [])) { T20846.hs:4:1-6 })
+       (EpAnn
+        (EpaSpan { T20846.hs:4:1-6 })
+        (NameAnn
+         (NameParens)
+         (EpaSpan { T20846.hs:4:1 })
+         (EpaSpan { T20846.hs:4:2-5 })
+         (EpaSpan { T20846.hs:4:6 })
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: ++++}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T20846.hs:4:1-18 })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { T20846.hs:4:1-18 })
+        (EpAnn
+         (EpaSpan { T20846.hs:4:1-18 })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T20846.hs:4:1-18 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T20846.hs:4:1-18 })
+          (EpAnn
+           (EpaSpan { T20846.hs:4:1-18 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { T20846.hs:4:1-18 })
@@ -112,16 +112,16 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { T20846.hs:4:1-6 })
-                          (NameAnn
-                           (NameParens)
-                           (EpaSpan { T20846.hs:4:1 })
-                           (EpaSpan { T20846.hs:4:2-5 })
-                           (EpaSpan { T20846.hs:4:6 })
-                           [])
-                          (EpaComments
-                           [])) { T20846.hs:4:1-6 })
+             (EpAnn
+              (EpaSpan { T20846.hs:4:1-6 })
+              (NameAnn
+               (NameParens)
+               (EpaSpan { T20846.hs:4:1 })
+               (EpaSpan { T20846.hs:4:2-5 })
+               (EpaSpan { T20846.hs:4:6 })
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: ++++}))
             (Prefix)
@@ -131,13 +131,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { T20846.hs:4:8-18 })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { T20846.hs:4:8-18 })
+              (EpAnn
+               (EpaSpan { T20846.hs:4:8-18 })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { T20846.hs:4:8-18 })
@@ -148,21 +146,21 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { T20846.hs:4:10-18 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { T20846.hs:4:10-18 })
+                (EpAnn
+                 (EpaSpan { T20846.hs:4:10-18 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsVar
                  (NoExtField)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { T20846.hs:4:10-18 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { T20846.hs:4:10-18 })
+                  (EpAnn
+                   (EpaSpan { T20846.hs:4:10-18 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: undefined}))))))]
             (EmptyLocalBinds
diff --git a/testsuite/tests/parser/should_compile/T23315/T23315.stderr b/testsuite/tests/parser/should_compile/T23315/T23315.stderr
index 961b032e9c8b..f11fba746400 100644
--- a/testsuite/tests/parser/should_compile/T23315/T23315.stderr
+++ b/testsuite/tests/parser/should_compile/T23315/T23315.stderr
@@ -20,22 +20,22 @@
    (Nothing))
   (Just
    (L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T23315.hsig:1:11-16 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T23315.hsig:1:11-16 })
+    (EpAnn
+     (EpaSpan { T23315.hsig:1:11-16 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     {ModuleName: T23315}))
   (Nothing)
   []
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T23315.hsig:2:1-12 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T23315.hsig:2:1-12 })
+    (EpAnn
+     (EpaSpan { T23315.hsig:2:1-12 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (DocD
      (NoExtField)
      (DocCommentNext
@@ -52,12 +52,12 @@
           []))
         [])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T23315.hsig:3:1-7 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T23315.hsig:3:1-7 })
+    (EpAnn
+     (EpaSpan { T23315.hsig:3:1-7 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (SigD
      (NoExtField)
      (TypeSig
@@ -69,34 +69,34 @@
        (EpaComments
         []))
       [(L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T23315.hsig:3:1 })
-                     (NameAnnTrailing
-                      [])
-                     (EpaComments
-                      [])) { T23315.hsig:3:1 })
+        (EpAnn
+         (EpaSpan { T23315.hsig:3:1 })
+         (NameAnnTrailing
+          [])
+         (EpaComments
+          []))
         (Unqual
          {OccName: a}))]
       (HsWC
        (NoExtField)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { T23315.hsig:3:6-7 })
-                     (AnnListItem
-                      [])
-                     (EpaComments
-                      [])) { T23315.hsig:3:6-7 })
+        (EpAnn
+         (EpaSpan { T23315.hsig:3:6-7 })
+         (AnnListItem
+          [])
+         (EpaComments
+          []))
         (HsSig
          (NoExtField)
          (HsOuterImplicit
           (NoExtField))
          (L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T23315.hsig:3:6-7 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T23315.hsig:3:6-7 })
+          (EpAnn
+           (EpaSpan { T23315.hsig:3:6-7 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (HsTupleTy
            (EpAnn
             (EpaSpan { T23315.hsig:3:6-7 })
@@ -109,12 +109,12 @@
            (HsBoxedOrConstraintTuple)
            []))))))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T23315.hsig:4:1-14 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T23315.hsig:4:1-14 })
+    (EpAnn
+     (EpaSpan { T23315.hsig:4:1-14 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (DocD
      (NoExtField)
      (DocCommentPrev
diff --git a/testsuite/tests/printer/T18791.stderr b/testsuite/tests/printer/T18791.stderr
index b39b74633fe9..30ddab250d95 100644
--- a/testsuite/tests/printer/T18791.stderr
+++ b/testsuite/tests/printer/T18791.stderr
@@ -24,22 +24,22 @@
    (Nothing))
   (Just
    (L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T18791.hs:2:8-13 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T18791.hs:2:8-13 })
+    (EpAnn
+     (EpaSpan { T18791.hs:2:8-13 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     {ModuleName: T18791}))
   (Nothing)
   []
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { T18791.hs:(4,1)-(5,17) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { T18791.hs:(4,1)-(5,17) })
+    (EpAnn
+     (EpaSpan { T18791.hs:(4,1)-(5,17) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (TyClD
      (NoExtField)
      (DataDecl
@@ -50,12 +50,12 @@
        (EpaComments
         []))
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { T18791.hs:4:6 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { T18791.hs:4:6 })
+       (EpAnn
+        (EpaSpan { T18791.hs:4:6 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: T}))
       (HsQTvs
@@ -70,12 +70,12 @@
        (DataTypeCons
         (False)
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { T18791.hs:5:3-17 })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { T18791.hs:5:3-17 })
+          (EpAnn
+           (EpaSpan { T18791.hs:5:3-17 })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (ConDeclGADT
            (EpAnn
             (EpaSpan { T18791.hs:5:3-17 })
@@ -84,12 +84,12 @@
              []))
            (:|
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { T18791.hs:5:3-5 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { T18791.hs:5:3-5 })
+             (EpAnn
+              (EpaSpan { T18791.hs:5:3-5 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: MkT}))
             [])
@@ -98,12 +98,12 @@
              (EpaSpan { T18791.hs:5:7-8 }))
             (HsNormalTok))
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T18791.hs:5:10-17 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T18791.hs:5:10-17 })
+            (EpAnn
+             (EpaSpan { T18791.hs:5:10-17 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsOuterImplicit
              (NoExtField)))
            (Nothing)
@@ -115,12 +115,12 @@
                  (EpaSpan { T18791.hs:5:14-15 }))
                 (HsNormalTok)))
               (L
-               (SrcSpanAnn (EpAnn
-                            (EpaSpan { T18791.hs:5:10-12 })
-                            (AnnListItem
-                             [])
-                            (EpaComments
-                             [])) { T18791.hs:5:10-12 })
+               (EpAnn
+                (EpaSpan { T18791.hs:5:10-12 })
+                (AnnListItem
+                 [])
+                (EpaComments
+                 []))
                (HsTyVar
                 (EpAnn
                  (EpaSpan { T18791.hs:5:10-12 })
@@ -129,21 +129,21 @@
                   []))
                 (NotPromoted)
                 (L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { T18791.hs:5:10-12 })
-                              (NameAnnTrailing
-                               [])
-                              (EpaComments
-                               [])) { T18791.hs:5:10-12 })
+                 (EpAnn
+                  (EpaSpan { T18791.hs:5:10-12 })
+                  (NameAnnTrailing
+                   [])
+                  (EpaComments
+                   []))
                  (Unqual
                   {OccName: Int})))))])
            (L
-            (SrcSpanAnn (EpAnn
-                         (EpaSpan { T18791.hs:5:17 })
-                         (AnnListItem
-                          [])
-                         (EpaComments
-                          [])) { T18791.hs:5:17 })
+            (EpAnn
+             (EpaSpan { T18791.hs:5:17 })
+             (AnnListItem
+              [])
+             (EpaComments
+              []))
             (HsTyVar
              (EpAnn
               (EpaSpan { T18791.hs:5:17 })
@@ -152,12 +152,12 @@
                []))
              (NotPromoted)
              (L
-              (SrcSpanAnn (EpAnn
-                           (EpaSpan { T18791.hs:5:17 })
-                           (NameAnnTrailing
-                            [])
-                           (EpaComments
-                            [])) { T18791.hs:5:17 })
+              (EpAnn
+               (EpaSpan { T18791.hs:5:17 })
+               (NameAnnTrailing
+                [])
+               (EpaComments
+                []))
               (Unqual
                {OccName: T}))))
            (Nothing)))])
diff --git a/testsuite/tests/printer/Test20297.stdout b/testsuite/tests/printer/Test20297.stdout
index befe03a4bb16..564ed735d369 100644
--- a/testsuite/tests/printer/Test20297.stdout
+++ b/testsuite/tests/printer/Test20297.stdout
@@ -29,55 +29,55 @@
    (Nothing))
   (Just
    (L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { Test20297.hs:2:8-16 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { Test20297.hs:2:8-16 })
+    (EpAnn
+     (EpaSpan { Test20297.hs:2:8-16 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     {ModuleName: Test20297}))
   (Nothing)
   []
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { Test20297.hs:(5,1)-(7,7) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { Test20297.hs:(5,1)-(7,7) })
+    (EpAnn
+     (EpaSpan { Test20297.hs:(5,1)-(7,7) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { Test20297.hs:5:1-3 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { Test20297.hs:5:1-3 })
+       (EpAnn
+        (EpaSpan { Test20297.hs:5:1-3 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: bar}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { Test20297.hs:(5,1)-(7,7) })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { Test20297.hs:(5,1)-(7,7) })
+        (EpAnn
+         (EpaSpan { Test20297.hs:(5,1)-(7,7) })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { Test20297.hs:(5,1)-(7,7) })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { Test20297.hs:(5,1)-(7,7) })
+          (EpAnn
+           (EpaSpan { Test20297.hs:(5,1)-(7,7) })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { Test20297.hs:(5,1)-(7,7) })
@@ -86,12 +86,12 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { Test20297.hs:5:1-3 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { Test20297.hs:5:1-3 })
+             (EpAnn
+              (EpaSpan { Test20297.hs:5:1-3 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: bar}))
             (Prefix)
@@ -101,13 +101,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { Test20297.hs:5:5-7 })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { Test20297.hs:5:5-7 })
+              (EpAnn
+               (EpaSpan { Test20297.hs:5:5-7 })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { Test20297.hs:5:5-7 })
@@ -123,21 +121,21 @@
                     { Test20297.hs:5:7 }))]))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { Test20297.hs:5:7 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { Test20297.hs:5:7 })
+                (EpAnn
+                 (EpaSpan { Test20297.hs:5:7 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsVar
                  (NoExtField)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { Test20297.hs:5:7 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { Test20297.hs:5:7 })
+                  (EpAnn
+                   (EpaSpan { Test20297.hs:5:7 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: x}))))))]
             (HsValBinds
@@ -158,50 +156,50 @@
                []}
               [])))))])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { Test20297.hs:(9,1)-(11,26) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [(L
-                    (EpaSpan { Test20297.hs:7:9-19 })
-                    (EpaComment
-                     (EpaLineComment
-                      "-- comment1")
-                     { Test20297.hs:7:3-7 }))])) { Test20297.hs:(9,1)-(11,26) })
+    (EpAnn
+     (EpaSpan { Test20297.hs:(9,1)-(11,26) })
+     (AnnListItem
+      [])
+     (EpaComments
+      [(L
+        (EpaSpan { Test20297.hs:7:9-19 })
+        (EpaComment
+         (EpaLineComment
+          "-- comment1")
+         { Test20297.hs:7:3-7 }))]))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { Test20297.hs:9:1-3 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { Test20297.hs:9:1-3 })
+       (EpAnn
+        (EpaSpan { Test20297.hs:9:1-3 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: foo}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { Test20297.hs:(9,1)-(11,26) })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { Test20297.hs:(9,1)-(11,26) })
+        (EpAnn
+         (EpaSpan { Test20297.hs:(9,1)-(11,26) })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { Test20297.hs:(9,1)-(11,26) })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { Test20297.hs:(9,1)-(11,26) })
+          (EpAnn
+           (EpaSpan { Test20297.hs:(9,1)-(11,26) })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { Test20297.hs:(9,1)-(11,26) })
@@ -210,12 +208,12 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { Test20297.hs:9:1-3 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { Test20297.hs:9:1-3 })
+             (EpAnn
+              (EpaSpan { Test20297.hs:9:1-3 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: foo}))
             (Prefix)
@@ -225,13 +223,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { Test20297.hs:9:5-7 })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { Test20297.hs:9:5-7 })
+              (EpAnn
+               (EpaSpan { Test20297.hs:9:5-7 })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { Test20297.hs:9:5-7 })
@@ -242,21 +238,21 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { Test20297.hs:9:7 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { Test20297.hs:9:7 })
+                (EpAnn
+                 (EpaSpan { Test20297.hs:9:7 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsVar
                  (NoExtField)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { Test20297.hs:9:7 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { Test20297.hs:9:7 })
+                  (EpAnn
+                   (EpaSpan { Test20297.hs:9:7 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: x}))))))]
             (HsValBinds
@@ -280,43 +276,43 @@
               (NoAnnSortKey)
               {Bag(LocatedA (HsBind GhcPs)):
                [(L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { Test20297.hs:11:9-26 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { Test20297.hs:11:9-26 })
+                 (EpAnn
+                  (EpaSpan { Test20297.hs:11:9-26 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (FunBind
                   (NoExtField)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { Test20297.hs:11:9-15 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { Test20297.hs:11:9-15 })
+                   (EpAnn
+                    (EpaSpan { Test20297.hs:11:9-15 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    (Unqual
                     {OccName: doStuff}))
                   (MG
                    (FromSource)
                    (L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { Test20297.hs:11:9-26 })
-                                 (AnnList
-                                  (Nothing)
-                                  (Nothing)
-                                  (Nothing)
-                                  []
-                                  [])
-                                 (EpaComments
-                                  [])) { Test20297.hs:11:9-26 })
+                    (EpAnn
+                     (EpaSpan { Test20297.hs:11:9-26 })
+                     (AnnList
+                      (Nothing)
+                      (Nothing)
+                      (Nothing)
+                      []
+                      [])
+                     (EpaComments
+                      []))
                     [(L
-                      (SrcSpanAnn (EpAnn
-                                   (EpaSpan { Test20297.hs:11:9-26 })
-                                   (AnnListItem
-                                    [])
-                                   (EpaComments
-                                    [])) { Test20297.hs:11:9-26 })
+                      (EpAnn
+                       (EpaSpan { Test20297.hs:11:9-26 })
+                       (AnnListItem
+                        [])
+                       (EpaComments
+                        []))
                       (Match
                        (EpAnn
                         (EpaSpan { Test20297.hs:11:9-26 })
@@ -325,12 +321,12 @@
                          []))
                        (FunRhs
                         (L
-                         (SrcSpanAnn (EpAnn
-                                      (EpaSpan { Test20297.hs:11:9-15 })
-                                      (NameAnnTrailing
-                                       [])
-                                      (EpaComments
-                                       [])) { Test20297.hs:11:9-15 })
+                         (EpAnn
+                          (EpaSpan { Test20297.hs:11:9-15 })
+                          (NameAnnTrailing
+                           [])
+                          (EpaComments
+                           []))
                          (Unqual
                           {OccName: doStuff}))
                         (Prefix)
@@ -340,13 +336,11 @@
                         (EpaComments
                          [])
                         [(L
-                          (SrcSpanAnn
-                           (EpAnn
-                            (EpaSpan { Test20297.hs:11:17-26 })
-                            (NoEpAnns)
-                            (EpaComments
-                             []))
-                           { Test20297.hs:11:17-26 })
+                          (EpAnn
+                           (EpaSpan { Test20297.hs:11:17-26 })
+                           (NoEpAnns)
+                           (EpaComments
+                            []))
                           (GRHS
                            (EpAnn
                             (EpaSpan { Test20297.hs:11:17-26 })
@@ -357,12 +351,12 @@
                              []))
                            []
                            (L
-                            (SrcSpanAnn (EpAnn
-                                         (EpaSpan { Test20297.hs:11:19-26 })
-                                         (AnnListItem
-                                          [])
-                                         (EpaComments
-                                          [])) { Test20297.hs:11:19-26 })
+                            (EpAnn
+                             (EpaSpan { Test20297.hs:11:19-26 })
+                             (AnnListItem
+                              [])
+                             (EpaComments
+                              []))
                             (HsDo
                              (EpAnn
                               (EpaSpan { Test20297.hs:11:19-26 })
@@ -378,42 +372,42 @@
                              (DoExpr
                               (Nothing))
                              (L
-                              (SrcSpanAnn (EpAnn
-                                           (EpaSpan { Test20297.hs:11:22-26 })
-                                           (AnnList
-                                            (Just
-                                             (EpaSpan { Test20297.hs:11:22-26 }))
-                                            (Nothing)
-                                            (Nothing)
-                                            []
-                                            [])
-                                           (EpaComments
-                                            [])) { Test20297.hs:11:22-26 })
+                              (EpAnn
+                               (EpaSpan { Test20297.hs:11:22-26 })
+                               (AnnList
+                                (Just
+                                 (EpaSpan { Test20297.hs:11:22-26 }))
+                                (Nothing)
+                                (Nothing)
+                                []
+                                [])
+                               (EpaComments
+                                []))
                               [(L
-                                (SrcSpanAnn (EpAnn
-                                             (EpaSpan { Test20297.hs:11:22-26 })
-                                             (AnnListItem
-                                              [])
-                                             (EpaComments
-                                              [])) { Test20297.hs:11:22-26 })
+                                (EpAnn
+                                 (EpaSpan { Test20297.hs:11:22-26 })
+                                 (AnnListItem
+                                  [])
+                                 (EpaComments
+                                  []))
                                 (BodyStmt
                                  (NoExtField)
                                  (L
-                                  (SrcSpanAnn (EpAnn
-                                               (EpaSpan { Test20297.hs:11:22-26 })
-                                               (AnnListItem
-                                                [])
-                                               (EpaComments
-                                                [])) { Test20297.hs:11:22-26 })
+                                  (EpAnn
+                                   (EpaSpan { Test20297.hs:11:22-26 })
+                                   (AnnListItem
+                                    [])
+                                   (EpaComments
+                                    []))
                                   (HsVar
                                    (NoExtField)
                                    (L
-                                    (SrcSpanAnn (EpAnn
-                                                 (EpaSpan { Test20297.hs:11:22-26 })
-                                                 (NameAnnTrailing
-                                                  [])
-                                                 (EpaComments
-                                                  [])) { Test20297.hs:11:22-26 })
+                                    (EpAnn
+                                     (EpaSpan { Test20297.hs:11:22-26 })
+                                     (NameAnnTrailing
+                                      [])
+                                     (EpaComments
+                                      []))
                                     (Unqual
                                      {OccName: stuff}))))
                                  (NoExtField)
@@ -454,55 +448,55 @@
    (Nothing))
   (Just
    (L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { Test20297.ppr.hs:2:8-16 })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { Test20297.ppr.hs:2:8-16 })
+    (EpAnn
+     (EpaSpan { Test20297.ppr.hs:2:8-16 })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     {ModuleName: Test20297}))
   (Nothing)
   []
   [(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { Test20297.ppr.hs:(3,1)-(5,7) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { Test20297.ppr.hs:(3,1)-(5,7) })
+    (EpAnn
+     (EpaSpan { Test20297.ppr.hs:(3,1)-(5,7) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { Test20297.ppr.hs:3:1-3 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { Test20297.ppr.hs:3:1-3 })
+       (EpAnn
+        (EpaSpan { Test20297.ppr.hs:3:1-3 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: bar}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { Test20297.ppr.hs:(3,1)-(5,7) })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { Test20297.ppr.hs:(3,1)-(5,7) })
+        (EpAnn
+         (EpaSpan { Test20297.ppr.hs:(3,1)-(5,7) })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { Test20297.ppr.hs:(3,1)-(5,7) })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { Test20297.ppr.hs:(3,1)-(5,7) })
+          (EpAnn
+           (EpaSpan { Test20297.ppr.hs:(3,1)-(5,7) })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { Test20297.ppr.hs:(3,1)-(5,7) })
@@ -511,12 +505,12 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { Test20297.ppr.hs:3:1-3 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { Test20297.ppr.hs:3:1-3 })
+             (EpAnn
+              (EpaSpan { Test20297.ppr.hs:3:1-3 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: bar}))
             (Prefix)
@@ -526,13 +520,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { Test20297.ppr.hs:4:3-5 })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { Test20297.ppr.hs:4:3-5 })
+              (EpAnn
+               (EpaSpan { Test20297.ppr.hs:4:3-5 })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { Test20297.ppr.hs:4:3-5 })
@@ -543,21 +535,21 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { Test20297.ppr.hs:4:5 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { Test20297.ppr.hs:4:5 })
+                (EpAnn
+                 (EpaSpan { Test20297.ppr.hs:4:5 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsVar
                  (NoExtField)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { Test20297.ppr.hs:4:5 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { Test20297.ppr.hs:4:5 })
+                  (EpAnn
+                   (EpaSpan { Test20297.ppr.hs:4:5 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: x}))))))]
             (HsValBinds
@@ -578,45 +570,45 @@
                []}
               [])))))])))))
   ,(L
-    (SrcSpanAnn (EpAnn
-                 (EpaSpan { Test20297.ppr.hs:(6,1)-(9,24) })
-                 (AnnListItem
-                  [])
-                 (EpaComments
-                  [])) { Test20297.ppr.hs:(6,1)-(9,24) })
+    (EpAnn
+     (EpaSpan { Test20297.ppr.hs:(6,1)-(9,24) })
+     (AnnListItem
+      [])
+     (EpaComments
+      []))
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
       (L
-       (SrcSpanAnn (EpAnn
-                    (EpaSpan { Test20297.ppr.hs:6:1-3 })
-                    (NameAnnTrailing
-                     [])
-                    (EpaComments
-                     [])) { Test20297.ppr.hs:6:1-3 })
+       (EpAnn
+        (EpaSpan { Test20297.ppr.hs:6:1-3 })
+        (NameAnnTrailing
+         [])
+        (EpaComments
+         []))
        (Unqual
         {OccName: foo}))
       (MG
        (FromSource)
        (L
-        (SrcSpanAnn (EpAnn
-                     (EpaSpan { Test20297.ppr.hs:(6,1)-(9,24) })
-                     (AnnList
-                      (Nothing)
-                      (Nothing)
-                      (Nothing)
-                      []
-                      [])
-                     (EpaComments
-                      [])) { Test20297.ppr.hs:(6,1)-(9,24) })
+        (EpAnn
+         (EpaSpan { Test20297.ppr.hs:(6,1)-(9,24) })
+         (AnnList
+          (Nothing)
+          (Nothing)
+          (Nothing)
+          []
+          [])
+         (EpaComments
+          []))
         [(L
-          (SrcSpanAnn (EpAnn
-                       (EpaSpan { Test20297.ppr.hs:(6,1)-(9,24) })
-                       (AnnListItem
-                        [])
-                       (EpaComments
-                        [])) { Test20297.ppr.hs:(6,1)-(9,24) })
+          (EpAnn
+           (EpaSpan { Test20297.ppr.hs:(6,1)-(9,24) })
+           (AnnListItem
+            [])
+           (EpaComments
+            []))
           (Match
            (EpAnn
             (EpaSpan { Test20297.ppr.hs:(6,1)-(9,24) })
@@ -625,12 +617,12 @@
              []))
            (FunRhs
             (L
-             (SrcSpanAnn (EpAnn
-                          (EpaSpan { Test20297.ppr.hs:6:1-3 })
-                          (NameAnnTrailing
-                           [])
-                          (EpaComments
-                           [])) { Test20297.ppr.hs:6:1-3 })
+             (EpAnn
+              (EpaSpan { Test20297.ppr.hs:6:1-3 })
+              (NameAnnTrailing
+               [])
+              (EpaComments
+               []))
              (Unqual
               {OccName: foo}))
             (Prefix)
@@ -640,13 +632,11 @@
             (EpaComments
              [])
             [(L
-              (SrcSpanAnn
-               (EpAnn
-                (EpaSpan { Test20297.ppr.hs:7:3-5 })
-                (NoEpAnns)
-                (EpaComments
-                 []))
-               { Test20297.ppr.hs:7:3-5 })
+              (EpAnn
+               (EpaSpan { Test20297.ppr.hs:7:3-5 })
+               (NoEpAnns)
+               (EpaComments
+                []))
               (GRHS
                (EpAnn
                 (EpaSpan { Test20297.ppr.hs:7:3-5 })
@@ -657,21 +647,21 @@
                  []))
                []
                (L
-                (SrcSpanAnn (EpAnn
-                             (EpaSpan { Test20297.ppr.hs:7:5 })
-                             (AnnListItem
-                              [])
-                             (EpaComments
-                              [])) { Test20297.ppr.hs:7:5 })
+                (EpAnn
+                 (EpaSpan { Test20297.ppr.hs:7:5 })
+                 (AnnListItem
+                  [])
+                 (EpaComments
+                  []))
                 (HsVar
                  (NoExtField)
                  (L
-                  (SrcSpanAnn (EpAnn
-                               (EpaSpan { Test20297.ppr.hs:7:5 })
-                               (NameAnnTrailing
-                                [])
-                               (EpaComments
-                                [])) { Test20297.ppr.hs:7:5 })
+                  (EpAnn
+                   (EpaSpan { Test20297.ppr.hs:7:5 })
+                   (NameAnnTrailing
+                    [])
+                   (EpaComments
+                    []))
                   (Unqual
                    {OccName: x}))))))]
             (HsValBinds
@@ -690,43 +680,43 @@
               (NoAnnSortKey)
               {Bag(LocatedA (HsBind GhcPs)):
                [(L
-                 (SrcSpanAnn (EpAnn
-                              (EpaSpan { Test20297.ppr.hs:9:7-24 })
-                              (AnnListItem
-                               [])
-                              (EpaComments
-                               [])) { Test20297.ppr.hs:9:7-24 })
+                 (EpAnn
+                  (EpaSpan { Test20297.ppr.hs:9:7-24 })
+                  (AnnListItem
+                   [])
+                  (EpaComments
+                   []))
                  (FunBind
                   (NoExtField)
                   (L
-                   (SrcSpanAnn (EpAnn
-                                (EpaSpan { Test20297.ppr.hs:9:7-13 })
-                                (NameAnnTrailing
-                                 [])
-                                (EpaComments
-                                 [])) { Test20297.ppr.hs:9:7-13 })
+                   (EpAnn
+                    (EpaSpan { Test20297.ppr.hs:9:7-13 })
+                    (NameAnnTrailing
+                     [])
+                    (EpaComments
+                     []))
                    (Unqual
                     {OccName: doStuff}))
                   (MG
                    (FromSource)
                    (L
-                    (SrcSpanAnn (EpAnn
-                                 (EpaSpan { Test20297.ppr.hs:9:7-24 })
-                                 (AnnList
-                                  (Nothing)
-                                  (Nothing)
-                                  (Nothing)
-                                  []
-                                  [])
-                                 (EpaComments
-                                  [])) { Test20297.ppr.hs:9:7-24 })
+                    (EpAnn
+                     (EpaSpan { Test20297.ppr.hs:9:7-24 })
+                     (AnnList
+                      (Nothing)
+                      (Nothing)
+                      (Nothing)
+                      []
+                      [])
+                     (EpaComments
+                      []))
                     [(L
-                      (SrcSpanAnn (EpAnn
-                                   (EpaSpan { Test20297.ppr.hs:9:7-24 })
-                                   (AnnListItem
-                                    [])
-                                   (EpaComments
-                                    [])) { Test20297.ppr.hs:9:7-24 })
+                      (EpAnn
+                       (EpaSpan { Test20297.ppr.hs:9:7-24 })
+                       (AnnListItem
+                        [])
+                       (EpaComments
+                        []))
                       (Match
                        (EpAnn
                         (EpaSpan { Test20297.ppr.hs:9:7-24 })
@@ -735,12 +725,12 @@
                          []))
                        (FunRhs
                         (L
-                         (SrcSpanAnn (EpAnn
-                                      (EpaSpan { Test20297.ppr.hs:9:7-13 })
-                                      (NameAnnTrailing
-                                       [])
-                                      (EpaComments
-                                       [])) { Test20297.ppr.hs:9:7-13 })
+                         (EpAnn
+                          (EpaSpan { Test20297.ppr.hs:9:7-13 })
+                          (NameAnnTrailing
+                           [])
+                          (EpaComments
+                           []))
                          (Unqual
                           {OccName: doStuff}))
                         (Prefix)
@@ -750,13 +740,11 @@
                         (EpaComments
                          [])
                         [(L
-                          (SrcSpanAnn
-                           (EpAnn
-                            (EpaSpan { Test20297.ppr.hs:9:15-24 })
-                            (NoEpAnns)
-                            (EpaComments
-                             []))
-                           { Test20297.ppr.hs:9:15-24 })
+                          (EpAnn
+                           (EpaSpan { Test20297.ppr.hs:9:15-24 })
+                           (NoEpAnns)
+                           (EpaComments
+                            []))
                           (GRHS
                            (EpAnn
                             (EpaSpan { Test20297.ppr.hs:9:15-24 })
@@ -767,12 +755,12 @@
                              []))
                            []
                            (L
-                            (SrcSpanAnn (EpAnn
-                                         (EpaSpan { Test20297.ppr.hs:9:17-24 })
-                                         (AnnListItem
-                                          [])
-                                         (EpaComments
-                                          [])) { Test20297.ppr.hs:9:17-24 })
+                            (EpAnn
+                             (EpaSpan { Test20297.ppr.hs:9:17-24 })
+                             (AnnListItem
+                              [])
+                             (EpaComments
+                              []))
                             (HsDo
                              (EpAnn
                               (EpaSpan { Test20297.ppr.hs:9:17-24 })
@@ -788,42 +776,42 @@
                              (DoExpr
                               (Nothing))
                              (L
-                              (SrcSpanAnn (EpAnn
-                                           (EpaSpan { Test20297.ppr.hs:9:20-24 })
-                                           (AnnList
-                                            (Just
-                                             (EpaSpan { Test20297.ppr.hs:9:20-24 }))
-                                            (Nothing)
-                                            (Nothing)
-                                            []
-                                            [])
-                                           (EpaComments
-                                            [])) { Test20297.ppr.hs:9:20-24 })
+                              (EpAnn
+                               (EpaSpan { Test20297.ppr.hs:9:20-24 })
+                               (AnnList
+                                (Just
+                                 (EpaSpan { Test20297.ppr.hs:9:20-24 }))
+                                (Nothing)
+                                (Nothing)
+                                []
+                                [])
+                               (EpaComments
+                                []))
                               [(L
-                                (SrcSpanAnn (EpAnn
-                                             (EpaSpan { Test20297.ppr.hs:9:20-24 })
-                                             (AnnListItem
-                                              [])
-                                             (EpaComments
-                                              [])) { Test20297.ppr.hs:9:20-24 })
+                                (EpAnn
+                                 (EpaSpan { Test20297.ppr.hs:9:20-24 })
+                                 (AnnListItem
+                                  [])
+                                 (EpaComments
+                                  []))
                                 (BodyStmt
                                  (NoExtField)
                                  (L
-                                  (SrcSpanAnn (EpAnn
-                                               (EpaSpan { Test20297.ppr.hs:9:20-24 })
-                                               (AnnListItem
-                                                [])
-                                               (EpaComments
-                                                [])) { Test20297.ppr.hs:9:20-24 })
+                                  (EpAnn
+                                   (EpaSpan { Test20297.ppr.hs:9:20-24 })
+                                   (AnnListItem
+                                    [])
+                                   (EpaComments
+                                    []))
                                   (HsVar
                                    (NoExtField)
                                    (L
-                                    (SrcSpanAnn (EpAnn
-                                                 (EpaSpan { Test20297.ppr.hs:9:20-24 })
-                                                 (NameAnnTrailing
-                                                  [])
-                                                 (EpaComments
-                                                  [])) { Test20297.ppr.hs:9:20-24 })
+                                    (EpAnn
+                                     (EpaSpan { Test20297.ppr.hs:9:20-24 })
+                                     (NameAnnTrailing
+                                      [])
+                                     (EpaComments
+                                      []))
                                     (Unqual
                                      {OccName: stuff}))))
                                  (NoExtField)
diff --git a/testsuite/tests/typecheck/should_compile/T15242.stderr b/testsuite/tests/typecheck/should_compile/T15242.stderr
index 655ff7aa1b10..19a715c27a4d 100644
--- a/testsuite/tests/typecheck/should_compile/T15242.stderr
+++ b/testsuite/tests/typecheck/should_compile/T15242.stderr
@@ -1,34 +1,102 @@
-[])) { T15242.hs:6:5-41 })
-(HsPar
-[])) { T15242.hs:6:6-40 })
-(HsPar
-[])) { T15242.hs:6:7-39 })
-(HsPar
-[])) { T15242.hs:6:8-35 })
-(HsPar
-[])) { T15242.hs:6:9-34 })
-(HsPar
-[])) { T15242.hs:6:10-33 })
-(HsPar
-[])) { T15242.hs:6:11-29 })
-(HsPar
-[])) { T15242.hs:6:12-25 })
-(HsPar
-[])) { T15242.hs:6:13-21 })
-(HsPar
-[])) { T15242.hs:6:14-20 })
-(HsPar
-[])) { T15242.hs:5:5-17 })
-(HsPar
-[])) { T15242.hs:5:6-16 })
-(HsPar
-[])))
-(HsPar
-[])) { T15242.hs:5:19-37 })
-(HsPar
-[])) { T15242.hs:5:20-32 })
-(HsPar
-[])) { T15242.hs:5:21-31 })
-(HsPar
-[])))
+(EpaSpan { T15242.hs:6:5-41 })
+
+
+
+
+(HsPar
+(EpaSpan { T15242.hs:6:6-40 })
+
+
+
+
+(HsPar
+(EpaSpan { T15242.hs:6:7-39 })
+
+
+
+
+(HsPar
+(EpaSpan { T15242.hs:6:8-35 })
+
+
+
+
+(HsPar
+(EpaSpan { T15242.hs:6:9-34 })
+
+
+
+
+(HsPar
+(EpaSpan { T15242.hs:6:10-33 })
+
+
+
+
+(HsPar
+(EpaSpan { T15242.hs:6:11-29 })
+
+
+
+
+(HsPar
+(EpaSpan { T15242.hs:6:12-25 })
+
+
+
+
+(HsPar
+(EpaSpan { T15242.hs:6:13-21 })
+
+
+
+
+(HsPar
+(EpaSpan { T15242.hs:6:14-20 })
+
+
+
+
+(HsPar
+(EpaSpan { T15242.hs:5:5-17 })
+
+
+
+
+(HsPar
+(EpaSpan { T15242.hs:5:6-16 })
+
+
+
+
+(HsPar
+[]))
+
+
+
+
+(HsPar
+(EpaSpan { T15242.hs:5:19-37 })
+
+
+
+
+(HsPar
+(EpaSpan { T15242.hs:5:20-32 })
+
+
+
+
+(HsPar
+(EpaSpan { T15242.hs:5:21-31 })
+
+
+
+
+(HsPar
+[]))
+
+
+
+
 (HsPar
diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index 815285482615..135c22c61966 100644
--- a/testsuite/tests/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
@@ -641,12 +641,18 @@ def onlyHsParLocs(x):
     We only want to check that all the parentheses are present with the correct location,
     not compare the entire typechecked AST.
     Located (HsPar GhcTc) are pretty printed with the form
-    ({ <location info>
+      (EpaSpan { T15242.hs:6:5-41 })
+      (AnnListItem
+       [])
+      (EpaComments
+       []))
      (HsPar
     This function tries to extract all such location infos from the typechecked AST.
+    Note: It is applied to the expected result too, so it also needs the "(HsPar" and
+    appropriate spacing.
     """
     ls = x.split("\n")
-    filteredLines = (loc.strip() for (loc,hspar) in zip(ls,ls[1:])
+    filteredLines = (loc.strip() for (loc,hspar) in zip(ls,ls[5:])
                       if hspar.strip().startswith("(HsPar")
                         and not "<no location info>" in loc)
     return '\n'.join(filteredLines)
diff --git a/utils/check-exact/ExactPrint.hs b/utils/check-exact/ExactPrint.hs
index 26dbfa8286dd..a647f2c5266e 100644
--- a/utils/check-exact/ExactPrint.hs
+++ b/utils/check-exact/ExactPrint.hs
@@ -225,8 +225,7 @@ setAnchorHsModule hsmod anc cs = hsmod { hsmodExt = (hsmodExt hsmod) {hsmodAnn =
 
 setAnchorAn :: (HasTrailing an, NoAnn an)
              => LocatedAn an a -> Anchor -> [TrailingAnn] -> EpAnnComments -> LocatedAn an a
-setAnchorAn (L (SrcSpanAnn (EpAnn _ an _) l) a) anc ts cs
-  = (L (SrcSpanAnn (EpAnn anc (setTrailing an ts) cs) l) a)
+setAnchorAn (L (EpAnn _ an _) a) anc ts cs = (L (EpAnn anc (setTrailing an ts) cs) a)
      -- `debug` ("setAnchorAn: anc=" ++ showAst anc)
 
 setAnchorEpaL :: EpAnn AnnList -> Anchor -> [TrailingAnn] -> EpAnnComments -> EpAnn AnnList
@@ -261,9 +260,6 @@ data CaptureComments = CaptureComments
 mkEntry :: Anchor -> [TrailingAnn] -> EpAnnComments -> Entry
 mkEntry anc ts cs = Entry anc ts cs NoFlushComments CanUpdateAnchor
 
-instance (HasTrailing an) => HasEntry (SrcSpanAnn' (EpAnn an)) where
-  fromAnn (SrcSpanAnn an _) = fromAnn an
-
 instance (HasTrailing a) => HasEntry (EpAnn a) where
   fromAnn (EpAnn anc a cs) = mkEntry anc (trailing a) cs
 
@@ -414,7 +410,7 @@ enterAnn (Entry anchor' trailing_anns cs flush canUpdateAnchor) a = do
     _            -> return ()
   p <- getPosP
   pe0 <- getPriorEndD
-  debugM $ "enterAnn:starting:(p,pe,anchor',a) =" ++ show (p, pe0, showAst anchor', astId a)
+  debugM $ "enterAnn:starting:(anchor',p,pe,a) =" ++ show (showAst anchor', p, pe0, astId a)
   prevAnchor <- getAnchorU
   let curAnchor = case anchor' of
         EpaSpan (RealSrcSpan r _) -> r
@@ -438,7 +434,7 @@ enterAnn (Entry anchor' trailing_anns cs flush canUpdateAnchor) a = do
   -- -------------------------
   case anchor' of
     EpaDelta dp _ -> do
-      debugM $ "enterAnn: MovedAnchor:" ++ show dp
+      debugM $ "enterAnn: EpaDelta:" ++ show dp
       -- Set the original anchor as prior end, so the rest of this AST
       -- fragment has a reference
       setPriorEndNoLayoutD (ss2pos curAnchor)
@@ -482,7 +478,6 @@ enterAnn (Entry anchor' trailing_anns cs flush canUpdateAnchor) a = do
         EpaDelta dp _ -> dp
         _ -> edp'
   -- ---------------------------------------------
-  -- let edp = edp''
   med <- getExtraDP
   setExtraDP Nothing
   let edp = case med of
@@ -495,6 +490,7 @@ enterAnn (Entry anchor' trailing_anns cs flush canUpdateAnchor) a = do
             dp = adjustDeltaForOffset
                    off (ss2delta priorEndAfterComments r)
         Just (EpaSpan (UnhelpfulSpan r)) -> panic $ "enterAnn: UnhelpfulSpan:" ++ show r
+  when (isJust med) $ debugM $ "enterAnn:(med,edp)=" ++ showAst (med,edp)
   -- ---------------------------------------------
   -- Preparation complete, perform the action
   when (priorEndAfterComments < spanStart) (do
@@ -512,7 +508,9 @@ enterAnn (Entry anchor' trailing_anns cs flush canUpdateAnchor) a = do
   -- start of print phase processing
 
   advance edp
+  debugM $ "enterAnn:exact a starting:" ++ show (showAst anchor')
   a' <- exact a
+  debugM $ "enterAnn:exact a done:" ++ show (showAst anchor')
   when (flush == FlushComments) $ do
     debugM $ "flushing comments in enterAnn:" ++ showAst cs
     flushComments (getFollowingComments cs)
@@ -535,7 +533,7 @@ enterAnn (Entry anchor' trailing_anns cs flush canUpdateAnchor) a = do
 
   p1 <- getPosP
   pe1 <- getPriorEndD
-  debugM $ "enterAnn:done:(p,pe,anchor,a) =" ++ show (p1, pe1, showAst anchor', astId a')
+  debugM $ "enterAnn:done:(anchor,p,pe,a) =" ++ show (showAst anchor', p1, pe1, astId a')
 
   case anchor' of
     EpaDelta _ _ -> return ()
@@ -718,7 +716,7 @@ printStringAtAAL (EpAnn anc an cs) l str = do
 printStringAtAAC :: (Monad m, Monoid w)
   => CaptureComments -> EpaLocation -> String -> EP w m EpaLocation
 printStringAtAAC capture (EpaSpan (RealSrcSpan r _)) s = printStringAtRsC capture r s
-printStringAtAAC capture (EpaSpan (UnhelpfulSpan _)) s = printStringAtAAC capture (EpaDelta (SameLine 0) []) s
+printStringAtAAC _capture (EpaSpan ss@(UnhelpfulSpan _)) _s = error $ "printStringAtAAC:ss=" ++ show ss
 printStringAtAAC capture (EpaDelta d cs) s = do
   mapM_ printOneComment $ concatMap tokComment cs
   pe1 <- getPriorEndD
@@ -1498,8 +1496,7 @@ instance (ExactPrint a) => ExactPrint (LocatedA a) where
   exact (L la a) = do
     debugM $ "LocatedA a:la loc=" ++ show (ss2range $ locA la)
     a' <- markAnnotated a
-    let ann' = ann la
-    return (L (la { ann = ann'}) a')
+    return (L la a')
 
 instance (ExactPrint a) => ExactPrint (LocatedAn NoEpAnns a) where
   getAnnotationEntry = entryFromLocatedA
@@ -1603,22 +1600,22 @@ instance ExactPrint (LocatedP (WarningTxt GhcPs)) where
   getAnnotationEntry = entryFromLocatedA
   setAnnotationAnchor = setAnchorAn
 
-  exact (L (SrcSpanAnn an l) (WarningTxt mb_cat src ws)) = do
+  exact (L an (WarningTxt mb_cat src ws)) = do
     an0 <- markAnnOpenP an src "{-# WARNING"
     mb_cat' <- markAnnotated mb_cat
     an1 <- markEpAnnL an0 lapr_rest AnnOpenS
     ws' <- markAnnotated ws
     an2 <- markEpAnnL an1 lapr_rest AnnCloseS
     an3 <- markAnnCloseP an2
-    return (L (SrcSpanAnn an3 l) (WarningTxt mb_cat' src ws'))
+    return (L an3 (WarningTxt mb_cat' src ws'))
 
-  exact (L (SrcSpanAnn an l) (DeprecatedTxt src ws)) = do
+  exact (L an (DeprecatedTxt src ws)) = do
     an0 <- markAnnOpenP an src "{-# DEPRECATED"
     an1 <- markEpAnnL an0 lapr_rest AnnOpenS
     ws' <- markAnnotated ws
     an2 <- markEpAnnL an1 lapr_rest AnnCloseS
     an3 <- markAnnCloseP an2
-    return (L (SrcSpanAnn an3 l) (DeprecatedTxt src ws'))
+    return (L an3 (DeprecatedTxt src ws'))
 
 instance ExactPrint InWarningCategory where
   getAnnotationEntry _ = NoEntryVal
@@ -2283,35 +2280,35 @@ instance ExactPrint (LocatedP OverlapMode) where
   setAnnotationAnchor = setAnchorAn
 
   -- NOTE: NoOverlap is only used in the typechecker
-  exact (L (SrcSpanAnn an l) (NoOverlap src)) = do
+  exact (L an (NoOverlap src)) = do
     an0 <- markAnnOpenP an src "{-# NO_OVERLAP"
     an1 <- markAnnCloseP an0
-    return (L (SrcSpanAnn an1 l) (NoOverlap src))
+    return (L an1 (NoOverlap src))
 
-  exact (L (SrcSpanAnn an l) (Overlappable src)) = do
+  exact (L an (Overlappable src)) = do
     an0 <- markAnnOpenP an src "{-# OVERLAPPABLE"
     an1 <- markAnnCloseP an0
-    return (L (SrcSpanAnn an1 l) (Overlappable src))
+    return (L an1 (Overlappable src))
 
-  exact (L (SrcSpanAnn an l) (Overlapping src)) = do
+  exact (L an (Overlapping src)) = do
     an0 <- markAnnOpenP an src "{-# OVERLAPPING"
     an1 <- markAnnCloseP an0
-    return (L (SrcSpanAnn an1 l) (Overlapping src))
+    return (L an1 (Overlapping src))
 
-  exact (L (SrcSpanAnn an l) (Overlaps src)) = do
+  exact (L an (Overlaps src)) = do
     an0 <- markAnnOpenP an src "{-# OVERLAPS"
     an1 <- markAnnCloseP an0
-    return (L (SrcSpanAnn an1 l) (Overlaps src))
+    return (L an1 (Overlaps src))
 
-  exact (L (SrcSpanAnn an l) (Incoherent src)) = do
+  exact (L an (Incoherent src)) = do
     an0 <- markAnnOpenP an src "{-# INCOHERENT"
     an1 <- markAnnCloseP an0
-    return (L (SrcSpanAnn an1 l) (Incoherent src))
+    return (L an1 (Incoherent src))
 
-  exact (L (SrcSpanAnn an l) (NonCanonical src)) = do
+  exact (L an (NonCanonical src)) = do
     an0 <- markAnnOpenP an src "{-# INCOHERENT"
     an1 <- markAnnCloseP an0
-    return (L (SrcSpanAnn an1 l) (Incoherent src))
+    return (L an1 (Incoherent src))
 
 -- ---------------------------------------------------------------------
 
@@ -3287,9 +3284,7 @@ instance ExactPrint (MatchGroup GhcPs (LocatedA (HsExpr GhcPs))) where
   setAnnotationAnchor a _ _ _ = a
   exact (MG x matches) = do
     -- TODO:AZ use SortKey, in MG ann.
-    matches' <- if isGoodSrcSpan (getLocA matches)
-      then markAnnotated matches
-      else return matches
+    matches' <- markAnnotated matches
     return (MG x matches')
 
 instance ExactPrint (MatchGroup GhcPs (LocatedA (HsCmd GhcPs))) where
@@ -4251,11 +4246,11 @@ instance (ExactPrint a) => ExactPrint (LocatedC a) where
   getAnnotationEntry (L sann _) = fromAnn sann
   setAnnotationAnchor = setAnchorAn
 
-  exact (L (SrcSpanAnn (EpAnn anc (AnnContext ma opens closes) cs) l) a) = do
+  exact (L (EpAnn anc (AnnContext ma opens closes) cs) a) = do
     opens' <- mapM (markKwA AnnOpenP) opens
     a' <- markAnnotated a
     closes' <- mapM (markKwA AnnCloseP) closes
-    return (L (SrcSpanAnn (EpAnn anc (AnnContext ma opens' closes') cs) l) a')
+    return (L (EpAnn anc (AnnContext ma opens' closes') cs) a')
 
 -- ---------------------------------------------------------------------
 
@@ -4287,7 +4282,7 @@ instance ExactPrint (LocatedN RdrName) where
   getAnnotationEntry (L sann _) = fromAnn sann
   setAnnotationAnchor = setAnchorAn
 
-  exact (L (SrcSpanAnn (EpAnn anc ann cs) ll) n) = do
+  exact (L (EpAnn anc ann cs) n) = do
     ann' <-
       case ann of
         NameAnn a o l c t -> do
@@ -4335,7 +4330,7 @@ instance ExactPrint (LocatedN RdrName) where
         NameAnnTrailing t -> do
           _anc' <- printUnicode anc n
           return (NameAnnTrailing t)
-    return (L (SrcSpanAnn (EpAnn anc ann' cs) ll) n)
+    return (L (EpAnn anc ann' cs) n)
 
 locFromAdd :: AddEpAnn -> EpaLocation
 locFromAdd (AddEpAnn _ loc) = loc
@@ -4563,8 +4558,7 @@ instance ExactPrint (LocatedP CType) where
   getAnnotationEntry = entryFromLocatedA
   setAnnotationAnchor = setAnchorAn
 
-  exact (L (SrcSpanAnn an ll)
-         (CType stp mh (stct,ct))) = do
+  exact (L an (CType stp mh (stct,ct))) = do
     an0 <- markAnnOpenP an stp "{-# CTYPE"
     an1 <- case mh of
              Nothing -> return an0
@@ -4572,8 +4566,7 @@ instance ExactPrint (LocatedP CType) where
                markEpAnnLMS an0 lapr_rest AnnHeader (Just (toSourceTextWithSuffix srcH "" ""))
     an2 <- markEpAnnLMS an1 lapr_rest AnnVal (Just (toSourceTextWithSuffix stct (unpackFS ct) ""))
     an3 <- markAnnCloseP an2
-    return (L (SrcSpanAnn an3 ll)
-         (CType stp mh (stct,ct)))
+    return (L an3 (CType stp mh (stct,ct)))
 
 -- ---------------------------------------------------------------------
 
@@ -4602,20 +4595,19 @@ instance ExactPrint (LocatedL [LocatedA (IE GhcPs)]) where
   getAnnotationEntry = entryFromLocatedA
   setAnnotationAnchor = setAnchorAn
 
-  exact (L (SrcSpanAnn an l) ies) = do
+  exact (L an ies) = do
     debugM $ "LocatedL [LIE"
     an0 <- markEpAnnL an lal_rest AnnHiding
     p <- getPosP
     debugM $ "LocatedL [LIE:p=" ++ showPprUnsafe p
     (an1, ies') <- markAnnList an0 (markAnnotated ies)
-    return (L (SrcSpanAnn an1 l) ies')
+    return (L an1 ies')
 
 instance (ExactPrint (Match GhcPs (LocatedA body)))
    => ExactPrint (LocatedL [LocatedA (Match GhcPs (LocatedA body))]) where
   getAnnotationEntry = entryFromLocatedA
   setAnnotationAnchor = setAnchorAn
-  exact (L la a) = do
-    let an = ann la
+  exact (L an a) = do
     debugM $ "LocatedL [LMatch"
     -- TODO: markAnnList?
     an0 <- markEpAnnAllL an lal_rest AnnWhere
@@ -4623,12 +4615,12 @@ instance (ExactPrint (Match GhcPs (LocatedA body)))
     an2 <- markEpAnnAllL an1 lal_rest AnnSemi
     a' <- markAnnotated a
     an3 <- markLensMAA an2 lal_close
-    return (L (la { ann = an3}) a')
+    return (L an3 a')
 
 instance ExactPrint (LocatedL [LocatedA (StmtLR GhcPs GhcPs (LocatedA (HsExpr GhcPs)))]) where
   getAnnotationEntry = entryFromLocatedA
   setAnnotationAnchor = setAnchorAn
-  exact (L (SrcSpanAnn an l) stmts) = do
+  exact (L an stmts) = do
     debugM $ "LocatedL [ExprLStmt"
     (an'', stmts') <- markAnnList an $ do
       case snocView stmts of
@@ -4639,33 +4631,33 @@ instance ExactPrint (LocatedL [LocatedA (StmtLR GhcPs GhcPs (LocatedA (HsExpr Gh
           return (initStmts' ++ [ls'])
         _ -> do
           markAnnotated stmts
-    return (L (SrcSpanAnn an'' l) stmts')
+    return (L an'' stmts')
 
 instance ExactPrint (LocatedL [LocatedA (StmtLR GhcPs GhcPs (LocatedA (HsCmd GhcPs)))]) where
   getAnnotationEntry = entryFromLocatedA
   setAnnotationAnchor = setAnchorAn
-  exact (L (SrcSpanAnn ann l) es) = do
+  exact (L ann es) = do
     debugM $ "LocatedL [CmdLStmt"
     an0 <- markLensMAA ann lal_open
     es' <- mapM markAnnotated es
     an1 <- markLensMAA an0 lal_close
-    return (L (SrcSpanAnn an1 l) es')
+    return (L an1 es')
 
 instance ExactPrint (LocatedL [LocatedA (ConDeclField GhcPs)]) where
   getAnnotationEntry = entryFromLocatedA
   setAnnotationAnchor = setAnchorAn
-  exact (L (SrcSpanAnn an l) fs) = do
+  exact (L an fs) = do
     debugM $ "LocatedL [LConDeclField"
     (an', fs') <- markAnnList an (markAnnotated fs)
-    return (L (SrcSpanAnn an' l) fs')
+    return (L an' fs')
 
 instance ExactPrint (LocatedL (BF.BooleanFormula (LocatedN RdrName))) where
   getAnnotationEntry = entryFromLocatedA
   setAnnotationAnchor = setAnchorAn
-  exact (L (SrcSpanAnn an l) bf) = do
+  exact (L an bf) = do
     debugM $ "LocatedL [LBooleanFormula"
     (an', bf') <- markAnnList an (markAnnotated bf)
-    return (L (SrcSpanAnn an' l) bf')
+    return (L an' bf')
 
 -- ---------------------------------------------------------------------
 -- LocatedL instances end --
diff --git a/utils/check-exact/Main.hs b/utils/check-exact/Main.hs
index 3da2aad7288f..899582c4a77c 100644
--- a/utils/check-exact/Main.hs
+++ b/utils/check-exact/Main.hs
@@ -448,8 +448,8 @@ changeLetIn1 _libdir parsed
          let (HsValBinds x (ValBinds xv bagDecls sigs)) = localDecls
              [l2,_l1] = map wrapDecl $ bagToList bagDecls
              bagDecls' = listToBag $ concatMap decl2Bind [l2]
-             (L (SrcSpanAnn _ le) e) = expr
-             a = (SrcSpanAnn (EpAnn (EpaDelta (SameLine 1) []) noAnn emptyComments) le)
+             (L _ e) = expr
+             a = EpAnn (EpaDelta (SameLine 1) []) noAnn emptyComments
              expr' = L a e
              tkIn' = L (TokenLoc (EpaDelta (DifferentLine 1 0) [])) HsTok
          in (HsLet an tkLet
@@ -895,22 +895,19 @@ rmTypeSig2 _libdir lp = do
 addHiding1 :: Changer
 addHiding1 _libdir (L l p) = do
   let doTransform = do
-        l0 <- uniqueSrcSpanT
-        l1 <- uniqueSrcSpanT
-        l2 <- uniqueSrcSpanT
         let
           [L li imp1,imp2] = hsmodImports p
-          n1 = L (noAnnSrcSpanDP0 l1) (mkVarUnqual (mkFastString "n1"))
-          n2 = L (noAnnSrcSpanDP0 l2) (mkVarUnqual (mkFastString "n2"))
-          v1 = L (addComma $ noAnnSrcSpanDP0 l1) (IEVar Nothing (L (noAnnSrcSpanDP0 l1) (IEName noExtField n1)))
-          v2 = L (           noAnnSrcSpanDP0 l2) (IEVar Nothing (L (noAnnSrcSpanDP0 l2) (IEName noExtField n2)))
-          impHiding = L (SrcSpanAnn (EpAnn d0
-                                     (AnnList Nothing
-                                              (Just (AddEpAnn AnnOpenP  d1))
-                                              (Just (AddEpAnn AnnCloseP d0))
-                                              [(AddEpAnn AnnHiding d1)]
-                                              [])
-                                       emptyComments) l0) [v1,v2]
+          n1 = L noAnnSrcSpanDP0 (mkVarUnqual (mkFastString "n1"))
+          n2 = L noAnnSrcSpanDP0 (mkVarUnqual (mkFastString "n2"))
+          v1 = L (addComma $ noAnnSrcSpanDP0) (IEVar Nothing (L noAnnSrcSpanDP0 (IEName noExtField n1)))
+          v2 = L (           noAnnSrcSpanDP0) (IEVar Nothing (L noAnnSrcSpanDP0 (IEName noExtField n2)))
+          impHiding = L (EpAnn d0
+                               (AnnList Nothing
+                                        (Just (AddEpAnn AnnOpenP  d1))
+                                        (Just (AddEpAnn AnnCloseP d0))
+                                        [(AddEpAnn AnnHiding d1)]
+                                        [])
+                                 emptyComments) [v1,v2]
           imp1' = imp1 { ideclImportList = Just (EverythingBut,impHiding)}
           imp2' = setEntryDP imp2 (DifferentLine 2 0)
           p' = p { hsmodImports = [L li imp1',imp2']}
@@ -926,22 +923,20 @@ addHiding2 :: Changer
 addHiding2 _libdir top = do
   let doTransform = do
         let (L l p) = top
-        l1 <- uniqueSrcSpanT
-        l2 <- uniqueSrcSpanT
         let
           [L li imp1] = hsmodImports p
-          Just (_,L lh ns) = ideclImportList imp1
-          lh' = (SrcSpanAnn (EpAnn d0
-                                     (AnnList Nothing
-                                              (Just (AddEpAnn AnnOpenP  d1))
-                                              (Just (AddEpAnn AnnCloseP d0))
-                                              [(AddEpAnn AnnHiding d1)]
-                                              [])
-                                       emptyComments) (locA lh))
-          n1 = L (noAnnSrcSpanDP0 l1) (mkVarUnqual (mkFastString "n1"))
-          n2 = L (noAnnSrcSpanDP0 l2) (mkVarUnqual (mkFastString "n2"))
-          v1 = L (addComma $ noAnnSrcSpanDP0 l1) (IEVar Nothing (L (noAnnSrcSpanDP0 l1) (IEName noExtField n1)))
-          v2 = L (           noAnnSrcSpanDP0 l2) (IEVar Nothing (L (noAnnSrcSpanDP0 l2) (IEName noExtField n2)))
+          Just (_,L _lh ns) = ideclImportList imp1
+          lh' = (EpAnn d0
+                       (AnnList Nothing
+                                (Just (AddEpAnn AnnOpenP  d1))
+                                (Just (AddEpAnn AnnCloseP d0))
+                                [(AddEpAnn AnnHiding d1)]
+                                [])
+                         emptyComments)
+          n1 = L (noAnnSrcSpanDP0) (mkVarUnqual (mkFastString "n1"))
+          n2 = L (noAnnSrcSpanDP0) (mkVarUnqual (mkFastString "n2"))
+          v1 = L (addComma $ noAnnSrcSpanDP0) (IEVar Nothing (L noAnnSrcSpanDP0 (IEName noExtField n1)))
+          v2 = L (           noAnnSrcSpanDP0) (IEVar Nothing (L noAnnSrcSpanDP0 (IEName noExtField n2)))
           L ln n = last ns
           n' = L (addComma ln) n
           imp1' = imp1 { ideclImportList = Just (EverythingBut, L lh' (init ns ++ [n',v1,v2]))}
diff --git a/utils/check-exact/Transform.hs b/utils/check-exact/Transform.hs
index 1178195b8e68..ffe0f7c0b882 100644
--- a/utils/check-exact/Transform.hs
+++ b/utils/check-exact/Transform.hs
@@ -217,7 +217,7 @@ captureTypeSigSpacing (L l (SigD x (TypeSig (EpAnn anc (AnnSig dc rs') cs) ns (H
     -- AnnDColon, and to the start of the ty
     AddEpAnn kw dca = dc
     rd = case last ns of
-      L (SrcSpanAnn (EpAnn anc' _ _) _) _ -> anchor anc' -- TODO MovedAnchor?
+      L (EpAnn anc' _ _) _ -> anchor anc' -- TODO MovedAnchor?
     dc' = case dca of
       EpaSpan (RealSrcSpan r _) -> AddEpAnn kw (EpaDelta (ss2delta (ss2posEnd rd) r) [])
       _                         -> AddEpAnn kw dca
@@ -226,14 +226,14 @@ captureTypeSigSpacing (L l (SigD x (TypeSig (EpAnn anc (AnnSig dc rs') cs) ns (H
 
     ty' :: LHsSigType GhcPs
     ty' = case ty of
-      (L (SrcSpanAnn (EpAnn anc0 a c) ll) b)
+      (L (EpAnn anc0 a c) b)
         -> let
               anc' = case anc0 of
                 EpaDelta _ _ -> anc0
                 _ -> case dca of
                   EpaSpan _ -> EpaDelta (SameLine 1) []
                   EpaDelta _ cs0 -> EpaDelta (SameLine 1) cs0
-           in (L (SrcSpanAnn (EpAnn anc' a c) ll) b)
+           in (L (EpAnn anc' a c) b)
 
 captureTypeSigSpacing s = s
 
@@ -255,18 +255,12 @@ setEntryDPDecl d dp = setEntryDP d dp
 -- |Set the true entry 'DeltaPos' from the annotation for a given AST
 -- element. This is the 'DeltaPos' ignoring any comments.
 setEntryDP :: NoAnn t => LocatedAn t a -> DeltaPos -> LocatedAn t a
-setEntryDP (L (SrcSpanAnn (EpAnn (EpaSpan (UnhelpfulSpan _)) an cs) l) a) dp
-  = L (SrcSpanAnn
-           (EpAnn (EpaDelta dp []) an cs)
-           l) a
-setEntryDP (L (SrcSpanAnn (EpAnn (EpaSpan (RealSrcSpan _ _)) an (EpaComments [])) l) a) dp
-  = L (SrcSpanAnn
-           (EpAnn (EpaDelta dp []) an (EpaComments []))
-           l) a
-setEntryDP (L (SrcSpanAnn (EpAnn (EpaDelta d csd) an cs) l) a) dp
-  = L (SrcSpanAnn
-           (EpAnn (EpaDelta d' csd') an cs')
-           l) a
+setEntryDP (L (EpAnn (EpaSpan (UnhelpfulSpan _)) an cs) a) dp
+  = L (EpAnn (EpaDelta dp []) an cs) a
+setEntryDP (L (EpAnn (EpaSpan _) an (EpaComments [])) a) dp
+  = L (EpAnn (EpaDelta dp []) an (EpaComments [])) a
+setEntryDP (L (EpAnn (EpaDelta d csd) an cs) a) dp
+  = L (EpAnn (EpaDelta d' csd') an cs') a
   where
     (d', csd', cs') = case cs of
       EpaComments (h:t) ->
@@ -291,16 +285,12 @@ setEntryDP (L (SrcSpanAnn (EpAnn (EpaDelta d csd) an cs) l) a) dp
                   (dp0, c':t, EpaCommentsBalanced [] ts)
     go (L (EpaDelta _ c0) c) = (d,  L (EpaDelta dp c0) c)
     go (L (EpaSpan _)   c) = (d,  L (EpaDelta dp []) c)
-setEntryDP (L (SrcSpanAnn (EpAnn (EpaSpan (RealSrcSpan r _)) an cs) l) a) dp
+setEntryDP (L (EpAnn (EpaSpan (RealSrcSpan r _)) an cs) a) dp
   = case sortEpaComments (priorComments cs) of
       [] ->
-        L (SrcSpanAnn
-               (EpAnn (EpaDelta dp []) an cs)
-               l) a
+        L (EpAnn (EpaDelta dp []) an cs) a
       (L ca c:cs') ->
-        L (SrcSpanAnn
-               (EpAnn (EpaDelta edp csd) an cs'')
-               l) a
+        L (EpAnn (EpaDelta edp csd) an cs'') a
               where
                 cs'' = setPriorComments cs []
                 csd = L (EpaDelta dp []) c:cs'
@@ -308,13 +298,7 @@ setEntryDP (L (SrcSpanAnn (EpAnn (EpaSpan (RealSrcSpan r _)) an cs) l) a) dp
                 delta = case getLoc lc of
                           EpaSpan (RealSrcSpan rr _) -> ss2delta (ss2pos rr) r
                           EpaSpan _ -> (SameLine 0)
-                          EpaDelta _ _ -> DifferentLine 1 0
-                -- cs'' = setPriorComments cs (L (EpaDelta dp []) c:cs')
-                -- lc = head $ reverse $ (L ca c:cs')
-                -- delta = case getLoc lc of
-                --           EpaSpan (RealSrcSpan rr _) -> ss2delta (ss2pos rr) r
-                --           EpaSpan _ -> (SameLine 0)
-                --           EpaDelta dp _ -> dp
+                          EpaDelta _dp _ -> DifferentLine 1 0
                 line = getDeltaLine delta
                 col = deltaColumn delta
                 edp' = if line == 0 then SameLine col
@@ -325,14 +309,14 @@ setEntryDP (L (SrcSpanAnn (EpAnn (EpaSpan (RealSrcSpan r _)) an cs) l) a) dp
 -- ---------------------------------------------------------------------
 
 getEntryDP :: LocatedAn t a -> DeltaPos
-getEntryDP (L (SrcSpanAnn (EpAnn (EpaDelta dp _) _ _) _) _) = dp
+getEntryDP (L (EpAnn (EpaDelta dp _) _ _) _) = dp
 getEntryDP _ = SameLine 1
 
 -- ---------------------------------------------------------------------
 
 addEpaLocationDelta :: LayoutStartCol -> RealSrcSpan -> EpaLocation -> EpaLocation
 addEpaLocationDelta _off _anc (EpaDelta d cs) = EpaDelta d cs
-addEpaLocationDelta _off _anc s@(EpaSpan (UnhelpfulSpan _)) = s
+addEpaLocationDelta _off _anc (EpaSpan (UnhelpfulSpan _)) = EpaDelta (SameLine 0) []
 addEpaLocationDelta  off  anc (EpaSpan (RealSrcSpan r _))
   = EpaDelta (adjustDeltaForOffset off (ss2deltaEnd anc r)) []
 
@@ -343,9 +327,9 @@ setEntryDPFromAnchor _off (EpaSpan (UnhelpfulSpan _)) (L la a) = L la a
 setEntryDPFromAnchor  off (EpaSpan (RealSrcSpan anc _)) ll@(L la _) = setEntryDP ll dp'
   where
     dp' = case la of
-      (SrcSpanAnn (EpAnn (EpaSpan (RealSrcSpan r' _)) _ _) _) -> adjustDeltaForOffset off (ss2deltaEnd anc r')
-      (SrcSpanAnn (EpAnn (EpaSpan _) _ _) _)               -> adjustDeltaForOffset off (SameLine 0)
-      (SrcSpanAnn (EpAnn (EpaDelta dp _) _ _) _) -> adjustDeltaForOffset off dp
+      (EpAnn (EpaSpan (RealSrcSpan r' _)) _ _) -> adjustDeltaForOffset off (ss2deltaEnd anc r')
+      (EpAnn (EpaSpan _) _ _)                  -> adjustDeltaForOffset off (SameLine 0)
+      (EpAnn (EpaDelta dp _) _ _)              -> adjustDeltaForOffset off dp
 
 -- ---------------------------------------------------------------------
 
@@ -353,16 +337,16 @@ setEntryDPFromAnchor  off (EpaSpan (RealSrcSpan anc _)) ll@(L la _) = setEntryDP
 -- Also transfer any comments occuring before it.
 transferEntryDP :: (Monad m, NoAnn t2, Typeable t1, Typeable t2)
   => LocatedAn t1 a -> LocatedAn t2 b -> TransformT m (LocatedAn t2 b)
-transferEntryDP (L (SrcSpanAnn (EpAnn anc1 an1 cs1) _l1) _) (L (SrcSpanAnn (EpAnn _anc2 an2 cs2) l2) b) = do
+transferEntryDP (L (EpAnn anc1 an1 cs1) _) (L (EpAnn _anc2 an2 cs2) b) = do
   logTr $ "transferEntryDP': EpAnn,EpAnn"
   -- Problem: if the original had preceding comments, blindly
   -- transferring the location is not correct
   case priorComments cs1 of
-    [] -> return (L (SrcSpanAnn (EpAnn anc1 (combine an1 an2) cs2) l2) b)
+    [] -> return (L (EpAnn anc1 (combine an1 an2) cs2) b)
     -- TODO: what happens if the receiving side already has comments?
     (L anc _:_) -> do
       logDataWithAnnsTr "transferEntryDP':priorComments anc=" anc
-      return (L (SrcSpanAnn (EpAnn anc1 (combine an1 an2) (cs1 <> cs2)) l2) b)
+      return (L (EpAnn anc1 (combine an1 an2) (cs1 <> cs2)) b)
 
 
 -- |If a and b are the same type return first arg, else return second
@@ -427,34 +411,34 @@ balanceCommentsFB (L lf (FunBind x n (MG o (L lm matches)))) second = do
   -- + move the interior ones to the first match,
   -- + move the trailing ones to the last match.
   let
-    (before,middle,after) = case s_entry lf of
+    (before,middle,after) = case entry lf of
         EpaSpan (RealSrcSpan ss _) ->
           let
-            split = splitCommentsEnd ss (s_comments lf)
+            split = splitCommentsEnd ss (comments lf)
             split2 = splitCommentsStart ss  (EpaComments (sortEpaComments $ priorComments split))
 
             before0 = sortEpaComments $ priorComments split2
             middle0 = sortEpaComments $ getFollowingComments split2
             after0  = sortEpaComments $ getFollowingComments split
           in (before0,middle0,after0)
-        _ -> (priorComments $ s_comments lf,
+        _ -> (priorComments $ comments lf,
               [],
-              getFollowingComments $ s_comments lf)
+              getFollowingComments $ comments lf)
 
-    -- lf' = setCommentsEpAnnS lf (EpaComments before)
-    lf' = setCommentsSrcAnn lf (EpaComments before)
+    lf' = setCommentsEpAnn lf (EpaComments before)
   debugM $ "balanceCommentsFB (before, after): " ++ showAst (before, after)
   debugM $ "balanceCommentsFB lf': " ++ showAst lf'
   -- let matches' = case matches of
   let matches' :: [LocatedA (Match GhcPs (LHsExpr GhcPs))]
       matches' = case matches of
                     (L lm' m':ms') ->
-                      (L (addCommentsToSrcAnn lm' (EpaComments middle )) m':ms')
+                      (L (addCommentsToEpAnn lm' (EpaComments middle )) m':ms')
                     _ -> error "balanceCommentsFB"
   matches'' <- balanceCommentsList' matches'
   let (m,ms) = case reverse matches'' of
                  (L lm' m':ms') ->
-                   (L (addCommentsToSrcAnn lm' (EpaCommentsBalanced [] after)) m',ms')
+                   (L (addCommentsToEpAnn lm' (EpaCommentsBalanced [] after)) m',ms')
+                   -- (L (addCommentsToEpAnnS lm' (EpaCommentsBalanced [] after)) m',ms')
                  _ -> error "balanceCommentsFB4"
   debugM $ "balanceCommentsFB: (m,ms):" ++ showAst (m,ms)
   (m',second') <- balanceComments' m second
@@ -479,7 +463,7 @@ balanceCommentsMatch (L l (Match am mctxt pats (GRHSs xg grhss binds))) = do
   where
     simpleBreak (r,_) = r /= 0
     an1 = l
-    anc1 = s_comments an1
+    anc1 = comments an1
     cs1f = getFollowingComments anc1
     (move',stay') = break simpleBreak (trailingCommentsDeltas (anchorFromLocatedA (L l ())) cs1f)
     move = map snd move'
@@ -490,7 +474,7 @@ balanceCommentsMatch (L l (Match am mctxt pats (GRHSs xg grhss binds))) = do
           (L lg (GRHS ag grs rhs):gs) ->
             let
               anc1' = setFollowingComments anc1 stay
-              an1' = setCommentsSrcAnn l anc1'
+              an1' = setCommentsEpAnn l anc1'
 
               -- ---------------------------------
               (moved,bindsm) = pushTrailingComments WithWhere (EpaCommentsBalanced [] move) binds
@@ -512,8 +496,8 @@ pushTrailingComments w cs lb@(HsValBinds an _)
   where
     decls = hsDeclsLocalBinds lb
     (an', decls') = case reverse decls of
-      [] -> (addCommentsToEpAnn (spanHsLocaLBinds lb) an cs, decls)
-      (L la d:ds) -> (an, L (addCommentsToSrcAnn la cs) d:ds)
+      [] -> (addCommentsToEpAnn an cs, decls)
+      (L la d:ds) -> (an, L (addCommentsToEpAnn la cs) d:ds)
     (vb,_ws2) = case runTransform (replaceDeclsValbinds w lb (reverse decls')) of
       ((HsValBinds _ vb'), _, ws2') -> (vb', ws2')
       _ -> (ValBinds NoAnnSortKey emptyBag [], [])
@@ -545,8 +529,8 @@ balanceComments' la1 la2 = do
     simpleBreak n (r,_) = r > n
     L an1 f = la1
     L an2 s = la2
-    anc1 = s_comments an1
-    anc2 = s_comments an2
+    anc1 = comments an1
+    anc2 = comments an2
 
     cs1s = splitCommentsEnd (anchorFromLocatedA la1) anc1
     cs1p = priorCommentsDeltas    (anchorFromLocatedA la1) (priorComments        cs1s)
@@ -566,8 +550,8 @@ balanceComments' la1 la2 = do
     move = sortEpaComments $ map snd (cs1move ++ move'' ++ move')
     stay = sortEpaComments $ map snd (cs1stay ++ stay')
 
-    an1' = setCommentsSrcAnn (getLoc la1) (EpaCommentsBalanced (map snd cs1p) move)
-    an2' = setCommentsSrcAnn (getLoc la2) (EpaCommentsBalanced stay (map snd cs2f))
+    an1' = setCommentsEpAnn (getLoc la1) (EpaCommentsBalanced (map snd cs1p) move)
+    an2' = setCommentsEpAnn (getLoc la2) (EpaCommentsBalanced stay (map snd cs2f))
     la1' = L an1' f
     la2' = L an2' s
 
@@ -591,7 +575,7 @@ priorCommentsDeltas :: RealSrcSpan -> [LEpaComment]
 priorCommentsDeltas r cs = go r (reverse $ sortEpaComments cs)
   where
     go :: RealSrcSpan -> [LEpaComment] -> [(Int, LEpaComment)]
-    go _ [] = []
+    go _   [] = []
     go _   (la@(L l@(EpaDelta dp _) _):las) = (deltaLine dp, la) : go (anchor l) las
     go rs' (la@(L l _):las) = deltaComment rs' la : go (anchor l) las
 
@@ -643,19 +627,19 @@ splitCommentsStart p (EpaCommentsBalanced cs ts) = EpaCommentsBalanced cs' ts'
     ts' = after <> ts
 
 moveLeadingComments :: (Data t, Data u, NoAnn t, NoAnn u)
-  => LocatedAn t a -> SrcAnn u -> (LocatedAn t a, SrcAnn u)
+  => LocatedAn t a -> EpAnn u -> (LocatedAn t a, EpAnn u)
 moveLeadingComments (L la a) lb = (L la' a, lb')
   `debug` ("moveLeadingComments: (before, after, la', lb'):" ++ showAst (before, after, la', lb'))
   where
-    split = splitCommentsEnd (realSrcSpan $ locA la) (s_comments la)
+    split = splitCommentsEnd (realSrcSpan $ locA la) (comments la)
     before = sortEpaComments $ priorComments split
     after = sortEpaComments $ getFollowingComments split
 
     -- TODO: need to set an entry delta on lb' to zero, and move the
     -- original spacing to the first comment.
 
-    la' = setCommentsSrcAnn la (EpaCommentsBalanced [] after)
-    lb' = addCommentsToSrcAnn lb (EpaCommentsBalanced before [])
+    la' = setCommentsEpAnn la (EpaCommentsBalanced [] after)
+    lb' = addCommentsToEpAnn lb (EpaCommentsBalanced before [])
 
 -- | A GHC comment includes the span of the preceding (non-comment)
 -- token.  Takes an original list of comments, and converts the
@@ -676,9 +660,7 @@ addCommentOrigDeltasAnn (EpAnn e a cs) = EpAnn e a (addCommentOrigDeltas cs)
 -- TODO: this is replicating functionality in ExactPrint. Sort out the
 -- import loop`
 anchorFromLocatedA :: LocatedA a -> RealSrcSpan
-anchorFromLocatedA (L (SrcSpanAnn an _loc) _)
-  = case an of
-      (EpAnn anc _ _) -> anchor anc
+anchorFromLocatedA (L (EpAnn anc _ _) _) = anchor anc
 
 -- ---------------------------------------------------------------------
 
@@ -694,8 +676,7 @@ balanceSameLineComments (L la (Match anm mctxt pats (GRHSs x grhss lb))) = do
       [] -> (la,grhss,[])
       (L lg (GRHS ga gs rhs):grs) -> (la'',reverse $ (L lg (GRHS ga' gs rhs)):grs,[(gac,(csp,csf))])
         where
-          an1 = la
-          anc1 = s_comments an1
+          anc1 = comments la
           (EpAnn anc an _) = ga :: EpAnn GrhsAnn
           (csp,csf) = case anc1 of
             EpaComments cs -> ([],cs)
@@ -710,7 +691,7 @@ balanceSameLineComments (L la (Match anm mctxt pats (GRHSs x grhss lb))) = do
           gac' = setFollowingComments gac (sortEpaComments $ gfc ++ move)
           ga' = (EpAnn anc an gac')
 
-          la'' = setCommentsSrcAnn la cs1
+          la'' = setCommentsEpAnn la cs1
 
 -- ---------------------------------------------------------------------
 
@@ -723,18 +704,17 @@ anchorEof (L l m@(HsModule (XModulePs an _lo _ _) _mn _exps _imps _decls)) = L l
 
 -- | Create a @SrcSpanAnn@ with a @MovedAnchor@ operation using the
 -- given @DeltaPos@.
-noAnnSrcSpanDP :: (NoAnn ann) => SrcSpan -> DeltaPos -> SrcSpanAnn' (EpAnn ann)
-noAnnSrcSpanDP l dp
-  = SrcSpanAnn (EpAnn (EpaDelta dp []) noAnn emptyComments) l
+noAnnSrcSpanDP :: (NoAnn ann) => DeltaPos -> EpAnn ann
+noAnnSrcSpanDP dp = EpAnn (EpaDelta dp []) noAnn emptyComments
 
-noAnnSrcSpanDP0 :: (NoAnn ann) => SrcSpan -> SrcSpanAnn' (EpAnn ann)
-noAnnSrcSpanDP0 l = noAnnSrcSpanDP l (SameLine 0)
+noAnnSrcSpanDP0 :: (NoAnn ann) => EpAnn ann
+noAnnSrcSpanDP0 = noAnnSrcSpanDP (SameLine 0)
 
-noAnnSrcSpanDP1 :: (NoAnn ann) => SrcSpan -> SrcSpanAnn' (EpAnn ann)
-noAnnSrcSpanDP1 l = noAnnSrcSpanDP l (SameLine 1)
+noAnnSrcSpanDP1 :: (NoAnn ann) => EpAnn ann
+noAnnSrcSpanDP1 = noAnnSrcSpanDP (SameLine 1)
 
-noAnnSrcSpanDPn :: (NoAnn ann) => SrcSpan -> Int -> SrcSpanAnn' (EpAnn ann)
-noAnnSrcSpanDPn l s = noAnnSrcSpanDP l (SameLine s)
+noAnnSrcSpanDPn :: (NoAnn ann) => Int -> EpAnn ann
+noAnnSrcSpanDPn s = noAnnSrcSpanDP (SameLine s)
 
 d0 :: EpaLocation
 d0 = EpaDelta (SameLine 0) []
@@ -746,8 +726,8 @@ dn :: Int -> EpaLocation
 dn n = EpaDelta (SameLine n) []
 
 addComma :: SrcSpanAnnA -> SrcSpanAnnA
-addComma (SrcSpanAnn (EpAnn anc (AnnListItem as) cs) l)
-  = (SrcSpanAnn (EpAnn anc (AnnListItem (AddCommaAnn d0:as)) cs) l)
+addComma (EpAnn anc (AnnListItem as) cs)
+  = EpAnn anc (AnnListItem (AddCommaAnn d0:as)) cs
 
 -- ---------------------------------------------------------------------
 
diff --git a/utils/check-exact/Utils.hs b/utils/check-exact/Utils.hs
index 4abfb5b0de6e..ba5e8b20d78d 100644
--- a/utils/check-exact/Utils.hs
+++ b/utils/check-exact/Utils.hs
@@ -381,14 +381,7 @@ name2String = showPprUnsafe
 -- ---------------------------------------------------------------------
 
 locatedAnAnchor :: LocatedAn a t -> RealSrcSpan
-locatedAnAnchor (L (SrcSpanAnn (EpAnn a _ _) _) _) = anchor a
-
--- ---------------------------------------------------------------------
-
--- |Version of l2l that preserves the anchor, immportant if it has an
--- updated AnchorOperation
-moveAnchor :: NoAnn b => SrcAnn a -> SrcAnn b
-moveAnchor (SrcSpanAnn (EpAnn anc _ cs) l) = SrcSpanAnn (EpAnn anc noAnn cs) l
+locatedAnAnchor (L (EpAnn a _ _) _) = anchor a
 
 -- ---------------------------------------------------------------------
 
@@ -448,7 +441,6 @@ hackSrcSpanToAnchor (RealSrcSpan r mb)
       if s <= 0 && e <= 0
       then EpaDelta (deltaPos (-s) (-e)) []
         `debug` ("hackSrcSpanToAnchor: (r,s,e)=" ++ showAst (r,s,e) )
-      -- else Anchor r UnchangedAnchor
       else EpaSpan (RealSrcSpan r mb)
     _ -> EpaSpan (RealSrcSpan r mb)
 
@@ -489,7 +481,7 @@ hsDeclsClassDecl dec = case dec of
               tcdATs = ats, tcdATDefs = at_defs
             } -> map snd decls
     where
-      srs :: SrcAnn a -> RealSrcSpan
+      srs :: (HasLoc a) => a -> RealSrcSpan
       srs a = realSrcSpan $ locA a
       decls
           = orderedDecls sortKey $ Map.fromList
diff --git a/utils/haddock b/utils/haddock
index c34467ea5b79..f9f25507bf48 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit c34467ea5b79122ac4cf39c33686195dc2f56281
+Subproject commit f9f25507bf48a8b05f21759744eddc93741fd10a
-- 
GitLab