Use GHC2021 as default language

39 files changed, 357 insertions, 341 deletions

diff --git a/testsuite/tests/parser/should_compile/DumpParsedAst.hs b/testsuite/tests/parser/should_compile/DumpParsedAst.hs
index f2bf433324..15b37b683c 100644
--- a/testsuite/tests/parser/should_compile/DumpParsedAst.hs
+++ b/testsuite/tests/parser/should_compile/DumpParsedAst.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE DataKinds, PolyKinds, TypeOperators, TypeFamilies
              , TypeApplications, TypeInType #-}
 
diff --git a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
index f19d67a1b2..640adcb50b 100644
--- a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
@@ -6,14 +6,14 @@
   (VirtualBraces
    (1))
   (Just
-   ({ DumpParsedAst.hs:4:8-20 }
+   ({ DumpParsedAst.hs:5:8-20 }
     {ModuleName: DumpParsedAst}))
   (Nothing)
-  [({ DumpParsedAst.hs:5:1-16 }
+  [({ DumpParsedAst.hs:6:1-16 }
     (ImportDecl
      (NoExtField)
      (NoSourceText)
-     ({ DumpParsedAst.hs:5:8-16 }
+     ({ DumpParsedAst.hs:6:8-16 }
       {ModuleName: Data.Kind})
      (Nothing)
      (NotBoot)
@@ -22,12 +22,12 @@
      (False)
      (Nothing)
      (Nothing)))]
-  [({ DumpParsedAst.hs:7:1-30 }
+  [({ DumpParsedAst.hs:8:1-30 }
     (TyClD
      (NoExtField)
      (DataDecl
       (NoExtField)
-      ({ DumpParsedAst.hs:7:6-10 }
+      ({ DumpParsedAst.hs:8:6-10 }
        (Unqual
         {OccName: Peano}))
       (HsQTvs
@@ -40,10 +40,10 @@
        (Nothing)
        (Nothing)
        (Nothing)
-       [({ DumpParsedAst.hs:7:14-17 }
+       [({ DumpParsedAst.hs:8:14-17 }
          (ConDeclH98
           (NoExtField)
-          ({ DumpParsedAst.hs:7:14-17 }
+          ({ DumpParsedAst.hs:8:14-17 }
            (Unqual
             {OccName: Zero}))
           ({ <no location info> }
@@ -54,10 +54,10 @@
            []
            [])
           (Nothing)))
-       ,({ DumpParsedAst.hs:7:21-30 }
+       ,({ DumpParsedAst.hs:8:21-30 }
          (ConDeclH98
           (NoExtField)
-          ({ DumpParsedAst.hs:7:21-24 }
+          ({ DumpParsedAst.hs:8:21-24 }
            (Unqual
             {OccName: Succ}))
           ({ <no location info> }
@@ -69,17 +69,17 @@
            [(HsScaled
              (HsLinearArrow
               (NormalSyntax))
-             ({ DumpParsedAst.hs:7:26-30 }
+             ({ DumpParsedAst.hs:8:26-30 }
               (HsTyVar
                (NoExtField)
                (NotPromoted)
-               ({ DumpParsedAst.hs:7:26-30 }
+               ({ DumpParsedAst.hs:8:26-30 }
                 (Unqual
                  {OccName: Peano})))))])
           (Nothing)))]
        ({ <no location info> }
         [])))))
-  ,({ DumpParsedAst.hs:9:1-39 }
+  ,({ DumpParsedAst.hs:10:1-39 }
     (TyClD
      (NoExtField)
      (FamDecl
@@ -88,154 +88,154 @@
        (NoExtField)
        (ClosedTypeFamily
         (Just
-         [({ DumpParsedAst.hs:10:3-36 }
+         [({ DumpParsedAst.hs:11:3-36 }
            (FamEqn
             (NoExtField)
-            ({ DumpParsedAst.hs:10:3-8 }
+            ({ DumpParsedAst.hs:11:3-8 }
              (Unqual
               {OccName: Length}))
             (HsOuterImplicit
              (NoExtField))
             [(HsValArg
-              ({ DumpParsedAst.hs:10:10-17 }
+              ({ DumpParsedAst.hs:11:10-17 }
                (HsParTy
                 (NoExtField)
-                ({ DumpParsedAst.hs:10:11-16 }
+                ({ DumpParsedAst.hs:11:11-16 }
                  (HsOpTy
                   (NoExtField)
-                  ({ DumpParsedAst.hs:10:11 }
+                  ({ DumpParsedAst.hs:11:11 }
                    (HsTyVar
                     (NoExtField)
                     (NotPromoted)
-                    ({ DumpParsedAst.hs:10:11 }
+                    ({ DumpParsedAst.hs:11:11 }
                      (Unqual
                       {OccName: a}))))
-                  ({ DumpParsedAst.hs:10:13 }
+                  ({ DumpParsedAst.hs:11:13 }
                    (Exact
                     {Name: :}))
-                  ({ DumpParsedAst.hs:10:15-16 }
+                  ({ DumpParsedAst.hs:11:15-16 }
                    (HsTyVar
                     (NoExtField)
                     (NotPromoted)
-                    ({ DumpParsedAst.hs:10:15-16 }
+                    ({ DumpParsedAst.hs:11:15-16 }
                      (Unqual
                       {OccName: as})))))))))]
             (Prefix)
-            ({ DumpParsedAst.hs:10:21-36 }
+            ({ DumpParsedAst.hs:11:21-36 }
              (HsAppTy
               (NoExtField)
-              ({ DumpParsedAst.hs:10:21-24 }
+              ({ DumpParsedAst.hs:11:21-24 }
                (HsTyVar
                 (NoExtField)
                 (NotPromoted)
-                ({ DumpParsedAst.hs:10:21-24 }
+                ({ DumpParsedAst.hs:11:21-24 }
                  (Unqual
                   {OccName: Succ}))))
-              ({ DumpParsedAst.hs:10:26-36 }
+              ({ DumpParsedAst.hs:11:26-36 }
                (HsParTy
                 (NoExtField)
-                ({ DumpParsedAst.hs:10:27-35 }
+                ({ DumpParsedAst.hs:11:27-35 }
                  (HsAppTy
                   (NoExtField)
-                  ({ DumpParsedAst.hs:10:27-32 }
+                  ({ DumpParsedAst.hs:11:27-32 }
                    (HsTyVar
                     (NoExtField)
                     (NotPromoted)
-                    ({ DumpParsedAst.hs:10:27-32 }
+                    ({ DumpParsedAst.hs:11:27-32 }
                      (Unqual
                       {OccName: Length}))))
-                  ({ DumpParsedAst.hs:10:34-35 }
+                  ({ DumpParsedAst.hs:11:34-35 }
                    (HsTyVar
                     (NoExtField)
                     (NotPromoted)
-                    ({ DumpParsedAst.hs:10:34-35 }
+                    ({ DumpParsedAst.hs:11:34-35 }
                      (Unqual
                       {OccName: as}))))))))))))
-         ,({ DumpParsedAst.hs:11:3-24 }
+         ,({ DumpParsedAst.hs:12:3-24 }
            (FamEqn
             (NoExtField)
-            ({ DumpParsedAst.hs:11:3-8 }
+            ({ DumpParsedAst.hs:12:3-8 }
              (Unqual
               {OccName: Length}))
             (HsOuterImplicit
              (NoExtField))
             [(HsValArg
-              ({ DumpParsedAst.hs:11:10-12 }
+              ({ DumpParsedAst.hs:12:10-12 }
                (HsExplicitListTy
                 (NoExtField)
                 (IsPromoted)
                 [])))]
             (Prefix)
-            ({ DumpParsedAst.hs:11:21-24 }
+            ({ DumpParsedAst.hs:12:21-24 }
              (HsTyVar
               (NoExtField)
               (NotPromoted)
-              ({ DumpParsedAst.hs:11:21-24 }
+              ({ DumpParsedAst.hs:12:21-24 }
                (Unqual
                 {OccName: Zero}))))))]))
-       ({ DumpParsedAst.hs:9:13-18 }
+       ({ DumpParsedAst.hs:10:13-18 }
         (Unqual
          {OccName: Length}))
        (HsQTvs
         (NoExtField)
-        [({ DumpParsedAst.hs:9:21-29 }
+        [({ DumpParsedAst.hs:10:21-29 }
           (KindedTyVar
            (NoExtField)
            (())
-           ({ DumpParsedAst.hs:9:21-22 }
+           ({ DumpParsedAst.hs:10:21-22 }
             (Unqual
              {OccName: as}))
-           ({ DumpParsedAst.hs:9:27-29 }
+           ({ DumpParsedAst.hs:10:27-29 }
             (HsListTy
              (NoExtField)
-             ({ DumpParsedAst.hs:9:28 }
+             ({ DumpParsedAst.hs:10:28 }
               (HsTyVar
                (NoExtField)
                (NotPromoted)
-               ({ DumpParsedAst.hs:9:28 }
+               ({ DumpParsedAst.hs:10:28 }
                 (Unqual
                  {OccName: k}))))))))])
        (Prefix)
-       ({ DumpParsedAst.hs:9:32-39 }
+       ({ DumpParsedAst.hs:10:32-39 }
         (KindSig
          (NoExtField)
-         ({ DumpParsedAst.hs:9:35-39 }
+         ({ DumpParsedAst.hs:10:35-39 }
           (HsTyVar
            (NoExtField)
            (NotPromoted)
-           ({ DumpParsedAst.hs:9:35-39 }
+           ({ DumpParsedAst.hs:10:35-39 }
             (Unqual
              {OccName: Peano}))))))
        (Nothing)))))
-  ,({ DumpParsedAst.hs:14:1-29 }
+  ,({ DumpParsedAst.hs:15:1-29 }
     (TyClD
      (NoExtField)
      (DataDecl
       (NoExtField)
-      ({ DumpParsedAst.hs:14:6 }
+      ({ DumpParsedAst.hs:15:6 }
        (Unqual
         {OccName: T}))
       (HsQTvs
        (NoExtField)
-       [({ DumpParsedAst.hs:14:8 }
+       [({ DumpParsedAst.hs:15:8 }
          (UserTyVar
           (NoExtField)
           (())
-          ({ DumpParsedAst.hs:14:8 }
+          ({ DumpParsedAst.hs:15:8 }
            (Unqual
             {OccName: f}))))
-       ,({ DumpParsedAst.hs:14:11-16 }
+       ,({ DumpParsedAst.hs:15:11-16 }
          (KindedTyVar
           (NoExtField)
           (())
-          ({ DumpParsedAst.hs:14:11 }
+          ({ DumpParsedAst.hs:15:11 }
            (Unqual
             {OccName: a}))
-          ({ DumpParsedAst.hs:14:16 }
+          ({ DumpParsedAst.hs:15:16 }
            (HsTyVar
             (NoExtField)
             (NotPromoted)
-            ({ DumpParsedAst.hs:14:16 }
+            ({ DumpParsedAst.hs:15:16 }
              (Unqual
               {OccName: k}))))))])
       (Prefix)
@@ -245,10 +245,10 @@
        (Nothing)
        (Nothing)
        (Nothing)
-       [({ DumpParsedAst.hs:14:21-29 }
+       [({ DumpParsedAst.hs:15:21-29 }
          (ConDeclH98
           (NoExtField)
-          ({ DumpParsedAst.hs:14:21-23 }
+          ({ DumpParsedAst.hs:15:21-23 }
            (Unqual
             {OccName: MkT}))
           ({ <no location info> }
@@ -260,30 +260,30 @@
            [(HsScaled
              (HsLinearArrow
               (NormalSyntax))
-             ({ DumpParsedAst.hs:14:25-29 }
+             ({ DumpParsedAst.hs:15:25-29 }
               (HsParTy
                (NoExtField)
-               ({ DumpParsedAst.hs:14:26-28 }
+               ({ DumpParsedAst.hs:15:26-28 }
                 (HsAppTy
                  (NoExtField)
-                 ({ DumpParsedAst.hs:14:26 }
+                 ({ DumpParsedAst.hs:15:26 }
                   (HsTyVar
                    (NoExtField)
                    (NotPromoted)
-                   ({ DumpParsedAst.hs:14:26 }
+                   ({ DumpParsedAst.hs:15:26 }
                     (Unqual
                      {OccName: f}))))
-                 ({ DumpParsedAst.hs:14:28 }
+                 ({ DumpParsedAst.hs:15:28 }
                   (HsTyVar
                    (NoExtField)
                    (NotPromoted)
-                   ({ DumpParsedAst.hs:14:28 }
+                   ({ DumpParsedAst.hs:15:28 }
                     (Unqual
                      {OccName: a})))))))))])
           (Nothing)))]
        ({ <no location info> }
         [])))))
-  ,({ DumpParsedAst.hs:16:1-48 }
+  ,({ DumpParsedAst.hs:17:1-48 }
     (TyClD
      (NoExtField)
      (FamDecl
@@ -292,150 +292,150 @@
        (NoExtField)
        (ClosedTypeFamily
         (Just
-         [({ DumpParsedAst.hs:17:3-30 }
+         [({ DumpParsedAst.hs:18:3-30 }
            (FamEqn
             (NoExtField)
-            ({ DumpParsedAst.hs:17:3-4 }
+            ({ DumpParsedAst.hs:18:3-4 }
              (Unqual
               {OccName: F1}))
             (HsOuterImplicit
              (NoExtField))
             [(HsTypeArg
-              { DumpParsedAst.hs:17:6-11 }
-              ({ DumpParsedAst.hs:17:7-11 }
+              { DumpParsedAst.hs:18:6-11 }
+              ({ DumpParsedAst.hs:18:7-11 }
                (HsTyVar
                 (NoExtField)
                 (NotPromoted)
-                ({ DumpParsedAst.hs:17:7-11 }
+                ({ DumpParsedAst.hs:18:7-11 }
                  (Unqual
                   {OccName: Peano})))))
             ,(HsValArg
-              ({ DumpParsedAst.hs:17:13 }
+              ({ DumpParsedAst.hs:18:13 }
                (HsTyVar
                 (NoExtField)
                 (NotPromoted)
-                ({ DumpParsedAst.hs:17:13 }
+                ({ DumpParsedAst.hs:18:13 }
                  (Unqual
                   {OccName: a})))))
             ,(HsValArg
-              ({ DumpParsedAst.hs:17:15 }
+              ({ DumpParsedAst.hs:18:15 }
                (HsTyVar
                 (NoExtField)
                 (NotPromoted)
-                ({ DumpParsedAst.hs:17:15 }
+                ({ DumpParsedAst.hs:18:15 }
                  (Unqual
                   {OccName: f})))))]
             (Prefix)
-            ({ DumpParsedAst.hs:17:19-30 }
+            ({ DumpParsedAst.hs:18:19-30 }
              (HsAppTy
               (NoExtField)
-              ({ DumpParsedAst.hs:17:19-28 }
+              ({ DumpParsedAst.hs:18:19-28 }
                (HsAppTy
                 (NoExtField)
-                ({ DumpParsedAst.hs:17:19-26 }
+                ({ DumpParsedAst.hs:18:19-26 }
                  (HsAppKindTy
-                  { DumpParsedAst.hs:17:21-26 }
-                  ({ DumpParsedAst.hs:17:19 }
+                  { DumpParsedAst.hs:18:21-26 }
+                  ({ DumpParsedAst.hs:18:19 }
                    (HsTyVar
                     (NoExtField)
                     (NotPromoted)
-                    ({ DumpParsedAst.hs:17:19 }
+                    ({ DumpParsedAst.hs:18:19 }
                      (Unqual
                       {OccName: T}))))
-                  ({ DumpParsedAst.hs:17:22-26 }
+                  ({ DumpParsedAst.hs:18:22-26 }
                    (HsTyVar
                     (NoExtField)
                     (NotPromoted)
-                    ({ DumpParsedAst.hs:17:22-26 }
+                    ({ DumpParsedAst.hs:18:22-26 }
                      (Unqual
                       {OccName: Peano}))))))
-                ({ DumpParsedAst.hs:17:28 }
+                ({ DumpParsedAst.hs:18:28 }
                  (HsTyVar
                   (NoExtField)
                   (NotPromoted)
-                  ({ DumpParsedAst.hs:17:28 }
+                  ({ DumpParsedAst.hs:18:28 }
                    (Unqual
                     {OccName: f}))))))
-              ({ DumpParsedAst.hs:17:30 }
+              ({ DumpParsedAst.hs:18:30 }
                (HsTyVar
                 (NoExtField)
                 (NotPromoted)
-                ({ DumpParsedAst.hs:17:30 }
+                ({ DumpParsedAst.hs:18:30 }
                  (Unqual
                   {OccName: a}))))))))]))
-       ({ DumpParsedAst.hs:16:13-14 }
+       ({ DumpParsedAst.hs:17:13-14 }
         (Unqual
          {OccName: F1}))
        (HsQTvs
         (NoExtField)
-        [({ DumpParsedAst.hs:16:17-22 }
+        [({ DumpParsedAst.hs:17:17-22 }
           (KindedTyVar
            (NoExtField)
            (())
-           ({ DumpParsedAst.hs:16:17 }
+           ({ DumpParsedAst.hs:17:17 }
             (Unqual
              {OccName: a}))
-           ({ DumpParsedAst.hs:16:22 }
+           ({ DumpParsedAst.hs:17:22 }
             (HsTyVar
              (NoExtField)
              (NotPromoted)
-             ({ DumpParsedAst.hs:16:22 }
+             ({ DumpParsedAst.hs:17:22 }
               (Unqual
                {OccName: k}))))))
-        ,({ DumpParsedAst.hs:16:26-39 }
+        ,({ DumpParsedAst.hs:17:26-39 }
           (KindedTyVar
            (NoExtField)
            (())
-           ({ DumpParsedAst.hs:16:26 }
+           ({ DumpParsedAst.hs:17:26 }
             (Unqual
              {OccName: f}))
-           ({ DumpParsedAst.hs:16:31-39 }
+           ({ DumpParsedAst.hs:17:31-39 }
             (HsFunTy
              (NoExtField)
              (HsUnrestrictedArrow
               (NormalSyntax))
-             ({ DumpParsedAst.hs:16:31 }
+             ({ DumpParsedAst.hs:17:31 }
               (HsTyVar
                (NoExtField)
                (NotPromoted)
-               ({ DumpParsedAst.hs:16:31 }
+               ({ DumpParsedAst.hs:17:31 }
                 (Unqual
                  {OccName: k}))))
-             ({ DumpParsedAst.hs:16:36-39 }
+             ({ DumpParsedAst.hs:17:36-39 }
               (HsTyVar
                (NoExtField)
                (NotPromoted)
-               ({ DumpParsedAst.hs:16:36-39 }
+               ({ DumpParsedAst.hs:17:36-39 }
                 (Unqual
                  {OccName: Type}))))))))])
        (Prefix)
-       ({ DumpParsedAst.hs:16:42-48 }
+       ({ DumpParsedAst.hs:17:42-48 }
         (KindSig
          (NoExtField)
-         ({ DumpParsedAst.hs:16:45-48 }
+         ({ DumpParsedAst.hs:17:45-48 }
           (HsTyVar
            (NoExtField)
            (NotPromoted)
-           ({ DumpParsedAst.hs:16:45-48 }
+           ({ DumpParsedAst.hs:17:45-48 }
             (Unqual
              {OccName: Type}))))))
        (Nothing)))))
-  ,({ DumpParsedAst.hs:19:1-23 }
+  ,({ DumpParsedAst.hs:20:1-23 }
     (ValD
      (NoExtField)
      (FunBind
       (NoExtField)
-      ({ DumpParsedAst.hs:19:1-4 }
+      ({ DumpParsedAst.hs:20:1-4 }
        (Unqual
         {OccName: main}))
       (MG
        (NoExtField)
-       ({ DumpParsedAst.hs:19:1-23 }
-        [({ DumpParsedAst.hs:19:1-23 }
+       ({ DumpParsedAst.hs:20:1-23 }
+        [({ DumpParsedAst.hs:20:1-23 }
           (Match
            (NoExtField)
            (FunRhs
-            ({ DumpParsedAst.hs:19:1-4 }
+            ({ DumpParsedAst.hs:20:1-4 }
              (Unqual
               {OccName: main}))
             (Prefix)
@@ -443,20 +443,20 @@
            []
            (GRHSs
             (NoExtField)
-            [({ DumpParsedAst.hs:19:6-23 }
+            [({ DumpParsedAst.hs:20:6-23 }
               (GRHS
                (NoExtField)
                []
-               ({ DumpParsedAst.hs:19:8-23 }
+               ({ DumpParsedAst.hs:20:8-23 }
                 (HsApp
                  (NoExtField)
-                 ({ DumpParsedAst.hs:19:8-15 }
+                 ({ DumpParsedAst.hs:20:8-15 }
                   (HsVar
                    (NoExtField)
-                   ({ DumpParsedAst.hs:19:8-15 }
+                   ({ DumpParsedAst.hs:20:8-15 }
                     (Unqual
                      {OccName: putStrLn}))))
-                 ({ DumpParsedAst.hs:19:17-23 }
+                 ({ DumpParsedAst.hs:20:17-23 }
                   (HsLit
                    (NoExtField)
                    (HsString
diff --git a/testsuite/tests/parser/should_compile/DumpRenamedAst.hs b/testsuite/tests/parser/should_compile/DumpRenamedAst.hs
index d5be8627be..a0cb8a36b6 100644
--- a/testsuite/tests/parser/should_compile/DumpRenamedAst.hs
+++ b/testsuite/tests/parser/should_compile/DumpRenamedAst.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE DataKinds, GADTs, PolyKinds, RankNTypes, TypeOperators,
              TypeFamilies, StarIsType, TypeApplications #-}
 
diff --git a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
index 57d4f3fcf7..ec4c1dd9bd 100644
--- a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
@@ -10,39 +10,39 @@
      [((,)
        (NonRecursive)
        {Bag(Located (HsBind Name)):
-        [({ DumpRenamedAst.hs:26:1-23 }
+        [({ DumpRenamedAst.hs:27:1-23 }
           (FunBind
            {NameSet:
             []}
-           ({ DumpRenamedAst.hs:26:1-4 }
+           ({ DumpRenamedAst.hs:27:1-4 }
             {Name: DumpRenamedAst.main})
            (MG
             (NoExtField)
-            ({ DumpRenamedAst.hs:26:1-23 }
-             [({ DumpRenamedAst.hs:26:1-23 }
+            ({ DumpRenamedAst.hs:27:1-23 }
+             [({ DumpRenamedAst.hs:27:1-23 }
                (Match
                 (NoExtField)
                 (FunRhs
-                 ({ DumpRenamedAst.hs:26:1-4 }
+                 ({ DumpRenamedAst.hs:27:1-4 }
                   {Name: DumpRenamedAst.main})
                  (Prefix)
                  (NoSrcStrict))
                 []
                 (GRHSs
                  (NoExtField)
-                 [({ DumpRenamedAst.hs:26:6-23 }
+                 [({ DumpRenamedAst.hs:27:6-23 }
                    (GRHS
                     (NoExtField)
                     []
-                    ({ DumpRenamedAst.hs:26:8-23 }
+                    ({ DumpRenamedAst.hs:27:8-23 }
                      (HsApp
                       (NoExtField)
-                      ({ DumpRenamedAst.hs:26:8-15 }
+                      ({ DumpRenamedAst.hs:27:8-15 }
                        (HsVar
                         (NoExtField)
-                        ({ DumpRenamedAst.hs:26:8-15 }
+                        ({ DumpRenamedAst.hs:27:8-15 }
                          {Name: System.IO.putStrLn})))
-                      ({ DumpRenamedAst.hs:26:17-23 }
+                      ({ DumpRenamedAst.hs:27:17-23 }
                        (HsLit
                         (NoExtField)
                         (HsString
@@ -58,13 +58,13 @@
    []
    [(TyClGroup
      (NoExtField)
-     [({ DumpRenamedAst.hs:9:1-30 }
+     [({ DumpRenamedAst.hs:10:1-30 }
        (DataDecl
         (DataDeclRn
          (True)
          {NameSet:
           [{Name: DumpRenamedAst.Peano}]})
-        ({ DumpRenamedAst.hs:9:6-10 }
+        ({ DumpRenamedAst.hs:10:6-10 }
          {Name: DumpRenamedAst.Peano})
         (HsQTvs
          []
@@ -76,10 +76,10 @@
          (Nothing)
          (Nothing)
          (Nothing)
-         [({ DumpRenamedAst.hs:9:14-17 }
+         [({ DumpRenamedAst.hs:10:14-17 }
            (ConDeclH98
             (NoExtField)
-            ({ DumpRenamedAst.hs:9:14-17 }
+            ({ DumpRenamedAst.hs:10:14-17 }
              {Name: DumpRenamedAst.Zero})
             ({ <no location info> }
              (False))
@@ -89,10 +89,10 @@
              []
              [])
             (Nothing)))
-         ,({ DumpRenamedAst.hs:9:21-30 }
+         ,({ DumpRenamedAst.hs:10:21-30 }
            (ConDeclH98
             (NoExtField)
-            ({ DumpRenamedAst.hs:9:21-24 }
+            ({ DumpRenamedAst.hs:10:21-24 }
              {Name: DumpRenamedAst.Succ})
             ({ <no location info> }
              (False))
@@ -103,11 +103,11 @@
              [(HsScaled
                (HsLinearArrow
                 (NormalSyntax))
-               ({ DumpRenamedAst.hs:9:26-30 }
+               ({ DumpRenamedAst.hs:10:26-30 }
                 (HsTyVar
                  (NoExtField)
                  (NotPromoted)
-                 ({ DumpRenamedAst.hs:9:26-30 }
+                 ({ DumpRenamedAst.hs:10:26-30 }
                   {Name: DumpRenamedAst.Peano}))))])
             (Nothing)))]
          ({ <no location info> }
@@ -117,118 +117,118 @@
      [])
    ,(TyClGroup
      (NoExtField)
-     [({ DumpRenamedAst.hs:11:1-39 }
+     [({ DumpRenamedAst.hs:12:1-39 }
        (FamDecl
         (NoExtField)
         (FamilyDecl
          (NoExtField)
          (ClosedTypeFamily
           (Just
-           [({ DumpRenamedAst.hs:12:3-36 }
+           [({ DumpRenamedAst.hs:13:3-36 }
              (FamEqn
               (NoExtField)
-              ({ DumpRenamedAst.hs:12:3-8 }
+              ({ DumpRenamedAst.hs:13:3-8 }
                {Name: DumpRenamedAst.Length})
               (HsOuterImplicit
                [{Name: a}
                ,{Name: as}])
               [(HsValArg
-                ({ DumpRenamedAst.hs:12:10-17 }
+                ({ DumpRenamedAst.hs:13:10-17 }
                  (HsParTy
                   (NoExtField)
-                  ({ DumpRenamedAst.hs:12:11-16 }
+                  ({ DumpRenamedAst.hs:13:11-16 }
                    (HsOpTy
                     (NoExtField)
-                    ({ DumpRenamedAst.hs:12:11 }
+                    ({ DumpRenamedAst.hs:13:11 }
                      (HsTyVar
                       (NoExtField)
                       (NotPromoted)
-                      ({ DumpRenamedAst.hs:12:11 }
+                      ({ DumpRenamedAst.hs:13:11 }
                        {Name: a})))
-                    ({ DumpRenamedAst.hs:12:13 }
+                    ({ DumpRenamedAst.hs:13:13 }
                      {Name: :})
-                    ({ DumpRenamedAst.hs:12:15-16 }
+                    ({ DumpRenamedAst.hs:13:15-16 }
                      (HsTyVar
                       (NoExtField)
                       (NotPromoted)
-                      ({ DumpRenamedAst.hs:12:15-16 }
+                      ({ DumpRenamedAst.hs:13:15-16 }
                        {Name: as}))))))))]
               (Prefix)
-              ({ DumpRenamedAst.hs:12:21-36 }
+              ({ DumpRenamedAst.hs:13:21-36 }
                (HsAppTy
                 (NoExtField)
-                ({ DumpRenamedAst.hs:12:21-24 }
+                ({ DumpRenamedAst.hs:13:21-24 }
                  (HsTyVar
                   (NoExtField)
                   (NotPromoted)
-                  ({ DumpRenamedAst.hs:12:21-24 }
+                  ({ DumpRenamedAst.hs:13:21-24 }
                    {Name: DumpRenamedAst.Succ})))
-                ({ DumpRenamedAst.hs:12:26-36 }
+                ({ DumpRenamedAst.hs:13:26-36 }
                  (HsParTy
                   (NoExtField)
-                  ({ DumpRenamedAst.hs:12:27-35 }
+                  ({ DumpRenamedAst.hs:13:27-35 }
                    (HsAppTy
                     (NoExtField)
-                    ({ DumpRenamedAst.hs:12:27-32 }
+                    ({ DumpRenamedAst.hs:13:27-32 }
                      (HsTyVar
                       (NoExtField)
                       (NotPromoted)
-                      ({ DumpRenamedAst.hs:12:27-32 }
+                      ({ DumpRenamedAst.hs:13:27-32 }
                        {Name: DumpRenamedAst.Length})))
-                    ({ DumpRenamedAst.hs:12:34-35 }
+                    ({ DumpRenamedAst.hs:13:34-35 }
                      (HsTyVar
                       (NoExtField)
                       (NotPromoted)
-                      ({ DumpRenamedAst.hs:12:34-35 }
+                      ({ DumpRenamedAst.hs:13:34-35 }
                        {Name: as})))))))))))
-           ,({ DumpRenamedAst.hs:13:3-24 }
+           ,({ DumpRenamedAst.hs:14:3-24 }
              (FamEqn
               (NoExtField)
-              ({ DumpRenamedAst.hs:13:3-8 }
+              ({ DumpRenamedAst.hs:14:3-8 }
                {Name: DumpRenamedAst.Length})
               (HsOuterImplicit
                [])
               [(HsValArg
-                ({ DumpRenamedAst.hs:13:10-12 }
+                ({ DumpRenamedAst.hs:14:10-12 }
                  (HsExplicitListTy
                   (NoExtField)
                   (IsPromoted)
                   [])))]
               (Prefix)
-              ({ DumpRenamedAst.hs:13:21-24 }
+              ({ DumpRenamedAst.hs:14:21-24 }
                (HsTyVar
                 (NoExtField)
                 (NotPromoted)
-                ({ DumpRenamedAst.hs:13:21-24 }
+                ({ DumpRenamedAst.hs:14:21-24 }
                  {Name: DumpRenamedAst.Zero})))))]))
-         ({ DumpRenamedAst.hs:11:13-18 }
+         ({ DumpRenamedAst.hs:12:13-18 }
           {Name: DumpRenamedAst.Length})
          (HsQTvs
           [{Name: k}]
-          [({ DumpRenamedAst.hs:11:21-29 }
+          [({ DumpRenamedAst.hs:12:21-29 }
             (KindedTyVar
              (NoExtField)
              (())
-             ({ DumpRenamedAst.hs:11:21-22 }
+             ({ DumpRenamedAst.hs:12:21-22 }
               {Name: as})
-             ({ DumpRenamedAst.hs:11:27-29 }
+             ({ DumpRenamedAst.hs:12:27-29 }
               (HsListTy
                (NoExtField)
-               ({ DumpRenamedAst.hs:11:28 }
+               ({ DumpRenamedAst.hs:12:28 }
                 (HsTyVar
                  (NoExtField)
                  (NotPromoted)
-                 ({ DumpRenamedAst.hs:11:28 }
+                 ({ DumpRenamedAst.hs:12:28 }
                   {Name: k})))))))])
          (Prefix)
-         ({ DumpRenamedAst.hs:11:32-39 }
+         ({ DumpRenamedAst.hs:12:32-39 }
           (KindSig
            (NoExtField)
-           ({ DumpRenamedAst.hs:11:35-39 }
+           ({ DumpRenamedAst.hs:12:35-39 }
             (HsTyVar
              (NoExtField)
              (NotPromoted)
-             ({ DumpRenamedAst.hs:11:35-39 }
+             ({ DumpRenamedAst.hs:12:35-39 }
               {Name: DumpRenamedAst.Peano})))))
          (Nothing))))]
      []
@@ -236,92 +236,92 @@
      [])
    ,(TyClGroup
      (NoExtField)
-     [({ DumpRenamedAst.hs:15:1-33 }
+     [({ DumpRenamedAst.hs:16:1-33 }
        (FamDecl
         (NoExtField)
         (FamilyDecl
          (NoExtField)
          (DataFamily)
-         ({ DumpRenamedAst.hs:15:13-15 }
+         ({ DumpRenamedAst.hs:16:13-15 }
           {Name: DumpRenamedAst.Nat})
          (HsQTvs
           [{Name: k}]
           [])
          (Prefix)
-         ({ DumpRenamedAst.hs:15:17-33 }
+         ({ DumpRenamedAst.hs:16:17-33 }
           (KindSig
            (NoExtField)
-           ({ DumpRenamedAst.hs:15:20-33 }
+           ({ DumpRenamedAst.hs:16:20-33 }
             (HsFunTy
              (NoExtField)
              (HsUnrestrictedArrow
               (NormalSyntax))
-             ({ DumpRenamedAst.hs:15:20 }
+             ({ DumpRenamedAst.hs:16:20 }
               (HsTyVar
                (NoExtField)
                (NotPromoted)
-               ({ DumpRenamedAst.hs:15:20 }
+               ({ DumpRenamedAst.hs:16:20 }
                 {Name: k})))
-             ({ DumpRenamedAst.hs:15:25-33 }
+             ({ DumpRenamedAst.hs:16:25-33 }
               (HsFunTy
                (NoExtField)
                (HsUnrestrictedArrow
                 (NormalSyntax))
-               ({ DumpRenamedAst.hs:15:25 }
+               ({ DumpRenamedAst.hs:16:25 }
                 (HsTyVar
                  (NoExtField)
                  (NotPromoted)
-                 ({ DumpRenamedAst.hs:15:25 }
+                 ({ DumpRenamedAst.hs:16:25 }
                   {Name: k})))
-               ({ DumpRenamedAst.hs:15:30-33 }
+               ({ DumpRenamedAst.hs:16:30-33 }
                 (HsTyVar
                  (NoExtField)
                  (NotPromoted)
-                 ({ DumpRenamedAst.hs:15:30-33 }
+                 ({ DumpRenamedAst.hs:16:30-33 }
                   {Name: GHC.Types.Type})))))))))
          (Nothing))))]
      []
      []
-     [({ DumpRenamedAst.hs:(18,1)-(19,45) }
+     [({ DumpRenamedAst.hs:(19,1)-(20,45) }
        (DataFamInstD
         (NoExtField)
         (DataFamInstDecl
          (FamEqn
           (NoExtField)
-          ({ DumpRenamedAst.hs:18:18-20 }
+          ({ DumpRenamedAst.hs:19:18-20 }
            {Name: DumpRenamedAst.Nat})
           (HsOuterImplicit
            [{Name: a}
            ,{Name: k}])
           [(HsValArg
-            ({ DumpRenamedAst.hs:18:22-37 }
+            ({ DumpRenamedAst.hs:19:22-37 }
              (HsParTy
               (NoExtField)
-              ({ DumpRenamedAst.hs:18:23-36 }
+              ({ DumpRenamedAst.hs:19:23-36 }
                (HsKindSig
                 (NoExtField)
-                ({ DumpRenamedAst.hs:18:23 }
+                ({ DumpRenamedAst.hs:19:23 }
                  (HsTyVar
                   (NoExtField)
                   (NotPromoted)
-                  ({ DumpRenamedAst.hs:18:23 }
+                  ({ DumpRenamedAst.hs:19:23 }
                    {Name: a})))
-                ({ DumpRenamedAst.hs:18:28-36 }
+                ({ DumpRenamedAst.hs:19:28-36 }
                  (HsFunTy
                   (NoExtField)
                   (HsUnrestrictedArrow
                    (NormalSyntax))
-                  ({ DumpRenamedAst.hs:18:28 }
+                  ({ DumpRenamedAst.hs:19:28 }
                    (HsTyVar
                     (NoExtField)
                     (NotPromoted)
-                    ({ DumpRenamedAst.hs:18:28 }
+                    ({ DumpRenamedAst.hs:19:28 }
                      {Name: k})))
-                  ({ DumpRenamedAst.hs:18:33-36 }
+                  ({ DumpRenamedAst.hs:19:33-36 }
                    (HsTyVar
                     (NoExtField)
                     (NotPromoted)
-                    ({ DumpRenamedAst.hs:18:33-36 }
+                    ({ DumpRenamedAst.hs:19:33-36 }
                      {Name: GHC.Types.Type}))))))))))]
           (Prefix)
           (HsDataDefn
@@ -330,43 +330,43 @@
            (Nothing)
            (Nothing)
            (Just
-            ({ DumpRenamedAst.hs:18:42-60 }
+            ({ DumpRenamedAst.hs:19:42-60 }
              (HsFunTy
               (NoExtField)
               (HsUnrestrictedArrow
                (NormalSyntax))
-              ({ DumpRenamedAst.hs:18:42-52 }
+              ({ DumpRenamedAst.hs:19:42-52 }
                (HsParTy
                 (NoExtField)
-                ({ DumpRenamedAst.hs:18:43-51 }
+                ({ DumpRenamedAst.hs:19:43-51 }
                  (HsFunTy
                   (NoExtField)
                   (HsUnrestrictedArrow
                    (NormalSyntax))
-                  ({ DumpRenamedAst.hs:18:43 }
+                  ({ DumpRenamedAst.hs:19:43 }
                    (HsTyVar
                     (NoExtField)
                     (NotPromoted)
-                    ({ DumpRenamedAst.hs:18:43 }
+                    ({ DumpRenamedAst.hs:19:43 }
                      {Name: k})))
-                  ({ DumpRenamedAst.hs:18:48-51 }
+                  ({ DumpRenamedAst.hs:19:48-51 }
                    (HsTyVar
                     (NoExtField)
                     (NotPromoted)
-                    ({ DumpRenamedAst.hs:18:48-51 }
+                    ({ DumpRenamedAst.hs:19:48-51 }
                      {Name: GHC.Types.Type})))))))
-              ({ DumpRenamedAst.hs:18:57-60 }
+              ({ DumpRenamedAst.hs:19:57-60 }
                (HsTyVar
                 (NoExtField)
                 (NotPromoted)
-                ({ DumpRenamedAst.hs:18:57-60 }
+                ({ DumpRenamedAst.hs:19:57-60 }
                  {Name: GHC.Types.Type}))))))
-           [({ DumpRenamedAst.hs:19:3-45 }
+           [({ DumpRenamedAst.hs:20:3-45 }
              (ConDeclGADT
               (NoExtField)
-              [({ DumpRenamedAst.hs:19:3-5 }
+              [({ DumpRenamedAst.hs:20:3-5 }
                 {Name: DumpRenamedAst.Nat})]
-              ({ DumpRenamedAst.hs:19:10-45 }
+              ({ DumpRenamedAst.hs:20:10-45 }
                (HsOuterImplicit
                 [{Name: f}
                 ,{Name: g}]))
@@ -375,112 +375,112 @@
                [(HsScaled
                  (HsUnrestrictedArrow
                   (NormalSyntax))
-                 ({ DumpRenamedAst.hs:19:10-34 }
+                 ({ DumpRenamedAst.hs:20:10-34 }
                   (HsParTy
                    (NoExtField)
-                   ({ DumpRenamedAst.hs:19:11-33 }
+                   ({ DumpRenamedAst.hs:20:11-33 }
                     (HsForAllTy
                      (NoExtField)
                      (HsForAllInvis
                       (NoExtField)
-                      [({ DumpRenamedAst.hs:19:18-19 }
+                      [({ DumpRenamedAst.hs:20:18-19 }
                         (UserTyVar
                          (NoExtField)
                          (SpecifiedSpec)
-                         ({ DumpRenamedAst.hs:19:18-19 }
+                         ({ DumpRenamedAst.hs:20:18-19 }
                           {Name: xx})))])
-                     ({ DumpRenamedAst.hs:19:22-33 }
+                     ({ DumpRenamedAst.hs:20:22-33 }
                       (HsFunTy
                        (NoExtField)
                        (HsUnrestrictedArrow
                         (NormalSyntax))
-                       ({ DumpRenamedAst.hs:19:22-25 }
+                       ({ DumpRenamedAst.hs:20:22-25 }
                         (HsAppTy
                          (NoExtField)
-                         ({ DumpRenamedAst.hs:19:22 }
+                         ({ DumpRenamedAst.hs:20:22 }
                           (HsTyVar
                            (NoExtField)
                            (NotPromoted)
-                           ({ DumpRenamedAst.hs:19:22 }
+                           ({ DumpRenamedAst.hs:20:22 }
                             {Name: f})))
-                         ({ DumpRenamedAst.hs:19:24-25 }
+                         ({ DumpRenamedAst.hs:20:24-25 }
                           (HsTyVar
                            (NoExtField)
                            (NotPromoted)
-                           ({ DumpRenamedAst.hs:19:24-25 }
+                           ({ DumpRenamedAst.hs:20:24-25 }
                             {Name: xx})))))
-                       ({ DumpRenamedAst.hs:19:30-33 }
+                       ({ DumpRenamedAst.hs:20:30-33 }
                         (HsAppTy
                          (NoExtField)
-                         ({ DumpRenamedAst.hs:19:30 }
+                         ({ DumpRenamedAst.hs:20:30 }
                           (HsTyVar
                            (NoExtField)
                            (NotPromoted)
-                           ({ DumpRenamedAst.hs:19:30 }
+                           ({ DumpRenamedAst.hs:20:30 }
                             {Name: g})))
-                         ({ DumpRenamedAst.hs:19:32-33 }
+                         ({ DumpRenamedAst.hs:20:32-33 }
                           (HsTyVar
                            (NoExtField)
                            (NotPromoted)
-                           ({ DumpRenamedAst.hs:19:32-33 }
+                           ({ DumpRenamedAst.hs:20:32-33 }
                             {Name: xx}))))))))))))])
-              ({ DumpRenamedAst.hs:19:39-45 }
+              ({ DumpRenamedAst.hs:20:39-45 }
                (HsAppTy
                 (NoExtField)
-                ({ DumpRenamedAst.hs:19:39-43 }
+                ({ DumpRenamedAst.hs:20:39-43 }
                  (HsAppTy
                   (NoExtField)
-                  ({ DumpRenamedAst.hs:19:39-41 }
+                  ({ DumpRenamedAst.hs:20:39-41 }
                    (HsTyVar
                     (NoExtField)
                     (NotPromoted)
-                    ({ DumpRenamedAst.hs:19:39-41 }
+                    ({ DumpRenamedAst.hs:20:39-41 }
                      {Name: DumpRenamedAst.Nat})))
-                  ({ DumpRenamedAst.hs:19:43 }
+                  ({ DumpRenamedAst.hs:20:43 }
                    (HsTyVar
                     (NoExtField)
                     (NotPromoted)
-                    ({ DumpRenamedAst.hs:19:43 }
+                    ({ DumpRenamedAst.hs:20:43 }
                      {Name: f})))))
-                ({ DumpRenamedAst.hs:19:45 }
+                ({ DumpRenamedAst.hs:20:45 }
                  (HsTyVar
                   (NoExtField)
                   (NotPromoted)
-                  ({ DumpRenamedAst.hs:19:45 }
+                  ({ DumpRenamedAst.hs:20:45 }
                    {Name: g})))))
               (Nothing)))]
            ({ <no location info> }
             []))))))])
    ,(TyClGroup
      (NoExtField)
-     [({ DumpRenamedAst.hs:21:1-29 }
+     [({ DumpRenamedAst.hs:22:1-29 }
        (DataDecl
         (DataDeclRn
          (False)
          {NameSet:
           [{Name: a}
           ,{Name: f}]})
-        ({ DumpRenamedAst.hs:21:6 }
+        ({ DumpRenamedAst.hs:22:6 }
          {Name: DumpRenamedAst.T})
         (HsQTvs
          [{Name: k}]
-         [({ DumpRenamedAst.hs:21:8 }
+         [({ DumpRenamedAst.hs:22:8 }
            (UserTyVar
             (NoExtField)
             (())
-            ({ DumpRenamedAst.hs:21:8 }
+            ({ DumpRenamedAst.hs:22:8 }
              {Name: f})))
-         ,({ DumpRenamedAst.hs:21:11-16 }
+         ,({ DumpRenamedAst.hs:22:11-16 }
            (KindedTyVar
             (NoExtField)
             (())
-            ({ DumpRenamedAst.hs:21:11 }
+            ({ DumpRenamedAst.hs:22:11 }
              {Name: a})
-            ({ DumpRenamedAst.hs:21:16 }
+            ({ DumpRenamedAst.hs:22:16 }
              (HsTyVar
               (NoExtField)
               (NotPromoted)
-              ({ DumpRenamedAst.hs:21:16 }
+              ({ DumpRenamedAst.hs:22:16 }
                {Name: k})))))])
         (Prefix)
         (HsDataDefn
@@ -489,10 +489,10 @@
          (Nothing)
          (Nothing)
          (Nothing)
-         [({ DumpRenamedAst.hs:21:21-29 }
+         [({ DumpRenamedAst.hs:22:21-29 }
            (ConDeclH98
             (NoExtField)
-            ({ DumpRenamedAst.hs:21:21-23 }
+            ({ DumpRenamedAst.hs:22:21-23 }
              {Name: DumpRenamedAst.MkT})
             ({ <no location info> }
              (False))
@@ -503,23 +503,23 @@
              [(HsScaled
                (HsLinearArrow
                 (NormalSyntax))
-               ({ DumpRenamedAst.hs:21:25-29 }
+               ({ DumpRenamedAst.hs:22:25-29 }
                 (HsParTy
                  (NoExtField)
-                 ({ DumpRenamedAst.hs:21:26-28 }
+                 ({ DumpRenamedAst.hs:22:26-28 }
                   (HsAppTy
                    (NoExtField)
-                   ({ DumpRenamedAst.hs:21:26 }
+                   ({ DumpRenamedAst.hs:22:26 }
                     (HsTyVar
                      (NoExtField)
                      (NotPromoted)
-                     ({ DumpRenamedAst.hs:21:26 }
+                     ({ DumpRenamedAst.hs:22:26 }
                       {Name: f})))
-                   ({ DumpRenamedAst.hs:21:28 }
+                   ({ DumpRenamedAst.hs:22:28 }
                     (HsTyVar
                      (NoExtField)
                      (NotPromoted)
-                     ({ DumpRenamedAst.hs:21:28 }
+                     ({ DumpRenamedAst.hs:22:28 }
                       {Name: a}))))))))])
             (Nothing)))]
          ({ <no location info> }
@@ -529,125 +529,125 @@
      [])
    ,(TyClGroup
      (NoExtField)
-     [({ DumpRenamedAst.hs:23:1-48 }
+     [({ DumpRenamedAst.hs:24:1-48 }
        (FamDecl
         (NoExtField)
         (FamilyDecl
          (NoExtField)
          (ClosedTypeFamily
           (Just
-           [({ DumpRenamedAst.hs:24:3-30 }
+           [({ DumpRenamedAst.hs:25:3-30 }
              (FamEqn
               (NoExtField)
-              ({ DumpRenamedAst.hs:24:3-4 }
+              ({ DumpRenamedAst.hs:25:3-4 }
                {Name: DumpRenamedAst.F1})
               (HsOuterImplicit
                [{Name: a}
                ,{Name: f}])
               [(HsTypeArg
-                { DumpRenamedAst.hs:24:6-11 }
-                ({ DumpRenamedAst.hs:24:7-11 }
+                { DumpRenamedAst.hs:25:6-11 }
+                ({ DumpRenamedAst.hs:25:7-11 }
                  (HsTyVar
                   (NoExtField)
                   (NotPromoted)
-                  ({ DumpRenamedAst.hs:24:7-11 }
+                  ({ DumpRenamedAst.hs:25:7-11 }
                    {Name: DumpRenamedAst.Peano}))))
               ,(HsValArg
-                ({ DumpRenamedAst.hs:24:13 }
+                ({ DumpRenamedAst.hs:25:13 }
                  (HsTyVar
                   (NoExtField)
                   (NotPromoted)
-                  ({ DumpRenamedAst.hs:24:13 }
+                  ({ DumpRenamedAst.hs:25:13 }
                    {Name: a}))))
               ,(HsValArg
-                ({ DumpRenamedAst.hs:24:15 }
+                ({ DumpRenamedAst.hs:25:15 }
                  (HsTyVar
                   (NoExtField)
                   (NotPromoted)
-                  ({ DumpRenamedAst.hs:24:15 }
+                  ({ DumpRenamedAst.hs:25:15 }
                    {Name: f}))))]
               (Prefix)
-              ({ DumpRenamedAst.hs:24:19-30 }
+              ({ DumpRenamedAst.hs:25:19-30 }
                (HsAppTy
                 (NoExtField)
-                ({ DumpRenamedAst.hs:24:19-28 }
+                ({ DumpRenamedAst.hs:25:19-28 }
                  (HsAppTy
                   (NoExtField)
-                  ({ DumpRenamedAst.hs:24:19-26 }
+                  ({ DumpRenamedAst.hs:25:19-26 }
                    (HsAppKindTy
-                    { DumpRenamedAst.hs:24:21-26 }
-                    ({ DumpRenamedAst.hs:24:19 }
+                    { DumpRenamedAst.hs:25:21-26 }
+                    ({ DumpRenamedAst.hs:25:19 }
                      (HsTyVar
                       (NoExtField)
                       (NotPromoted)
-                      ({ DumpRenamedAst.hs:24:19 }
+                      ({ DumpRenamedAst.hs:25:19 }
                        {Name: DumpRenamedAst.T})))
-                    ({ DumpRenamedAst.hs:24:22-26 }
+                    ({ DumpRenamedAst.hs:25:22-26 }
                      (HsTyVar
                       (NoExtField)
                       (NotPromoted)
-                      ({ DumpRenamedAst.hs:24:22-26 }
+                      ({ DumpRenamedAst.hs:25:22-26 }
                        {Name: DumpRenamedAst.Peano})))))
-                  ({ DumpRenamedAst.hs:24:28 }
+                  ({ DumpRenamedAst.hs:25:28 }
                    (HsTyVar
                     (NoExtField)
                     (NotPromoted)
-                    ({ DumpRenamedAst.hs:24:28 }
+                    ({ DumpRenamedAst.hs:25:28 }
                      {Name: f})))))
-                ({ DumpRenamedAst.hs:24:30 }
+                ({ DumpRenamedAst.hs:25:30 }
                  (HsTyVar
                   (NoExtField)
                   (NotPromoted)
-                  ({ DumpRenamedAst.hs:24:30 }
+                  ({ DumpRenamedAst.hs:25:30 }
                    {Name: a})))))))]))
-         ({ DumpRenamedAst.hs:23:13-14 }
+         ({ DumpRenamedAst.hs:24:13-14 }
           {Name: DumpRenamedAst.F1})
          (HsQTvs
           [{Name: k}]
-          [({ DumpRenamedAst.hs:23:17-22 }
+          [({ DumpRenamedAst.hs:24:17-22 }
             (KindedTyVar
              (NoExtField)
              (())
-             ({ DumpRenamedAst.hs:23:17 }
+             ({ DumpRenamedAst.hs:24:17 }
               {Name: a})
-             ({ DumpRenamedAst.hs:23:22 }
+             ({ DumpRenamedAst.hs:24:22 }
               (HsTyVar
                (NoExtField)
                (NotPromoted)
-               ({ DumpRenamedAst.hs:23:22 }
+               ({ DumpRenamedAst.hs:24:22 }
                 {Name: k})))))
-          ,({ DumpRenamedAst.hs:23:26-39 }
+          ,({ DumpRenamedAst.hs:24:26-39 }
             (KindedTyVar
              (NoExtField)
              (())
-             ({ DumpRenamedAst.hs:23:26 }
+             ({ DumpRenamedAst.hs:24:26 }
               {Name: f})
-             ({ DumpRenamedAst.hs:23:31-39 }
+             ({ DumpRenamedAst.hs:24:31-39 }
               (HsFunTy
                (NoExtField)
                (HsUnrestrictedArrow
                 (NormalSyntax))
-               ({ DumpRenamedAst.hs:23:31 }
+               ({ DumpRenamedAst.hs:24:31 }
                 (HsTyVar
                  (NoExtField)
                  (NotPromoted)
-                 ({ DumpRenamedAst.hs:23:31 }
+                 ({ DumpRenamedAst.hs:24:31 }
                   {Name: k})))
-               ({ DumpRenamedAst.hs:23:36-39 }
+               ({ DumpRenamedAst.hs:24:36-39 }
                 (HsTyVar
                  (NoExtField)
                  (NotPromoted)
-                 ({ DumpRenamedAst.hs:23:36-39 }
+                 ({ DumpRenamedAst.hs:24:36-39 }
                   {Name: GHC.Types.Type})))))))])
          (Prefix)
-         ({ DumpRenamedAst.hs:23:42-48 }
+         ({ DumpRenamedAst.hs:24:42-48 }
           (KindSig
            (NoExtField)
-           ({ DumpRenamedAst.hs:23:45-48 }
+           ({ DumpRenamedAst.hs:24:45-48 }
             (HsTyVar
              (NoExtField)
              (NotPromoted)
-             ({ DumpRenamedAst.hs:23:45-48 }
+             ({ DumpRenamedAst.hs:24:45-48 }
               {Name: GHC.Types.Type})))))
          (Nothing))))]
      []
@@ -661,11 +661,11 @@
    []
    []
    [])
-  [({ DumpRenamedAst.hs:4:8-21 }
+  [({ DumpRenamedAst.hs:5:8-21 }
     (ImportDecl
      (NoExtField)
      (NoSourceText)
-     ({ DumpRenamedAst.hs:4:8-21 }
+     ({ DumpRenamedAst.hs:5:8-21 }
       {ModuleName: Prelude})
      (Nothing)
      (NotBoot)
@@ -674,11 +674,11 @@
      (True)
      (Nothing)
      (Nothing)))
-  ,({ DumpRenamedAst.hs:5:1-16 }
+  ,({ DumpRenamedAst.hs:6:1-16 }
     (ImportDecl
      (NoExtField)
      (NoSourceText)
-     ({ DumpRenamedAst.hs:5:8-16 }
+     ({ DumpRenamedAst.hs:6:8-16 }
       {ModuleName: Data.Kind})
      (Nothing)
      (NotBoot)
@@ -687,11 +687,11 @@
      (False)
      (Nothing)
      (Nothing)))
-  ,({ DumpRenamedAst.hs:7:1-23 }
+  ,({ DumpRenamedAst.hs:8:1-23 }
     (ImportDecl
      (NoExtField)
      (NoSourceText)
-     ({ DumpRenamedAst.hs:7:8-16 }
+     ({ DumpRenamedAst.hs:8:8-16 }
       {ModuleName: Data.Kind})
      (Nothing)
      (NotBoot)
@@ -702,13 +702,13 @@
      (Just
       ((,)
        (False)
-       ({ DumpRenamedAst.hs:7:18-23 }
-        [({ DumpRenamedAst.hs:7:19-22 }
+       ({ DumpRenamedAst.hs:8:18-23 }
+        [({ DumpRenamedAst.hs:8:19-22 }
           (IEThingAbs
            (NoExtField)
-           ({ DumpRenamedAst.hs:7:19-22 }
+           ({ DumpRenamedAst.hs:8:19-22 }
             (IEName
-             ({ DumpRenamedAst.hs:7:19-22 }
+             ({ DumpRenamedAst.hs:8:19-22 }
               {Name: GHC.Types.Type})))))])))))]
   (Nothing)
   (Nothing)))
diff --git a/testsuite/tests/parser/should_compile/DumpTypecheckedAst.hs b/testsuite/tests/parser/should_compile/DumpTypecheckedAst.hs
index 82cf107e5d..202be3f110 100644
--- a/testsuite/tests/parser/should_compile/DumpTypecheckedAst.hs
+++ b/testsuite/tests/parser/should_compile/DumpTypecheckedAst.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE DataKinds, PolyKinds, TypeOperators, TypeFamilies
              , TypeApplications #-}
 
diff --git a/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr b/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr
index a9081bf7eb..45488ba165 100644
--- a/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr
@@ -691,7 +691,7 @@
             (HsStringPrim
              (NoSourceText)
              "DumpTypecheckedAst")))))))))))
- ,({ DumpTypecheckedAst.hs:18:1-23 }
+ ,({ DumpTypecheckedAst.hs:19:1-23 }
    (AbsBinds
     (NoExtField)
     []
@@ -705,10 +705,10 @@
        []))]
     [({abstract:TcEvBinds})]
     {Bag(Located (HsBind Var)):
-     [({ DumpTypecheckedAst.hs:18:1-23 }
+     [({ DumpTypecheckedAst.hs:19:1-23 }
        (FunBind
         (WpHole)
-        ({ DumpTypecheckedAst.hs:18:1-4 }
+        ({ DumpTypecheckedAst.hs:19:1-4 }
          {Var: main})
         (MG
          (MatchGroupTc
@@ -718,31 +718,31 @@
            [(TyConApp
              ({abstract:TyCon})
              [])]))
-         ({ DumpTypecheckedAst.hs:18:1-23 }
-          [({ DumpTypecheckedAst.hs:18:1-23 }
+         ({ DumpTypecheckedAst.hs:19:1-23 }
+          [({ DumpTypecheckedAst.hs:19:1-23 }
             (Match
              (NoExtField)
              (FunRhs
-              ({ DumpTypecheckedAst.hs:18:1-4 }
+              ({ DumpTypecheckedAst.hs:19:1-4 }
                {Name: main})
               (Prefix)
               (NoSrcStrict))
              []
              (GRHSs
               (NoExtField)
-              [({ DumpTypecheckedAst.hs:18:6-23 }
+              [({ DumpTypecheckedAst.hs:19:6-23 }
                 (GRHS
                  (NoExtField)
                  []
-                 ({ DumpTypecheckedAst.hs:18:8-23 }
+                 ({ DumpTypecheckedAst.hs:19:8-23 }
                   (HsApp
                    (NoExtField)
-                   ({ DumpTypecheckedAst.hs:18:8-15 }
+                   ({ DumpTypecheckedAst.hs:19:8-15 }
                     (HsVar
                      (NoExtField)
                      ({ <no location info> }
                       {Var: putStrLn})))
-                   ({ DumpTypecheckedAst.hs:18:17-23 }
+                   ({ DumpTypecheckedAst.hs:19:17-23 }
                     (HsLit
                      (NoExtField)
                      (HsString
diff --git a/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals1.hs b/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals1.hs
index 6b7de0f712..a46bb6f706 100644
--- a/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals1.hs
+++ b/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals1.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module ParserNoBinaryLiterals1 where
 
 f :: Int -> ()
diff --git a/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals1.stderr b/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals1.stderr
index 3b57330e59..d222e5d11c 100644
--- a/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals1.stderr
+++ b/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals1.stderr
@@ -1,5 +1,5 @@
 
-ParserNoBinaryLiterals1.hs:4:1:
+ParserNoBinaryLiterals1.hs:5:1: error:
     Equations for ‘f’ have different numbers of arguments
-      ParserNoBinaryLiterals1.hs:4:1-10
       ParserNoBinaryLiterals1.hs:5:1-10
+      ParserNoBinaryLiterals1.hs:6:1-10
diff --git a/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals2.hs b/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals2.hs
index e760bd888e..6c48c20746 100644
--- a/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals2.hs
+++ b/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals2.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE MagicHash #-}
 
 module ParserNoBinaryLiterals2 where
diff --git a/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals2.stderr b/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals2.stderr
index f592bc878b..d45f4b5502 100644
--- a/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals2.stderr
+++ b/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals2.stderr
@@ -1,5 +1,5 @@
 
-ParserNoBinaryLiterals2.hs:8:4: error:
+ParserNoBinaryLiterals2.hs:9:4: error:
     • The constructor ‘W#’ should have 1 argument, but has been given 2
     • In the pattern: W# 0 b0##
       In an equation for ‘f’: f (W# 0 b0##) = ()
diff --git a/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals3.hs b/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals3.hs
index b6bc81b68a..8797358879 100644
--- a/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals3.hs
+++ b/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals3.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE MagicHash #-}
 
 module ParserNoBinaryLiterals3 where
diff --git a/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals3.stderr b/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals3.stderr
index fbe4bf574c..2d24a6dedf 100644
--- a/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals3.stderr
+++ b/testsuite/tests/parser/should_fail/ParserNoBinaryLiterals3.stderr
@@ -1,5 +1,5 @@
 
-ParserNoBinaryLiterals3.hs:8:4: error:
+ParserNoBinaryLiterals3.hs:9:4: error:
     • The constructor ‘I#’ should have 1 argument, but has been given 2
     • In the pattern: I# 0 b0#
       In an equation for ‘f’: f (I# 0 b0#) = ()
diff --git a/testsuite/tests/parser/should_fail/ParserNoForallUnicode.hs b/testsuite/tests/parser/should_fail/ParserNoForallUnicode.hs
index e5591de2bf..883d3c841e 100644
--- a/testsuite/tests/parser/should_fail/ParserNoForallUnicode.hs
+++ b/testsuite/tests/parser/should_fail/ParserNoForallUnicode.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE UnicodeSyntax #-}
 
 module ParserNoForallUnicode where
diff --git a/testsuite/tests/parser/should_fail/ParserNoForallUnicode.stderr b/testsuite/tests/parser/should_fail/ParserNoForallUnicode.stderr
index 6ad0cbba11..81286aa49d 100644
--- a/testsuite/tests/parser/should_fail/ParserNoForallUnicode.stderr
+++ b/testsuite/tests/parser/should_fail/ParserNoForallUnicode.stderr
@@ -1,5 +1,5 @@
 
-ParserNoForallUnicode.hs:5:8: error:
+ParserNoForallUnicode.hs:6:8: error:
     Illegal symbol ‘∀’ in type
     Perhaps you intended to use RankNTypes or a similar language
     extension to enable explicit-forall syntax: ∀ <tvs>. <type>
diff --git a/testsuite/tests/parser/should_fail/RecordDotSyntaxFail12.hs b/testsuite/tests/parser/should_fail/RecordDotSyntaxFail12.hs
index ba7f7effed..6d306b747c 100644
--- a/testsuite/tests/parser/should_fail/RecordDotSyntaxFail12.hs
+++ b/testsuite/tests/parser/should_fail/RecordDotSyntaxFail12.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE AllowAmbiguousTypes, FunctionalDependencies, ScopedTypeVariables, PolyKinds, TypeApplications, DataKinds #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE OverloadedRecordDot, OverloadedRecordUpdate #-}
diff --git a/testsuite/tests/parser/should_fail/RecordDotSyntaxFail12.stderr b/testsuite/tests/parser/should_fail/RecordDotSyntaxFail12.stderr
index 6ef0a51754..f1101379ce 100644
--- a/testsuite/tests/parser/should_fail/RecordDotSyntaxFail12.stderr
+++ b/testsuite/tests/parser/should_fail/RecordDotSyntaxFail12.stderr
@@ -1,36 +1,36 @@
 
-RecordDotSyntaxFail12.hs:123:25:
+RecordDotSyntaxFail12.hs:124:25: error:
     Illegal use of punning for field ‘quux’
     Use NamedFieldPuns to permit this
 
-RecordDotSyntaxFail12.hs:123:46:
+RecordDotSyntaxFail12.hs:124:46: error:
     Illegal use of punning for field ‘baz’
     Use NamedFieldPuns to permit this
 
-RecordDotSyntaxFail12.hs:123:65:
+RecordDotSyntaxFail12.hs:124:65: error:
     Illegal use of punning for field ‘bar’
     Use NamedFieldPuns to permit this
 
-RecordDotSyntaxFail12.hs:124:11:
+RecordDotSyntaxFail12.hs:125:11: error:
     For this to work enable NamedFieldPuns.
 
-RecordDotSyntaxFail12.hs:125:11:
+RecordDotSyntaxFail12.hs:126:11: error:
     For this to work enable NamedFieldPuns.
 
-RecordDotSyntaxFail12.hs:126:11:
+RecordDotSyntaxFail12.hs:127:11: error:
     For this to work enable NamedFieldPuns.
 
-RecordDotSyntaxFail12.hs:127:11:
+RecordDotSyntaxFail12.hs:128:11: error:
     For this to work enable NamedFieldPuns.
 
-RecordDotSyntaxFail12.hs:129:11:
+RecordDotSyntaxFail12.hs:130:11: error:
     For this to work enable NamedFieldPuns.
 
-RecordDotSyntaxFail12.hs:132:11:
+RecordDotSyntaxFail12.hs:133:11: error:
     For this to work enable NamedFieldPuns.
 
-RecordDotSyntaxFail12.hs:133:11:
+RecordDotSyntaxFail12.hs:134:11: error:
     For this to work enable NamedFieldPuns.
 
-RecordDotSyntaxFail12.hs:134:11:
+RecordDotSyntaxFail12.hs:135:11: error:
     For this to work enable NamedFieldPuns.
diff --git a/testsuite/tests/parser/should_fail/T12446.hs b/testsuite/tests/parser/should_fail/T12446.hs
index 9f417e82da..83b0f4eecb 100644
--- a/testsuite/tests/parser/should_fail/T12446.hs
+++ b/testsuite/tests/parser/should_fail/T12446.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module T12446 where
 
 x = undefined @(_ ~ _)
diff --git a/testsuite/tests/parser/should_fail/T12446.stderr b/testsuite/tests/parser/should_fail/T12446.stderr
index 8e51913820..99a6f65e0b 100644
--- a/testsuite/tests/parser/should_fail/T12446.stderr
+++ b/testsuite/tests/parser/should_fail/T12446.stderr
@@ -1,4 +1,4 @@
 
-T12446.hs:3:5: error:
+T12446.hs:4:5: error:
     Illegal visible type application ‘@(_ ~ _)’
       Perhaps you intended to use TypeApplications
diff --git a/testsuite/tests/parser/should_fail/T12811.hs b/testsuite/tests/parser/should_fail/T12811.hs
index c82a830e65..8ef1fcf383 100644
--- a/testsuite/tests/parser/should_fail/T12811.hs
+++ b/testsuite/tests/parser/should_fail/T12811.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE RankNTypes #-}
 module Bug where
 
diff --git a/testsuite/tests/parser/should_fail/T12811.stderr b/testsuite/tests/parser/should_fail/T12811.stderr
index fab39d73cc..3dbf6bc342 100644
--- a/testsuite/tests/parser/should_fail/T12811.stderr
+++ b/testsuite/tests/parser/should_fail/T12811.stderr
@@ -1,7 +1,6 @@
 
-T12811.hs:4:15: error:
+T12811.hs:5:15: error:
     Illegal operator ‘.’ in type ‘foral a . a’
       Use TypeOperators to allow operators in types
 
-T12811.hs:4:15: error: Not in scope: type constructor or class ‘.’
-
+T12811.hs:5:15: error: Not in scope: type constructor or class ‘.’
diff --git a/testsuite/tests/parser/should_fail/T14588.hs b/testsuite/tests/parser/should_fail/T14588.hs
index 8a0bcecd7b..2c011c873d 100644
--- a/testsuite/tests/parser/should_fail/T14588.hs
+++ b/testsuite/tests/parser/should_fail/T14588.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module T14588 where
 
 main = print (let !x = 1 + 2 in x)
diff --git a/testsuite/tests/parser/should_fail/T14588.stderr b/testsuite/tests/parser/should_fail/T14588.stderr
index 2efd9561e8..d4bf505703 100644
--- a/testsuite/tests/parser/should_fail/T14588.stderr
+++ b/testsuite/tests/parser/should_fail/T14588.stderr
@@ -1,4 +1,4 @@
 
-T14588.hs:3:19: error:
+T14588.hs:4:19: error:
     Illegal bang-pattern (use BangPatterns):
     !x
diff --git a/testsuite/tests/parser/should_fail/T16270.hs b/testsuite/tests/parser/should_fail/T16270.hs
index 0147f9776a..4967eeb5ce 100644
--- a/testsuite/tests/parser/should_fail/T16270.hs
+++ b/testsuite/tests/parser/should_fail/T16270.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE NoTraditionalRecordSyntax, NoDoAndIfThenElse, NoMultiWayIf, NoLambdaCase, NoNumericUnderscores, MagicHash #-}
 {-# OPTIONS -Werror=missing-space-after-bang #-}
 
diff --git a/testsuite/tests/parser/should_fail/T16270.stderr b/testsuite/tests/parser/should_fail/T16270.stderr
index a74bdeb8f0..6aecc3b264 100644
--- a/testsuite/tests/parser/should_fail/T16270.stderr
+++ b/testsuite/tests/parser/should_fail/T16270.stderr
@@ -1,71 +1,68 @@
 
-T16270.hs:2:12: warning:
+T16270.hs:3:12: warning:
     -Werror=missing-space-after-bang is deprecated: bang patterns can no longer be written with a space
 
-T16270.hs:7:1: warning: [-Wtabs (in -Wdefault)]
+T16270.hs:8:1: warning: [-Wtabs (in -Wdefault)]
     Tab character found here, and in five further locations.
     Please use spaces instead.
 
-T16270.hs:7:12: error:
+T16270.hs:8:12: error:
     Unexpected semi-colons in conditional:
         if c then False; else True
     Perhaps you meant to use DoAndIfThenElse?
 
-T16270.hs:12:8: error:
+T16270.hs:13:8: error:
     Unexpected do block in function application:
         do 1
     You could write it with parentheses
     Or perhaps you meant to enable BlockArguments?
 
-T16270.hs:13:8: error:
+T16270.hs:14:8: error:
     Unexpected lambda expression in function application:
         \ x -> x
     You could write it with parentheses
     Or perhaps you meant to enable BlockArguments?
 
-T16270.hs:15:6: error:
-    Illegal datatype context (use DatatypeContexts): Num a =>
-
-T16270.hs:17:22: error:
+T16270.hs:18:22: error:
     Illegal record syntax (use TraditionalRecordSyntax): {fst :: a,
                                                           snd :: b}
 
-T16270.hs:18:5: error:
+T16270.hs:19:5: error:
     Illegal record syntax (use TraditionalRecordSyntax): p {fst = 1,
                                                             snd = True}
 
-T16270.hs:20:6: error:
+T16270.hs:21:6: error:
     Illegal symbol ‘forall’ in type
     Perhaps you intended to use RankNTypes or a similar language
     extension to enable explicit-forall syntax: forall <tvs>. <type>
 
-T16270.hs:21:8: error:
+T16270.hs:22:8: error:
     Unexpected semi-colons in conditional:
         if True; then (); else ()
     Perhaps you meant to use DoAndIfThenElse?
 
-T16270.hs:23:10: error:
+T16270.hs:24:10: error:
     Illegal keyword 'where' in data declaration
     Perhaps you intended to use GADTs or a similar language
     extension to enable syntax: data T where
 
-T16270.hs:25:12: error:
+T16270.hs:26:12: error:
     Illegal bang-pattern (use BangPatterns):
     !i
 
-T16270.hs:27:9: error:
+T16270.hs:28:9: error:
     Multi-way if-expressions need MultiWayIf turned on
 
-T16270.hs:29:9: error:
+T16270.hs:30:9: error:
     Multi-way if-expressions need MultiWayIf turned on
 
-T16270.hs:32:6: error: Illegal lambda-case (use LambdaCase)
+T16270.hs:33:6: error: Illegal lambda-case (use LambdaCase)
 
-T16270.hs:35:5: error:
+T16270.hs:36:5: error:
     Use NumericUnderscores to allow underscores in integer literals
 
-T16270.hs:37:5: error:
+T16270.hs:38:5: error:
     primitive string literal must contain only characters <= '\xFF'
 
-T16270.hs:43:1: error:
+T16270.hs:44:1: error:
     parse error (possibly incorrect indentation or mismatched brackets)
diff --git a/testsuite/tests/parser/should_fail/T17162.hs b/testsuite/tests/parser/should_fail/T17162.hs
index 6419da7544..6137b0eb5d 100644
--- a/testsuite/tests/parser/should_fail/T17162.hs
+++ b/testsuite/tests/parser/should_fail/T17162.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- {-# LANGUAGE NoBangPatterns #-}
 
 module T17162 where
diff --git a/testsuite/tests/parser/should_fail/T17162.stderr b/testsuite/tests/parser/should_fail/T17162.stderr
index d621e08ccc..ff6cfb99c4 100644
--- a/testsuite/tests/parser/should_fail/T17162.stderr
+++ b/testsuite/tests/parser/should_fail/T17162.stderr
@@ -1,4 +1,4 @@
 
-T17162.hs:6:21: error:
+T17162.hs:7:21: error:
     Illegal bang-pattern (use BangPatterns):
     !enc
diff --git a/testsuite/tests/parser/should_fail/T18251c.hs b/testsuite/tests/parser/should_fail/T18251c.hs
index da455fea64..a726df66df 100644
--- a/testsuite/tests/parser/should_fail/T18251c.hs
+++ b/testsuite/tests/parser/should_fail/T18251c.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module T18251c where
 
 f = id @Int
diff --git a/testsuite/tests/parser/should_fail/T18251c.stderr b/testsuite/tests/parser/should_fail/T18251c.stderr
index 9a7c66f8f3..b4f667d5dd 100644
--- a/testsuite/tests/parser/should_fail/T18251c.stderr
+++ b/testsuite/tests/parser/should_fail/T18251c.stderr
@@ -1,4 +1,4 @@
 
-T18251c.hs:3:5: error:
+T18251c.hs:4:5: error:
     Illegal visible type application ‘@Int’
       Perhaps you intended to use TypeApplications
diff --git a/testsuite/tests/parser/should_fail/T3095.hs b/testsuite/tests/parser/should_fail/T3095.hs
index 9c508eb81b..9a74893219 100644
--- a/testsuite/tests/parser/should_fail/T3095.hs
+++ b/testsuite/tests/parser/should_fail/T3095.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE KindSignatures #-}
 -- #3095
 module T3095 where
diff --git a/testsuite/tests/parser/should_fail/T3095.stderr b/testsuite/tests/parser/should_fail/T3095.stderr
index ea2ee44244..599579deb0 100644
--- a/testsuite/tests/parser/should_fail/T3095.stderr
+++ b/testsuite/tests/parser/should_fail/T3095.stderr
@@ -1,10 +1,10 @@
 
-T3095.hs:7:12: error:
+T3095.hs:8:12: error:
     Illegal symbol ‘forall’ in type
     Perhaps you intended to use RankNTypes or a similar language
     extension to enable explicit-forall syntax: forall <tvs>. <type>
 
-T3095.hs:7:12: error:
+T3095.hs:8:12: error:
     Unexpected type ‘forall x. x :: Type’
     In the class declaration for ‘Bla’
     A class declaration should have form
diff --git a/testsuite/tests/parser/should_fail/T8258NoGADTs.hs b/testsuite/tests/parser/should_fail/T8258NoGADTs.hs
index 1080233bcd..9ae035e7e7 100644
--- a/testsuite/tests/parser/should_fail/T8258NoGADTs.hs
+++ b/testsuite/tests/parser/should_fail/T8258NoGADTs.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module T8258NoGADTs where
 
 data T where
diff --git a/testsuite/tests/parser/should_fail/T8258NoGADTs.stderr b/testsuite/tests/parser/should_fail/T8258NoGADTs.stderr
index 35f5306274..ecf3f7e11b 100644
--- a/testsuite/tests/parser/should_fail/T8258NoGADTs.stderr
+++ b/testsuite/tests/parser/should_fail/T8258NoGADTs.stderr
@@ -1,5 +1,5 @@
 
-T8258NoGADTs.hs:3:8: error:
+T8258NoGADTs.hs:4:8: error:
     Illegal keyword 'where' in data declaration
     Perhaps you intended to use GADTs or a similar language
     extension to enable syntax: data T where
diff --git a/testsuite/tests/parser/should_fail/readFail036.hs b/testsuite/tests/parser/should_fail/readFail036.hs
index 15afd980f8..af2d1b3d0c 100644
--- a/testsuite/tests/parser/should_fail/readFail036.hs
+++ b/testsuite/tests/parser/should_fail/readFail036.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Foo where
 
 import Data.Kind (Type)
diff --git a/testsuite/tests/parser/should_fail/readFail036.stderr b/testsuite/tests/parser/should_fail/readFail036.stderr
index a66afacacf..469f5fb985 100644
--- a/testsuite/tests/parser/should_fail/readFail036.stderr
+++ b/testsuite/tests/parser/should_fail/readFail036.stderr
@@ -1,5 +1,5 @@
 
-readFail036.hs:5:16: error:
+readFail036.hs:6:16: error:
     Illegal kind signature: ‘Type’
       Perhaps you intended to use KindSignatures
     In the data type declaration for ‘Foo’
diff --git a/testsuite/tests/parser/should_fail/readFail037.hs b/testsuite/tests/parser/should_fail/readFail037.hs
index 499f5cc0f3..0155578c3e 100644
--- a/testsuite/tests/parser/should_fail/readFail037.hs
+++ b/testsuite/tests/parser/should_fail/readFail037.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 
 module Foo where
 
diff --git a/testsuite/tests/parser/should_fail/readFail037.stderr b/testsuite/tests/parser/should_fail/readFail037.stderr
index 6b317eb051..27e36ab344 100644
--- a/testsuite/tests/parser/should_fail/readFail037.stderr
+++ b/testsuite/tests/parser/should_fail/readFail037.stderr
@@ -1,5 +1,5 @@
 
-readFail037.hs:4:1: error:
+readFail037.hs:5:1: error:
     • Too many parameters for class ‘Foo’
       (Enable MultiParamTypeClasses to allow multi-parameter classes)
     • In the class declaration for ‘Foo’
diff --git a/testsuite/tests/parser/should_fail/readFail039.hs b/testsuite/tests/parser/should_fail/readFail039.hs
index c6cbdb9968..4aa2ff8d7f 100644
--- a/testsuite/tests/parser/should_fail/readFail039.hs
+++ b/testsuite/tests/parser/should_fail/readFail039.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 
 module Foo where
 
diff --git a/testsuite/tests/parser/should_fail/readFail039.stderr b/testsuite/tests/parser/should_fail/readFail039.stderr
index be948f0a07..0200cdabd6 100644
--- a/testsuite/tests/parser/should_fail/readFail039.stderr
+++ b/testsuite/tests/parser/should_fail/readFail039.stderr
@@ -1,6 +1,6 @@
 
-readFail039.hs:8:14: error:
-    Can't make a derived instance of ‘C Foo’:
-      ‘C’ is not a stock derivable class (Eq, Show, etc.)
-      Try GeneralizedNewtypeDeriving for GHC's newtype-deriving extension
-    In the newtype declaration for ‘Foo’
+readFail039.hs:9:14: error:
+    • Can't make a derived instance of ‘C Foo’:
+        ‘C’ is not a stock derivable class (Eq, Show, etc.)
+        Try GeneralizedNewtypeDeriving for GHC's newtype-deriving extension
+    • In the newtype declaration for ‘Foo’
diff --git a/testsuite/tests/parser/should_run/BinaryLiterals0.hs b/testsuite/tests/parser/should_run/BinaryLiterals0.hs
index 7257445fba..7dc44610a9 100644
--- a/testsuite/tests/parser/should_run/BinaryLiterals0.hs
+++ b/testsuite/tests/parser/should_run/BinaryLiterals0.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- | Anti-Test for GHC 7.10+'s @BinaryLiterals@ extensions (see GHC #9224)
 --
 -- NB: This code won't compile with -XBinaryLiterals enabled