TTG: Move ImpExp client-independent bits to L.H.S.ImpExp

Move the GHC-independent definitions from GHC.Hs.ImpExp to
Language.Haskell.Syntax.ImpExp with the required TTG extension fields
such as to keep the AST independent from GHC.

This is progress towards having the haskell-syntax package, as described
in #21592

Bumps haddock submodule

21 files changed, 695 insertions, 637 deletions

diff --git a/testsuite/tests/count-deps/CountDepsAst.stdout b/testsuite/tests/count-deps/CountDepsAst.stdout
index 75ef4e13de..edf9f38183 100644
--- a/testsuite/tests/count-deps/CountDepsAst.stdout
+++ b/testsuite/tests/count-deps/CountDepsAst.stdout
@@ -285,6 +285,7 @@ Language.Haskell.Syntax.Binds
 Language.Haskell.Syntax.Decls
 Language.Haskell.Syntax.Expr
 Language.Haskell.Syntax.Extension
+Language.Haskell.Syntax.ImpExp
 Language.Haskell.Syntax.Lit
 Language.Haskell.Syntax.Pat
 Language.Haskell.Syntax.Type
diff --git a/testsuite/tests/count-deps/CountDepsParser.stdout b/testsuite/tests/count-deps/CountDepsParser.stdout
index a4a51fbf9a..213126ce47 100644
--- a/testsuite/tests/count-deps/CountDepsParser.stdout
+++ b/testsuite/tests/count-deps/CountDepsParser.stdout
@@ -292,6 +292,7 @@ Language.Haskell.Syntax.Binds
 Language.Haskell.Syntax.Decls
 Language.Haskell.Syntax.Expr
 Language.Haskell.Syntax.Extension
+Language.Haskell.Syntax.ImpExp
 Language.Haskell.Syntax.Lit
 Language.Haskell.Syntax.Pat
 Language.Haskell.Syntax.Type
diff --git a/testsuite/tests/ghc-api/exactprint/Test20239.stderr b/testsuite/tests/ghc-api/exactprint/Test20239.stderr
index bada9845ab..32f05282ff 100644
--- a/testsuite/tests/ghc-api/exactprint/Test20239.stderr
+++ b/testsuite/tests/ghc-api/exactprint/Test20239.stderr
@@ -4,37 +4,40 @@
 (L
  { Test20239.hs:1:1 }
  (HsModule
-  (EpAnn
-   (Anchor
-    { Test20239.hs:1:1 }
-    (UnchangedAnchor))
-   (AnnsModule
-    [(AddEpAnn AnnModule (EpaSpan { Test20239.hs:1:1-6 }))
-    ,(AddEpAnn AnnWhere (EpaSpan { Test20239.hs:1:18-22 }))]
-    (AnnList
-     (Nothing)
-     (Nothing)
-     (Nothing)
-     []
-     []))
-   (EpaCommentsBalanced
-    [(L
-      (Anchor
-       { Test20239.hs:3:1-28 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaLineComment
-        "-- | Leading Haddock Comment")
-       { Test20239.hs:1:18-22 }))]
-    [(L
-      (Anchor
-       { Test20239.hs:8:1 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaEofComment)
-       { Test20239.hs:7:34-63 }))]))
-  (VirtualBraces
-   (1))
+  (XModulePs
+   (EpAnn
+    (Anchor
+     { Test20239.hs:1:1 }
+     (UnchangedAnchor))
+    (AnnsModule
+     [(AddEpAnn AnnModule (EpaSpan { Test20239.hs:1:1-6 }))
+     ,(AddEpAnn AnnWhere (EpaSpan { Test20239.hs:1:18-22 }))]
+     (AnnList
+      (Nothing)
+      (Nothing)
+      (Nothing)
+      []
+      []))
+    (EpaCommentsBalanced
+     [(L
+       (Anchor
+        { Test20239.hs:3:1-28 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaLineComment
+         "-- | Leading Haddock Comment")
+        { Test20239.hs:1:18-22 }))]
+     [(L
+       (Anchor
+        { Test20239.hs:8:1 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaEofComment)
+        { Test20239.hs:7:34-63 }))]))
+   (VirtualBraces
+    (1))
+   (Nothing)
+   (Nothing))
   (Just
    (L
     (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:1:8-16 })
@@ -317,11 +320,9 @@
                            (HsBoxedOrConstraintTuple)
                            [])))))))))))))])
             (Nothing)))]
-         []))))))]
-  (Nothing)
-  (Nothing)))
+         []))))))]))
 
 
 
-Test20239.hs:4:15:
+Test20239.hs:4:15: error:
     Not in scope: type constructor or class ‘Method’
diff --git a/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
index 2e0335db9f..de7d9e6f67 100644
--- a/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
@@ -4,30 +4,33 @@
 (L
  { T17544.hs:1:1 }
  (HsModule
-  (EpAnn
-   (Anchor
-    { T17544.hs:1:1 }
-    (UnchangedAnchor))
-   (AnnsModule
-    [(AddEpAnn AnnModule (EpaSpan { T17544.hs:3:1-6 }))
-    ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:3:15-19 }))]
-    (AnnList
-     (Nothing)
-     (Nothing)
-     (Nothing)
+  (XModulePs
+   (EpAnn
+    (Anchor
+     { T17544.hs:1:1 }
+     (UnchangedAnchor))
+    (AnnsModule
+     [(AddEpAnn AnnModule (EpaSpan { T17544.hs:3:1-6 }))
+     ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:3:15-19 }))]
+     (AnnList
+      (Nothing)
+      (Nothing)
+      (Nothing)
+      []
+      []))
+    (EpaCommentsBalanced
      []
-     []))
-   (EpaCommentsBalanced
-    []
-    [(L
-      (Anchor
-       { T17544.hs:57:1 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaEofComment)
-       { T17544.hs:57:1 }))]))
-  (VirtualBraces
-   (1))
+     [(L
+       (Anchor
+        { T17544.hs:57:1 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaEofComment)
+        { T17544.hs:57:1 }))]))
+   (VirtualBraces
+    (1))
+   (Nothing)
+   (Nothing))
   (Just
    (L
     (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:3:8-13 })
@@ -2245,9 +2248,7 @@
            (HsDocStringChunk
             " comment on class instance C10 Int"))
           []))
-        [])))))]
-  (Nothing)
-  (Nothing)))
+        [])))))]))
 
 
 
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 889833f2a6..ce76e9de6d 100644
--- a/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr
@@ -4,30 +4,45 @@
 (L
  { T17544_kw.hs:1:1 }
  (HsModule
-  (EpAnn
-   (Anchor
-    { T17544_kw.hs:1:1 }
-    (UnchangedAnchor))
-   (AnnsModule
-    [(AddEpAnn AnnModule (EpaSpan { T17544_kw.hs:11:1-6 }))
-    ,(AddEpAnn AnnWhere (EpaSpan { T17544_kw.hs:13:13-17 }))]
-    (AnnList
-     (Nothing)
-     (Nothing)
-     (Nothing)
+  (XModulePs
+   (EpAnn
+    (Anchor
+     { T17544_kw.hs:1:1 }
+     (UnchangedAnchor))
+    (AnnsModule
+     [(AddEpAnn AnnModule (EpaSpan { T17544_kw.hs:11:1-6 }))
+     ,(AddEpAnn AnnWhere (EpaSpan { T17544_kw.hs:13:13-17 }))]
+     (AnnList
+      (Nothing)
+      (Nothing)
+      (Nothing)
+      []
+      []))
+    (EpaCommentsBalanced
      []
-     []))
-   (EpaCommentsBalanced
-    []
-    [(L
-      (Anchor
-       { T17544_kw.hs:25:1 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaEofComment)
-       { T17544_kw.hs:25:1 }))]))
-  (VirtualBraces
-   (1))
+     [(L
+       (Anchor
+        { T17544_kw.hs:25:1 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaEofComment)
+        { T17544_kw.hs:25:1 }))]))
+   (VirtualBraces
+    (1))
+   (Nothing)
+   (Just
+    (L
+     { T17544_kw.hs:12:3-33 }
+     (WithHsDocIdentifiers
+      (MultiLineDocString
+       (HsDocStringNext)
+       (:|
+        (L
+         { T17544_kw.hs:12:7-33 }
+         (HsDocStringChunk
+          " Bad comment for the module"))
+        []))
+      []))))
   (Just
    (L
     (SrcSpanAnn (EpAnnNotUsed) { T17544_kw.hs:13:3-11 })
@@ -341,20 +356,6 @@
               (HsDocStringChunk
                " Bad comment for clsmethod"))
              []))
-           []))))])))]
-  (Nothing)
-  (Just
-   (L
-    { T17544_kw.hs:12:3-33 }
-    (WithHsDocIdentifiers
-     (MultiLineDocString
-      (HsDocStringNext)
-      (:|
-       (L
-        { T17544_kw.hs:12:7-33 }
-        (HsDocStringChunk
-         " Bad comment for the module"))
-       []))
-     [])))))
+           []))))])))]))
 
 
diff --git a/testsuite/tests/module/mod185.stderr b/testsuite/tests/module/mod185.stderr
index 678557c52f..b5af7f60ba 100644
--- a/testsuite/tests/module/mod185.stderr
+++ b/testsuite/tests/module/mod185.stderr
@@ -4,49 +4,54 @@
 (L
  { mod185.hs:1:1 }
  (HsModule
-  (EpAnn
-   (Anchor
-    { mod185.hs:1:1 }
-    (UnchangedAnchor))
-   (AnnsModule
-    []
-    (AnnList
-     (Nothing)
-     (Nothing)
-     (Nothing)
+  (XModulePs
+   (EpAnn
+    (Anchor
+     { mod185.hs:1:1 }
+     (UnchangedAnchor))
+    (AnnsModule
      []
-     []))
-   (EpaCommentsBalanced
-    []
-    [(L
-      (Anchor
-       { mod185.hs:6:1 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaEofComment)
-       { mod185.hs:6:1 }))]))
-  (VirtualBraces
-   (1))
+     (AnnList
+      (Nothing)
+      (Nothing)
+      (Nothing)
+      []
+      []))
+    (EpaCommentsBalanced
+     []
+     [(L
+       (Anchor
+        { mod185.hs:6:1 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaEofComment)
+        { mod185.hs:6:1 }))]))
+   (VirtualBraces
+    (1))
+   (Nothing)
+   (Nothing))
   (Nothing)
   (Nothing)
   [(L
     (SrcSpanAnn (EpAnnNotUsed) { mod185.hs:3:1-24 })
     (ImportDecl
-     (EpAnn
-      (Anchor
-       { mod185.hs:3:1-6 }
-       (UnchangedAnchor))
-      (EpAnnImportDecl
-       (EpaSpan { mod185.hs:3:1-6 })
-       (Nothing)
-       (Nothing)
-       (Just
-        (EpaSpan { mod185.hs:3:16-24 }))
-       (Nothing)
-       (Nothing))
-      (EpaComments
-       []))
-     (NoSourceText)
+     (XImportDeclPass
+      (EpAnn
+       (Anchor
+        { mod185.hs:3:1-6 }
+        (UnchangedAnchor))
+       (EpAnnImportDecl
+        (EpaSpan { mod185.hs:3:1-6 })
+        (Nothing)
+        (Nothing)
+        (Just
+         (EpaSpan { mod185.hs:3:16-24 }))
+        (Nothing)
+        (Nothing))
+       (EpaComments
+        []))
+      (NoSourceText)
+      (False))
      (L
       (SrcSpanAnn (EpAnnNotUsed) { mod185.hs:3:8-14 })
       {ModuleName: Prelude})
@@ -54,7 +59,6 @@
      (NotBoot)
      (False)
      (QualifiedPost)
-     (False)
      (Nothing)
      (Nothing)))]
   [(L
@@ -125,8 +129,6 @@
                    {OccName: undefined}))))))]
             (EmptyLocalBinds
              (NoExtField)))))]))
-      [])))]
-  (Nothing)
-  (Nothing)))
+      [])))]))
 
 
diff --git a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
index c91d8cdc70..f11708fa06 100644
--- a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
@@ -4,30 +4,33 @@
 (L
  { DumpParsedAst.hs:1:1 }
  (HsModule
-  (EpAnn
-   (Anchor
-    { DumpParsedAst.hs:1:1 }
-    (UnchangedAnchor))
-   (AnnsModule
-    [(AddEpAnn AnnModule (EpaSpan { DumpParsedAst.hs:5:1-6 }))
-    ,(AddEpAnn AnnWhere (EpaSpan { DumpParsedAst.hs:5:22-26 }))]
-    (AnnList
-     (Nothing)
-     (Nothing)
-     (Nothing)
+  (XModulePs
+   (EpAnn
+    (Anchor
+     { DumpParsedAst.hs:1:1 }
+     (UnchangedAnchor))
+    (AnnsModule
+     [(AddEpAnn AnnModule (EpaSpan { DumpParsedAst.hs:5:1-6 }))
+     ,(AddEpAnn AnnWhere (EpaSpan { DumpParsedAst.hs:5:22-26 }))]
+     (AnnList
+      (Nothing)
+      (Nothing)
+      (Nothing)
+      []
+      []))
+    (EpaCommentsBalanced
      []
-     []))
-   (EpaCommentsBalanced
-    []
-    [(L
-      (Anchor
-       { DumpParsedAst.hs:25:1 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaEofComment)
-       { DumpParsedAst.hs:25:1 }))]))
-  (VirtualBraces
-   (1))
+     [(L
+       (Anchor
+        { DumpParsedAst.hs:25:1 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaEofComment)
+        { DumpParsedAst.hs:25:1 }))]))
+   (VirtualBraces
+    (1))
+   (Nothing)
+   (Nothing))
   (Just
    (L
     (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:5:8-20 })
@@ -36,20 +39,22 @@
   [(L
     (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:6:1-16 })
     (ImportDecl
-     (EpAnn
-      (Anchor
-       { DumpParsedAst.hs:6:1-6 }
-       (UnchangedAnchor))
-      (EpAnnImportDecl
-       (EpaSpan { DumpParsedAst.hs:6:1-6 })
-       (Nothing)
-       (Nothing)
-       (Nothing)
-       (Nothing)
-       (Nothing))
-      (EpaComments
-       []))
-     (NoSourceText)
+     (XImportDeclPass
+      (EpAnn
+       (Anchor
+        { DumpParsedAst.hs:6:1-6 }
+        (UnchangedAnchor))
+       (EpAnnImportDecl
+        (EpaSpan { DumpParsedAst.hs:6:1-6 })
+        (Nothing)
+        (Nothing)
+        (Nothing)
+        (Nothing)
+        (Nothing))
+       (EpaComments
+        []))
+      (NoSourceText)
+      (False))
      (L
       (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:6:8-16 })
       {ModuleName: Data.Kind})
@@ -57,7 +62,6 @@
      (NotBoot)
      (False)
      (NotQualified)
-     (False)
      (Nothing)
      (Nothing)))]
   [(L
@@ -1529,8 +1533,6 @@
                     {FastString: "hello"})))))))]
             (EmptyLocalBinds
              (NoExtField)))))]))
-      [])))]
-  (Nothing)
-  (Nothing)))
+      [])))]))
 
 
diff --git a/testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr b/testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr
index 6673dff801..fd620baf4b 100644
--- a/testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr
+++ b/testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr
@@ -4,46 +4,49 @@
 (L
  { DumpParsedAstComments.hs:1:1 }
  (HsModule
-  (EpAnn
-   (Anchor
-    { DumpParsedAstComments.hs:1:1 }
-    (UnchangedAnchor))
-   (AnnsModule
-    [(AddEpAnn AnnModule (EpaSpan { DumpParsedAstComments.hs:5:1-6 }))
-    ,(AddEpAnn AnnWhere (EpaSpan { DumpParsedAstComments.hs:5:30-34
-                                    }))]
-    (AnnList
-     (Nothing)
-     (Nothing)
-     (Nothing)
-     []
-     []))
-   (EpaCommentsBalanced
-    [(L
-      (Anchor
-       { DumpParsedAstComments.hs:1:1-28 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaBlockComment
-        "{-# LANGUAGE Haskell2010 #-}")
-       { DumpParsedAstComments.hs:1:1 }))
-    ,(L
-      (Anchor
-       { DumpParsedAstComments.hs:(2,1)-(4,4) }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaBlockComment
-        "{-\n  Block comment at the beginning\n  -}")
-       { DumpParsedAstComments.hs:1:1-28 }))]
-    [(L
-      (Anchor
-       { DumpParsedAstComments.hs:13:1 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaEofComment)
-       { DumpParsedAstComments.hs:13:1 }))]))
-  (VirtualBraces
-   (1))
+  (XModulePs
+   (EpAnn
+    (Anchor
+     { DumpParsedAstComments.hs:1:1 }
+     (UnchangedAnchor))
+    (AnnsModule
+     [(AddEpAnn AnnModule (EpaSpan { DumpParsedAstComments.hs:5:1-6 }))
+     ,(AddEpAnn AnnWhere (EpaSpan { DumpParsedAstComments.hs:5:30-34
+                                     }))]
+     (AnnList
+      (Nothing)
+      (Nothing)
+      (Nothing)
+      []
+      []))
+    (EpaCommentsBalanced
+     [(L
+       (Anchor
+        { DumpParsedAstComments.hs:1:1-28 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaBlockComment
+         "{-# LANGUAGE Haskell2010 #-}")
+        { DumpParsedAstComments.hs:1:1 }))
+     ,(L
+       (Anchor
+        { DumpParsedAstComments.hs:(2,1)-(4,4) }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaBlockComment
+         "{-\n  Block comment at the beginning\n  -}")
+        { DumpParsedAstComments.hs:1:1-28 }))]
+     [(L
+       (Anchor
+        { DumpParsedAstComments.hs:13:1 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaEofComment)
+        { DumpParsedAstComments.hs:13:1 }))]))
+   (VirtualBraces
+    (1))
+   (Nothing)
+   (Nothing))
   (Just
    (L
     (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAstComments.hs:5:8-28 })
@@ -277,8 +280,6 @@
                     {FastString: "hello"})))))))]
             (EmptyLocalBinds
              (NoExtField)))))]))
-      [])))]
-  (Nothing)
-  (Nothing)))
+      [])))]))
 
 
diff --git a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
index f5fc2e9d00..290d505195 100644
--- a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
@@ -1272,8 +1272,10 @@
   [(L
     (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:5:8-21 })
     (ImportDecl
-     (NoExtField)
-     (NoSourceText)
+     (XImportDeclPass
+      (EpAnnNotUsed)
+      (NoSourceText)
+      (True))
      (L
       (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:5:8-21 })
       {ModuleName: Prelude})
@@ -1281,14 +1283,27 @@
      (NotBoot)
      (False)
      (NotQualified)
-     (True)
      (Nothing)
      (Nothing)))
   ,(L
     (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:6:1-16 })
     (ImportDecl
-     (NoExtField)
-     (NoSourceText)
+     (XImportDeclPass
+      (EpAnn
+       (Anchor
+        { DumpRenamedAst.hs:6:1-6 }
+        (UnchangedAnchor))
+       (EpAnnImportDecl
+        (EpaSpan { DumpRenamedAst.hs:6:1-6 })
+        (Nothing)
+        (Nothing)
+        (Nothing)
+        (Nothing)
+        (Nothing))
+       (EpaComments
+        []))
+      (NoSourceText)
+      (False))
      (L
       (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:6:8-16 })
       {ModuleName: Data.Kind})
@@ -1296,14 +1311,27 @@
      (NotBoot)
      (False)
      (NotQualified)
-     (False)
      (Nothing)
      (Nothing)))
   ,(L
     (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:8:1-23 })
     (ImportDecl
-     (NoExtField)
-     (NoSourceText)
+     (XImportDeclPass
+      (EpAnn
+       (Anchor
+        { DumpRenamedAst.hs:8:1-6 }
+        (UnchangedAnchor))
+       (EpAnnImportDecl
+        (EpaSpan { DumpRenamedAst.hs:8:1-6 })
+        (Nothing)
+        (Nothing)
+        (Nothing)
+        (Nothing)
+        (Nothing))
+       (EpaComments
+        []))
+      (NoSourceText)
+      (False))
      (L
       (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:8:8-16 })
       {ModuleName: Data.Kind})
@@ -1311,11 +1339,10 @@
      (NotBoot)
      (False)
      (NotQualified)
-     (False)
      (Nothing)
      (Just
       ((,)
-       (False)
+       (Exactly)
        (L
         (SrcSpanAnn (EpAnn
                      (Anchor
@@ -1338,6 +1365,7 @@
            (L
             (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:8:19-22 })
             (IEName
+             (NoExtField)
              (L
               (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:8:19-22 })
               {Name: GHC.Types.Type})))))])))))]
diff --git a/testsuite/tests/parser/should_compile/DumpSemis.stderr b/testsuite/tests/parser/should_compile/DumpSemis.stderr
index 45a3d7acda..3d0a47521e 100644
--- a/testsuite/tests/parser/should_compile/DumpSemis.stderr
+++ b/testsuite/tests/parser/should_compile/DumpSemis.stderr
@@ -4,41 +4,44 @@
 (L
  { DumpSemis.hs:1:1 }
  (HsModule
-  (EpAnn
-   (Anchor
-    { DumpSemis.hs:1:1 }
-    (UnchangedAnchor))
-   (AnnsModule
-    [(AddEpAnn AnnModule (EpaSpan { DumpSemis.hs:1:1-6 }))
-    ,(AddEpAnn AnnWhere (EpaSpan { DumpSemis.hs:1:18-22 }))]
-    (AnnList
-     (Nothing)
-     (Nothing)
-     (Nothing)
+  (XModulePs
+   (EpAnn
+    (Anchor
+     { DumpSemis.hs:1:1 }
+     (UnchangedAnchor))
+    (AnnsModule
+     [(AddEpAnn AnnModule (EpaSpan { DumpSemis.hs:1:1-6 }))
+     ,(AddEpAnn AnnWhere (EpaSpan { DumpSemis.hs:1:18-22 }))]
+     (AnnList
+      (Nothing)
+      (Nothing)
+      (Nothing)
+      []
+      [(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:4:1 }))
+      ,(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:4:2 }))
+      ,(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:4:3 }))
+      ,(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:4:4 }))
+      ,(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:4:7 }))
+      ,(AddSemiAnn
+        (EpaSpan { DumpSemis.hs:4:8 }))]))
+    (EpaCommentsBalanced
      []
-     [(AddSemiAnn
-       (EpaSpan { DumpSemis.hs:4:1 }))
-     ,(AddSemiAnn
-       (EpaSpan { DumpSemis.hs:4:2 }))
-     ,(AddSemiAnn
-       (EpaSpan { DumpSemis.hs:4:3 }))
-     ,(AddSemiAnn
-       (EpaSpan { DumpSemis.hs:4:4 }))
-     ,(AddSemiAnn
-       (EpaSpan { DumpSemis.hs:4:7 }))
-     ,(AddSemiAnn
-       (EpaSpan { DumpSemis.hs:4:8 }))]))
-   (EpaCommentsBalanced
-    []
-    [(L
-      (Anchor
-       { DumpSemis.hs:46:1 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaEofComment)
-       { DumpSemis.hs:46:1 }))]))
-  (VirtualBraces
-   (1))
+     [(L
+       (Anchor
+        { DumpSemis.hs:46:1 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaEofComment)
+        { DumpSemis.hs:46:1 }))]))
+   (VirtualBraces
+    (1))
+   (Nothing)
+   (Nothing))
   (Just
    (L
     (SrcSpanAnn (EpAnnNotUsed) { DumpSemis.hs:1:8-16 })
@@ -59,20 +62,22 @@
                  (EpaComments
                   [])) { DumpSemis.hs:5:1-19 })
     (ImportDecl
-     (EpAnn
-      (Anchor
-       { DumpSemis.hs:5:1-6 }
-       (UnchangedAnchor))
-      (EpAnnImportDecl
-       (EpaSpan { DumpSemis.hs:5:1-6 })
-       (Nothing)
-       (Nothing)
-       (Nothing)
-       (Nothing)
-       (Nothing))
-      (EpaComments
-       []))
-     (NoSourceText)
+     (XImportDeclPass
+      (EpAnn
+       (Anchor
+        { DumpSemis.hs:5:1-6 }
+        (UnchangedAnchor))
+       (EpAnnImportDecl
+        (EpaSpan { DumpSemis.hs:5:1-6 })
+        (Nothing)
+        (Nothing)
+        (Nothing)
+        (Nothing)
+        (Nothing))
+       (EpaComments
+        []))
+      (NoSourceText)
+      (False))
      (L
       (SrcSpanAnn (EpAnnNotUsed) { DumpSemis.hs:5:8-16 })
       {ModuleName: Data.List})
@@ -80,11 +85,10 @@
      (NotBoot)
      (False)
      (NotQualified)
-     (False)
      (Nothing)
      (Just
       ((,)
-       (False)
+       (Exactly)
        (L
         (SrcSpanAnn (EpAnn
                      (Anchor
@@ -116,20 +120,22 @@
                  (EpaComments
                   [])) { DumpSemis.hs:7:1-16 })
     (ImportDecl
-     (EpAnn
-      (Anchor
-       { DumpSemis.hs:7:1-6 }
-       (UnchangedAnchor))
-      (EpAnnImportDecl
-       (EpaSpan { DumpSemis.hs:7:1-6 })
-       (Nothing)
-       (Nothing)
-       (Nothing)
-       (Nothing)
-       (Nothing))
-      (EpaComments
-       []))
-     (NoSourceText)
+     (XImportDeclPass
+      (EpAnn
+       (Anchor
+        { DumpSemis.hs:7:1-6 }
+        (UnchangedAnchor))
+       (EpAnnImportDecl
+        (EpaSpan { DumpSemis.hs:7:1-6 })
+        (Nothing)
+        (Nothing)
+        (Nothing)
+        (Nothing)
+        (Nothing))
+       (EpaComments
+        []))
+      (NoSourceText)
+      (False))
      (L
       (SrcSpanAnn (EpAnnNotUsed) { DumpSemis.hs:7:8-16 })
       {ModuleName: Data.Kind})
@@ -137,7 +143,6 @@
      (NotBoot)
      (False)
      (NotQualified)
-     (False)
      (Nothing)
      (Nothing)))]
   [(L
@@ -2117,8 +2122,6 @@
                         (NoExtField)))))]))))))]
             (EmptyLocalBinds
              (NoExtField)))))]))
-      [])))]
-  (Nothing)
-  (Nothing)))
+      [])))]))
 
 
diff --git a/testsuite/tests/parser/should_compile/KindSigs.stderr b/testsuite/tests/parser/should_compile/KindSigs.stderr
index b3107c18c6..7794fda45e 100644
--- a/testsuite/tests/parser/should_compile/KindSigs.stderr
+++ b/testsuite/tests/parser/should_compile/KindSigs.stderr
@@ -4,30 +4,33 @@
 (L
  { KindSigs.hs:1:1 }
  (HsModule
-  (EpAnn
-   (Anchor
-    { KindSigs.hs:1:1 }
-    (UnchangedAnchor))
-   (AnnsModule
-    [(AddEpAnn AnnModule (EpaSpan { KindSigs.hs:6:1-6 }))
-    ,(AddEpAnn AnnWhere (EpaSpan { KindSigs.hs:6:17-21 }))]
-    (AnnList
-     (Nothing)
-     (Nothing)
-     (Nothing)
+  (XModulePs
+   (EpAnn
+    (Anchor
+     { KindSigs.hs:1:1 }
+     (UnchangedAnchor))
+    (AnnsModule
+     [(AddEpAnn AnnModule (EpaSpan { KindSigs.hs:6:1-6 }))
+     ,(AddEpAnn AnnWhere (EpaSpan { KindSigs.hs:6:17-21 }))]
+     (AnnList
+      (Nothing)
+      (Nothing)
+      (Nothing)
+      []
+      []))
+    (EpaCommentsBalanced
      []
-     []))
-   (EpaCommentsBalanced
-    []
-    [(L
-      (Anchor
-       { KindSigs.hs:36:1 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaEofComment)
-       { KindSigs.hs:36:1 }))]))
-  (VirtualBraces
-   (1))
+     [(L
+       (Anchor
+        { KindSigs.hs:36:1 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaEofComment)
+        { KindSigs.hs:36:1 }))]))
+   (VirtualBraces
+    (1))
+   (Nothing)
+   (Nothing))
   (Just
    (L
     (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:6:8-15 })
@@ -36,20 +39,22 @@
   [(L
     (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:8:1-16 })
     (ImportDecl
-     (EpAnn
-      (Anchor
-       { KindSigs.hs:8:1-6 }
-       (UnchangedAnchor))
-      (EpAnnImportDecl
-       (EpaSpan { KindSigs.hs:8:1-6 })
-       (Nothing)
-       (Nothing)
-       (Nothing)
-       (Nothing)
-       (Nothing))
-      (EpaComments
-       []))
-     (NoSourceText)
+     (XImportDeclPass
+      (EpAnn
+       (Anchor
+        { KindSigs.hs:8:1-6 }
+        (UnchangedAnchor))
+       (EpAnnImportDecl
+        (EpaSpan { KindSigs.hs:8:1-6 })
+        (Nothing)
+        (Nothing)
+        (Nothing)
+        (Nothing)
+        (Nothing))
+       (EpaComments
+        []))
+      (NoSourceText)
+      (False))
      (L
       (SrcSpanAnn (EpAnnNotUsed) { KindSigs.hs:8:8-16 })
       {ModuleName: Data.Kind})
@@ -57,7 +62,6 @@
      (NotBoot)
      (False)
      (NotQualified)
-     (False)
      (Nothing)
      (Nothing)))]
   [(L
@@ -1512,8 +1516,6 @@
                    {OccName: True}))))))]
             (EmptyLocalBinds
              (NoExtField)))))]))
-      [])))]
-  (Nothing)
-  (Nothing)))
+      [])))]))
 
 
diff --git a/testsuite/tests/parser/should_compile/T14189.stderr b/testsuite/tests/parser/should_compile/T14189.stderr
index 9eda4089be..b2e294562b 100644
--- a/testsuite/tests/parser/should_compile/T14189.stderr
+++ b/testsuite/tests/parser/should_compile/T14189.stderr
@@ -167,8 +167,10 @@
   [(L
     (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:1:8-13 })
     (ImportDecl
-     (NoExtField)
-     (NoSourceText)
+     (XImportDeclPass
+      (EpAnnNotUsed)
+      (NoSourceText)
+      (True))
      (L
       (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:1:8-13 })
       {ModuleName: Prelude})
@@ -176,7 +178,6 @@
      (NotBoot)
      (False)
      (NotQualified)
-     (True)
      (Nothing)
      (Nothing)))]
   (Just
@@ -194,6 +195,7 @@
        (L
         (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:3:3-8 })
         (IEName
+         (NoExtField)
          (L
           (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:3:3-8 })
           {Name: T14189.MyType})))
@@ -201,6 +203,7 @@
        [(L
          (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:3:13-14 })
          (IEName
+          (NoExtField)
           (L
            (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:3:13-14 })
            {Name: T14189.NT})))]))
diff --git a/testsuite/tests/parser/should_compile/T15323.stderr b/testsuite/tests/parser/should_compile/T15323.stderr
index 693814f96e..ee0748d050 100644
--- a/testsuite/tests/parser/should_compile/T15323.stderr
+++ b/testsuite/tests/parser/should_compile/T15323.stderr
@@ -4,30 +4,33 @@
 (L
  { T15323.hs:1:1 }
  (HsModule
-  (EpAnn
-   (Anchor
-    { T15323.hs:1:1 }
-    (UnchangedAnchor))
-   (AnnsModule
-    [(AddEpAnn AnnModule (EpaSpan { T15323.hs:3:1-6 }))
-    ,(AddEpAnn AnnWhere (EpaSpan { T15323.hs:3:15-19 }))]
-    (AnnList
-     (Nothing)
-     (Nothing)
-     (Nothing)
+  (XModulePs
+   (EpAnn
+    (Anchor
+     { T15323.hs:1:1 }
+     (UnchangedAnchor))
+    (AnnsModule
+     [(AddEpAnn AnnModule (EpaSpan { T15323.hs:3:1-6 }))
+     ,(AddEpAnn AnnWhere (EpaSpan { T15323.hs:3:15-19 }))]
+     (AnnList
+      (Nothing)
+      (Nothing)
+      (Nothing)
+      []
+      []))
+    (EpaCommentsBalanced
      []
-     []))
-   (EpaCommentsBalanced
-    []
-    [(L
-      (Anchor
-       { T15323.hs:7:1 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaEofComment)
-       { T15323.hs:7:1 }))]))
-  (VirtualBraces
-   (1))
+     [(L
+       (Anchor
+        { T15323.hs:7:1 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaEofComment)
+        { T15323.hs:7:1 }))]))
+   (VirtualBraces
+    (1))
+   (Nothing)
+   (Nothing))
   (Just
    (L
     (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:3:8-13 })
@@ -226,8 +229,6 @@
                (Unqual
                 {OccName: v}))))))
           (Nothing)))]
-       []))))]
-  (Nothing)
-  (Nothing)))
+       []))))]))
 
 
diff --git a/testsuite/tests/parser/should_compile/T20452.stderr b/testsuite/tests/parser/should_compile/T20452.stderr
index c5eded00e9..810b831cd7 100644
--- a/testsuite/tests/parser/should_compile/T20452.stderr
+++ b/testsuite/tests/parser/should_compile/T20452.stderr
@@ -4,30 +4,33 @@
 (L
  { T20452.hs:1:1 }
  (HsModule
-  (EpAnn
-   (Anchor
-    { T20452.hs:1:1 }
-    (UnchangedAnchor))
-   (AnnsModule
-    [(AddEpAnn AnnModule (EpaSpan { T20452.hs:3:1-6 }))
-    ,(AddEpAnn AnnWhere (EpaSpan { T20452.hs:3:15-19 }))]
-    (AnnList
-     (Nothing)
-     (Nothing)
-     (Nothing)
+  (XModulePs
+   (EpAnn
+    (Anchor
+     { T20452.hs:1:1 }
+     (UnchangedAnchor))
+    (AnnsModule
+     [(AddEpAnn AnnModule (EpaSpan { T20452.hs:3:1-6 }))
+     ,(AddEpAnn AnnWhere (EpaSpan { T20452.hs:3:15-19 }))]
+     (AnnList
+      (Nothing)
+      (Nothing)
+      (Nothing)
+      []
+      []))
+    (EpaCommentsBalanced
      []
-     []))
-   (EpaCommentsBalanced
-    []
-    [(L
-      (Anchor
-       { T20452.hs:10:1 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaEofComment)
-       { T20452.hs:10:1 }))]))
-  (VirtualBraces
-   (1))
+     [(L
+       (Anchor
+        { T20452.hs:10:1 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaEofComment)
+        { T20452.hs:10:1 }))]))
+   (VirtualBraces
+    (1))
+   (Nothing)
+   (Nothing))
   (Just
    (L
     (SrcSpanAnn (EpAnnNotUsed) { T20452.hs:3:8-13 })
@@ -587,6 +590,6 @@
        []}
       []
       []
-      [])))]
-  (Nothing)
-  (Nothing)))
+      [])))]))
+
+
diff --git a/testsuite/tests/parser/should_compile/T20718.stderr b/testsuite/tests/parser/should_compile/T20718.stderr
index 77563d8631..fd8fbfb261 100644
--- a/testsuite/tests/parser/should_compile/T20718.stderr
+++ b/testsuite/tests/parser/should_compile/T20718.stderr
@@ -4,61 +4,64 @@
 (L
  { T20718.hs:1:1 }
  (HsModule
-  (EpAnn
-   (Anchor
-    { T20718.hs:1:1 }
-    (UnchangedAnchor))
-   (AnnsModule
-    [(AddEpAnn AnnModule (EpaSpan { T20718.hs:3:1-6 }))
-    ,(AddEpAnn AnnWhere (EpaSpan { T20718.hs:3:15-19 }))]
-    (AnnList
-     (Nothing)
-     (Nothing)
-     (Nothing)
-     []
-     []))
-   (EpaCommentsBalanced
-    [(L
-      (Anchor
-       { T20718.hs:1:1-16 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaLineComment
-        "-- top of file 1")
-       { T20718.hs:1:1 }))
-    ,(L
-      (Anchor
-       { T20718.hs:2:1-16 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaLineComment
-        "-- top of file 2")
-       { T20718.hs:1:1-16 }))
-    ,(L
-      (Anchor
-       { T20718.hs:5:1-11 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaLineComment
-        "-- before 1")
-       { T20718.hs:3:15-19 }))
-    ,(L
-      (Anchor
-       { T20718.hs:6:1-11 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaLineComment
-        "-- before 2")
-       { T20718.hs:5:1-11 }))]
-    [(L
-      (Anchor
-       { T20718.hs:12:1 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaEofComment)
-       { T20718.hs:11:1-8 }))]))
-  (VirtualBraces
-   (1))
+  (XModulePs
+   (EpAnn
+    (Anchor
+     { T20718.hs:1:1 }
+     (UnchangedAnchor))
+    (AnnsModule
+     [(AddEpAnn AnnModule (EpaSpan { T20718.hs:3:1-6 }))
+     ,(AddEpAnn AnnWhere (EpaSpan { T20718.hs:3:15-19 }))]
+     (AnnList
+      (Nothing)
+      (Nothing)
+      (Nothing)
+      []
+      []))
+    (EpaCommentsBalanced
+     [(L
+       (Anchor
+        { T20718.hs:1:1-16 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaLineComment
+         "-- top of file 1")
+        { T20718.hs:1:1 }))
+     ,(L
+       (Anchor
+        { T20718.hs:2:1-16 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaLineComment
+         "-- top of file 2")
+        { T20718.hs:1:1-16 }))
+     ,(L
+       (Anchor
+        { T20718.hs:5:1-11 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaLineComment
+         "-- before 1")
+        { T20718.hs:3:15-19 }))
+     ,(L
+       (Anchor
+        { T20718.hs:6:1-11 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaLineComment
+         "-- before 2")
+        { T20718.hs:5:1-11 }))]
+     [(L
+       (Anchor
+        { T20718.hs:12:1 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaEofComment)
+        { T20718.hs:11:1-8 }))]))
+   (VirtualBraces
+    (1))
+   (Nothing)
+   (Nothing))
   (Just
    (L
     (SrcSpanAnn (EpAnnNotUsed) { T20718.hs:3:8-13 })
@@ -156,8 +159,6 @@
                     (1))))))))]
             (EmptyLocalBinds
              (NoExtField)))))]))
-      [])))]
-  (Nothing)
-  (Nothing)))
+      [])))]))
 
 
diff --git a/testsuite/tests/parser/should_compile/T20718b.stderr b/testsuite/tests/parser/should_compile/T20718b.stderr
index d359e5c5cf..79b5d67bb3 100644
--- a/testsuite/tests/parser/should_compile/T20718b.stderr
+++ b/testsuite/tests/parser/should_compile/T20718b.stderr
@@ -4,67 +4,70 @@
 (L
  { T20718b.hs:1:1 }
  (HsModule
-  (EpAnn
-   (Anchor
-    { T20718b.hs:1:1 }
-    (UnchangedAnchor))
-   (AnnsModule
-    [(AddEpAnn AnnModule (EpaSpan { T20718b.hs:4:1-6 }))
-    ,(AddEpAnn AnnWhere (EpaSpan { T20718b.hs:4:16-20 }))]
-    (AnnList
-     (Nothing)
-     (Nothing)
-     (Nothing)
-     []
-     []))
-   (EpaCommentsBalanced
-    [(L
-      (Anchor
-       { T20718b.hs:1:1-19 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaLineComment
-        "-- header comment 1")
-       { T20718b.hs:1:1 }))
-    ,(L
-      (Anchor
-       { T20718b.hs:2:1-19 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaLineComment
-        "-- header comment 2")
-       { T20718b.hs:1:1-19 }))
-    ,(L
-      (Anchor
-       { T20718b.hs:6:1-21 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaLineComment
-        "-- trailing comment 1")
-       { T20718b.hs:4:16-20 }))
-    ,(L
-      (Anchor
-       { T20718b.hs:7:1-21 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaLineComment
-        "-- trailing comment 2")
-       { T20718b.hs:6:1-21 }))]
-    [(L
-      (Anchor
-       { T20718b.hs:8:1 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaEofComment)
-       { T20718b.hs:7:1-21 }))]))
-  (VirtualBraces
-   (1))
+  (XModulePs
+   (EpAnn
+    (Anchor
+     { T20718b.hs:1:1 }
+     (UnchangedAnchor))
+    (AnnsModule
+     [(AddEpAnn AnnModule (EpaSpan { T20718b.hs:4:1-6 }))
+     ,(AddEpAnn AnnWhere (EpaSpan { T20718b.hs:4:16-20 }))]
+     (AnnList
+      (Nothing)
+      (Nothing)
+      (Nothing)
+      []
+      []))
+    (EpaCommentsBalanced
+     [(L
+       (Anchor
+        { T20718b.hs:1:1-19 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaLineComment
+         "-- header comment 1")
+        { T20718b.hs:1:1 }))
+     ,(L
+       (Anchor
+        { T20718b.hs:2:1-19 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaLineComment
+         "-- header comment 2")
+        { T20718b.hs:1:1-19 }))
+     ,(L
+       (Anchor
+        { T20718b.hs:6:1-21 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaLineComment
+         "-- trailing comment 1")
+        { T20718b.hs:4:16-20 }))
+     ,(L
+       (Anchor
+        { T20718b.hs:7:1-21 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaLineComment
+         "-- trailing comment 2")
+        { T20718b.hs:6:1-21 }))]
+     [(L
+       (Anchor
+        { T20718b.hs:8:1 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaEofComment)
+        { T20718b.hs:7:1-21 }))]))
+   (VirtualBraces
+    (1))
+   (Nothing)
+   (Nothing))
   (Just
    (L
     (SrcSpanAnn (EpAnnNotUsed) { T20718b.hs:4:8-14 })
     {ModuleName: T20718b}))
   (Nothing)
   []
-  []
-  (Nothing)
-  (Nothing)))
+  []))
+
+
diff --git a/testsuite/tests/parser/should_compile/T20846.stderr b/testsuite/tests/parser/should_compile/T20846.stderr
index 775531c619..5d2cf5c0ea 100644
--- a/testsuite/tests/parser/should_compile/T20846.stderr
+++ b/testsuite/tests/parser/should_compile/T20846.stderr
@@ -4,30 +4,33 @@
 (L
  { T20846.hs:1:1 }
  (HsModule
-  (EpAnn
-   (Anchor
-    { T20846.hs:1:1 }
-    (UnchangedAnchor))
-   (AnnsModule
-    [(AddEpAnn AnnModule (EpaSpan { T20846.hs:1:1-6 }))
-    ,(AddEpAnn AnnWhere (EpaSpan { T20846.hs:1:15-19 }))]
-    (AnnList
-     (Nothing)
-     (Nothing)
-     (Nothing)
+  (XModulePs
+   (EpAnn
+    (Anchor
+     { T20846.hs:1:1 }
+     (UnchangedAnchor))
+    (AnnsModule
+     [(AddEpAnn AnnModule (EpaSpan { T20846.hs:1:1-6 }))
+     ,(AddEpAnn AnnWhere (EpaSpan { T20846.hs:1:15-19 }))]
+     (AnnList
+      (Nothing)
+      (Nothing)
+      (Nothing)
+      []
+      []))
+    (EpaCommentsBalanced
      []
-     []))
-   (EpaCommentsBalanced
-    []
-    [(L
-      (Anchor
-       { T20846.hs:5:1 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaEofComment)
-       { T20846.hs:5:1 }))]))
-  (VirtualBraces
-   (1))
+     [(L
+       (Anchor
+        { T20846.hs:5:1 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaEofComment)
+        { T20846.hs:5:1 }))]))
+   (VirtualBraces
+    (1))
+   (Nothing)
+   (Nothing))
   (Just
    (L
     (SrcSpanAnn (EpAnnNotUsed) { T20846.hs:1:8-13 })
@@ -149,8 +152,6 @@
                    {OccName: undefined}))))))]
             (EmptyLocalBinds
              (NoExtField)))))]))
-      [])))]
-  (Nothing)
-  (Nothing)))
+      [])))]))
 
 
diff --git a/testsuite/tests/plugins/plugins01.hs b/testsuite/tests/plugins/plugins01.hs
index 7bb2ec7e2e..f39f7fc9f9 100644
--- a/testsuite/tests/plugins/plugins01.hs
+++ b/testsuite/tests/plugins/plugins01.hs
@@ -12,4 +12,4 @@ theMessage = "Wrong"
 main = do
     putStrLn "Program Started"
     putStrLn theMessage
-    putStrLn "Program Ended"
\ No newline at end of file
+    putStrLn "Program Ended"
diff --git a/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs b/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs
index 24ed240cfc..778d0974e0 100644
--- a/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs
+++ b/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs
@@ -33,8 +33,8 @@ parsedPlugin [name, "parse"] _ (ParsedResult pm msgs)
   = return (ParsedResult pm { hpm_module = removeParsedBinding name (hpm_module pm) } msgs)
 parsedPlugin _ _ parsed = return parsed
 
-removeParsedBinding :: String -> Located HsModule
-                         -> Located HsModule
+removeParsedBinding :: String -> Located (HsModule GhcPs)
+                         -> Located (HsModule GhcPs)
 removeParsedBinding name (L l m)
   = (L l (m { hsmodDecls = filter (notNamedAs name) (hsmodDecls m) } ))
   where notNamedAs name (L _ (ValD _ (FunBind { fun_id = L _ fid })))
diff --git a/testsuite/tests/printer/T18791.stderr b/testsuite/tests/printer/T18791.stderr
index 8d3588e7ec..f4264de86d 100644
--- a/testsuite/tests/printer/T18791.stderr
+++ b/testsuite/tests/printer/T18791.stderr
@@ -4,30 +4,33 @@
 (L
  { T18791.hs:1:1 }
  (HsModule
-  (EpAnn
-   (Anchor
-    { T18791.hs:1:1 }
-    (UnchangedAnchor))
-   (AnnsModule
-    [(AddEpAnn AnnModule (EpaSpan { T18791.hs:2:1-6 }))
-    ,(AddEpAnn AnnWhere (EpaSpan { T18791.hs:2:15-19 }))]
-    (AnnList
-     (Nothing)
-     (Nothing)
-     (Nothing)
+  (XModulePs
+   (EpAnn
+    (Anchor
+     { T18791.hs:1:1 }
+     (UnchangedAnchor))
+    (AnnsModule
+     [(AddEpAnn AnnModule (EpaSpan { T18791.hs:2:1-6 }))
+     ,(AddEpAnn AnnWhere (EpaSpan { T18791.hs:2:15-19 }))]
+     (AnnList
+      (Nothing)
+      (Nothing)
+      (Nothing)
+      []
+      []))
+    (EpaCommentsBalanced
      []
-     []))
-   (EpaCommentsBalanced
-    []
-    [(L
-      (Anchor
-       { T18791.hs:6:1 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaEofComment)
-       { T18791.hs:6:1 }))]))
-  (VirtualBraces
-   (1))
+     [(L
+       (Anchor
+        { T18791.hs:6:1 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaEofComment)
+        { T18791.hs:6:1 }))]))
+   (VirtualBraces
+    (1))
+   (Nothing)
+   (Nothing))
   (Just
    (L
     (SrcSpanAnn (EpAnnNotUsed) { T18791.hs:2:8-13 })
@@ -136,8 +139,6 @@
              (Unqual
               {OccName: T}))))
           (Nothing)))]
-       []))))]
-  (Nothing)
-  (Nothing)))
+       []))))]))
 
 
diff --git a/testsuite/tests/printer/Test20297.stdout b/testsuite/tests/printer/Test20297.stdout
index 2328e8201c..9bda031e23 100644
--- a/testsuite/tests/printer/Test20297.stdout
+++ b/testsuite/tests/printer/Test20297.stdout
@@ -4,37 +4,40 @@
 (L
  { Test20297.hs:1:1 }
  (HsModule
-  (EpAnn
-   (Anchor
-    { Test20297.hs:1:1 }
-    (UnchangedAnchor))
-   (AnnsModule
-    [(AddEpAnn AnnModule (EpaSpan { Test20297.hs:2:1-6 }))
-    ,(AddEpAnn AnnWhere (EpaSpan { Test20297.hs:2:18-22 }))]
-    (AnnList
-     (Nothing)
-     (Nothing)
-     (Nothing)
-     []
-     []))
-   (EpaCommentsBalanced
-    [(L
-      (Anchor
-       { Test20297.hs:1:1-33 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaBlockComment
-        "{-# OPTIONS -ddump-parsed-ast #-}")
-       { Test20297.hs:1:1 }))]
-    [(L
-      (Anchor
-       { Test20297.hs:12:1 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaEofComment)
-       { Test20297.hs:12:1 }))]))
-  (VirtualBraces
-   (1))
+  (XModulePs
+   (EpAnn
+    (Anchor
+     { Test20297.hs:1:1 }
+     (UnchangedAnchor))
+    (AnnsModule
+     [(AddEpAnn AnnModule (EpaSpan { Test20297.hs:2:1-6 }))
+     ,(AddEpAnn AnnWhere (EpaSpan { Test20297.hs:2:18-22 }))]
+     (AnnList
+      (Nothing)
+      (Nothing)
+      (Nothing)
+      []
+      []))
+    (EpaCommentsBalanced
+     [(L
+       (Anchor
+        { Test20297.hs:1:1-33 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaBlockComment
+         "{-# OPTIONS -ddump-parsed-ast #-}")
+        { Test20297.hs:1:1 }))]
+     [(L
+       (Anchor
+        { Test20297.hs:12:1 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaEofComment)
+        { Test20297.hs:12:1 }))]))
+   (VirtualBraces
+    (1))
+   (Nothing)
+   (Nothing))
   (Just
    (L
     (SrcSpanAnn (EpAnnNotUsed) { Test20297.hs:2:8-16 })
@@ -342,9 +345,7 @@
                          (NoExtField)))))]))
                   []))]}
               [])))))]))
-      [])))]
-  (Nothing)
-  (Nothing)))
+      [])))]))
 
 
 
@@ -353,37 +354,40 @@
 (L
  { Test20297.ppr.hs:1:1 }
  (HsModule
-  (EpAnn
-   (Anchor
-    { Test20297.ppr.hs:1:1 }
-    (UnchangedAnchor))
-   (AnnsModule
-    [(AddEpAnn AnnModule (EpaSpan { Test20297.ppr.hs:2:1-6 }))
-    ,(AddEpAnn AnnWhere (EpaSpan { Test20297.ppr.hs:2:18-22 }))]
-    (AnnList
-     (Nothing)
-     (Nothing)
-     (Nothing)
-     []
-     []))
-   (EpaCommentsBalanced
-    [(L
-      (Anchor
-       { Test20297.ppr.hs:1:1-33 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaBlockComment
-        "{-# OPTIONS -ddump-parsed-ast #-}")
-       { Test20297.ppr.hs:1:1 }))]
-    [(L
-      (Anchor
-       { Test20297.ppr.hs:9:25 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaEofComment)
-       { Test20297.ppr.hs:9:20 }))]))
-  (VirtualBraces
-   (1))
+  (XModulePs
+   (EpAnn
+    (Anchor
+     { Test20297.ppr.hs:1:1 }
+     (UnchangedAnchor))
+    (AnnsModule
+     [(AddEpAnn AnnModule (EpaSpan { Test20297.ppr.hs:2:1-6 }))
+     ,(AddEpAnn AnnWhere (EpaSpan { Test20297.ppr.hs:2:18-22 }))]
+     (AnnList
+      (Nothing)
+      (Nothing)
+      (Nothing)
+      []
+      []))
+    (EpaCommentsBalanced
+     [(L
+       (Anchor
+        { Test20297.ppr.hs:1:1-33 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaBlockComment
+         "{-# OPTIONS -ddump-parsed-ast #-}")
+        { Test20297.ppr.hs:1:1 }))]
+     [(L
+       (Anchor
+        { Test20297.ppr.hs:9:25 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaEofComment)
+        { Test20297.ppr.hs:9:20 }))]))
+   (VirtualBraces
+    (1))
+   (Nothing)
+   (Nothing))
   (Just
    (L
     (SrcSpanAnn (EpAnnNotUsed) { Test20297.ppr.hs:2:8-16 })
@@ -670,8 +674,6 @@
                          (NoExtField)))))]))
                   []))]}
               [])))))]))
-      [])))]
-  (Nothing)
-  (Nothing)))
+      [])))]))