Error message wibbles following TyClDecl/HsTyDefn refactoring

93 files changed, 1164 insertions, 1173 deletions

diff --git a/testsuite/tests/arrows/should_fail/T5380.stderr b/testsuite/tests/arrows/should_fail/T5380.stderr
index 7249be8f13..7e0004f95d 100644
--- a/testsuite/tests/arrows/should_fail/T5380.stderr
+++ b/testsuite/tests/arrows/should_fail/T5380.stderr
@@ -1,24 +1,24 @@
-
-T5380.hs:7:27:
-    Couldn't match expected type `not_bool' with actual type `Bool'
-      `not_bool' is a rigid type variable bound by
-                 the type signature for
-                   testB :: not_bool -> (() -> ()) -> () -> not_unit
-                 at T5380.hs:6:10
-    In the expression: b
-    In the expression: proc () -> if b then f -< () else f -< ()
-    In an equation for `testB':
-        testB b f = proc () -> if b then f -< () else f -< ()
-
-T5380.hs:7:34:
-    Couldn't match type `not_unit' with `()'
-      `not_unit' is a rigid type variable bound by
-                 the type signature for
-                   testB :: not_bool -> (() -> ()) -> () -> not_unit
-                 at T5380.hs:6:42
-    Expected type: () -> not_unit
-      Actual type: () -> ()
-    In the expression: f
-    In the expression: proc () -> if b then f -< () else f -< ()
-    In an equation for `testB':
-        testB b f = proc () -> if b then f -< () else f -< ()
+

+T5380.hs:7:27:

+    Couldn't match expected type `not_bool' with actual type `Bool'

+      `not_bool' is a rigid type variable bound by

+                 the type signature for

+                   testB :: not_bool -> (() -> ()) -> () -> not_unit

+                 at T5380.hs:6:10

+    In the expression: b

+    In the expression: proc () -> if b then f -< () else f -< ()

+    In an equation for `testB':

+        testB b f = proc () -> if b then f -< () else f -< ()

+

+T5380.hs:7:34:

+    Couldn't match type `not_unit' with `()'

+      `not_unit' is a rigid type variable bound by

+                 the type signature for

+                   testB :: not_bool -> (() -> ()) -> () -> not_unit

+                 at T5380.hs:6:10

+    Expected type: () -> not_unit

+      Actual type: () -> ()

+    In the expression: f

+    In the expression: proc () -> if b then f -< () else f -< ()

+    In an equation for `testB':

+        testB b f = proc () -> if b then f -< () else f -< ()

diff --git a/testsuite/tests/deriving/should_fail/T2604.stderr b/testsuite/tests/deriving/should_fail/T2604.stderr
index fa09654c5b..6cda6c36c6 100644
--- a/testsuite/tests/deriving/should_fail/T2604.stderr
+++ b/testsuite/tests/deriving/should_fail/T2604.stderr
@@ -2,7 +2,7 @@
 T2604.hs:7:35:

     Can't make a derived instance of `Typeable (DList a)':

       You need -XDeriveDataTypeable to derive an instance for this class

-    In the data type declaration for `DList'

+    In the data declaration for `DList'

 

 T2604.hs:9:38:

     Can't make a derived instance of `Typeable (NList a)':

diff --git a/testsuite/tests/deriving/should_fail/T2701.stderr b/testsuite/tests/deriving/should_fail/T2701.stderr
index d1a291336c..150add58c6 100644
--- a/testsuite/tests/deriving/should_fail/T2701.stderr
+++ b/testsuite/tests/deriving/should_fail/T2701.stderr
@@ -1,5 +1,5 @@
-
-T2701.hs:10:32:
-    Can't make a derived instance of `Data Foo':
-      Don't know how to derive `Data' for type `Int#'
-    In the data type declaration for `Foo'
+

+T2701.hs:10:32:

+    Can't make a derived instance of `Data Foo':

+      Don't know how to derive `Data' for type `Int#'

+    In the data declaration for `Foo'

diff --git a/testsuite/tests/deriving/should_fail/T3101.stderr b/testsuite/tests/deriving/should_fail/T3101.stderr
index 34f423daff..b491759381 100644
--- a/testsuite/tests/deriving/should_fail/T3101.stderr
+++ b/testsuite/tests/deriving/should_fail/T3101.stderr
@@ -1,6 +1,6 @@
-
-T3101.hs:9:12:
-    Can't make a derived instance of `Show Boom':
-      Constructor `Boom' must have a Haskell-98 type
-      Possible fix: use a standalone deriving declaration instead
-    In the data type declaration for `Boom'
+

+T3101.hs:9:12:

+    Can't make a derived instance of `Show Boom':

+      Constructor `Boom' must have a Haskell-98 type

+      Possible fix: use a standalone deriving declaration instead

+    In the data declaration for `Boom'

diff --git a/testsuite/tests/deriving/should_fail/T5478.stderr b/testsuite/tests/deriving/should_fail/T5478.stderr
index f6f00d5364..a49b188da7 100644
--- a/testsuite/tests/deriving/should_fail/T5478.stderr
+++ b/testsuite/tests/deriving/should_fail/T5478.stderr
@@ -1,5 +1,5 @@
-
-T5478.hs:6:38:
-    Can't make a derived instance of `Show Foo':
-      Don't know how to derive `Show' for type `ByteArray#'
-    In the data type declaration for `Foo'
+

+T5478.hs:6:38:

+    Can't make a derived instance of `Show Foo':

+      Don't know how to derive `Show' for type `ByteArray#'

+    In the data declaration for `Foo'

diff --git a/testsuite/tests/deriving/should_fail/T5686.stderr b/testsuite/tests/deriving/should_fail/T5686.stderr
index b8bec312ba..27f998fe9d 100644
--- a/testsuite/tests/deriving/should_fail/T5686.stderr
+++ b/testsuite/tests/deriving/should_fail/T5686.stderr
@@ -2,4 +2,4 @@
 T5686.hs:4:29:

     Can't make a derived instance of `Functor U':

       Constructor `U' must use the type variable only as the last argument of a data type

-    In the data type declaration for `U'

+    In the data declaration for `U'

diff --git a/testsuite/tests/deriving/should_fail/T5922.stderr b/testsuite/tests/deriving/should_fail/T5922.stderr
index 157cfc57ad..8b8de18d28 100644
--- a/testsuite/tests/deriving/should_fail/T5922.stderr
+++ b/testsuite/tests/deriving/should_fail/T5922.stderr
@@ -1,4 +1,4 @@
-
-T5922.hs:3:42:
-    Illegal deriving item `show'
-    In the data type declaration for `Proposition'
+

+T5922.hs:3:42:

+    Illegal deriving item `show'

+    In the data declaration for `Proposition'

diff --git a/testsuite/tests/deriving/should_fail/drvfail-foldable-traversable1.hs b/testsuite/tests/deriving/should_fail/drvfail-foldable-traversable1.hs
index ced3f98c63..84a0d75993 100644
--- a/testsuite/tests/deriving/should_fail/drvfail-foldable-traversable1.hs
+++ b/testsuite/tests/deriving/should_fail/drvfail-foldable-traversable1.hs
@@ -14,8 +14,8 @@ data Trivial2 a = Trivial2 a
 
 -- Foldable with function type
 data Infinite a = Infinite (Int -> a)
-   deriving (Functor,Foldable,Traversable)
+   deriving (Functor,Foldable)
 
 -- Foldable with function type
 data Cont r a = Cont ((a -> r) -> r)
-   deriving (Functor,Foldable,Traversable)
+   deriving (Functor,Traversable)
diff --git a/testsuite/tests/deriving/should_fail/drvfail-foldable-traversable1.stderr b/testsuite/tests/deriving/should_fail/drvfail-foldable-traversable1.stderr
index ecd20e8372..b9d1eb5591 100644
--- a/testsuite/tests/deriving/should_fail/drvfail-foldable-traversable1.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail-foldable-traversable1.stderr
@@ -1,38 +1,28 @@
-
-drvfail-foldable-traversable1.hs:9:23:
-    No instance for (Functor Trivial1)
-      arising from the 'deriving' clause of a data type declaration
-    Possible fix:
-      add an instance declaration for (Functor Trivial1)
-      or use a standalone 'deriving instance' declaration,
-           so you can specify the instance context yourself
-    When deriving the instance for (Traversable Trivial1)
-
-drvfail-foldable-traversable1.hs:13:22:
-    No instance for (Foldable Trivial2)
-      arising from the 'deriving' clause of a data type declaration
-    Possible fix:
-      add an instance declaration for (Foldable Trivial2)
-      or use a standalone 'deriving instance' declaration,
-           so you can specify the instance context yourself
-    When deriving the instance for (Traversable Trivial2)
-
-drvfail-foldable-traversable1.hs:17:22:
-    Can't make a derived instance of `Foldable Infinite':
-      Constructor `Infinite' must not contain function types
-    In the data type declaration for `Infinite'
-
-drvfail-foldable-traversable1.hs:17:31:
-    Can't make a derived instance of `Traversable Infinite':
-      Constructor `Infinite' must not contain function types
-    In the data type declaration for `Infinite'
-
-drvfail-foldable-traversable1.hs:21:22:
-    Can't make a derived instance of `Foldable (Cont r)':
-      Constructor `Cont' must not contain function types
-    In the data type declaration for `Cont'
-
-drvfail-foldable-traversable1.hs:21:31:
-    Can't make a derived instance of `Traversable (Cont r)':
-      Constructor `Cont' must not contain function types
-    In the data type declaration for `Cont'
+

+drvfail-foldable-traversable1.hs:9:23:

+    No instance for (Functor Trivial1)

+      arising from the 'deriving' clause of a data type declaration

+    Possible fix:

+      add an instance declaration for (Functor Trivial1)

+      or use a standalone 'deriving instance' declaration,

+           so you can specify the instance context yourself

+    When deriving the instance for (Traversable Trivial1)

+

+drvfail-foldable-traversable1.hs:13:22:

+    No instance for (Foldable Trivial2)

+      arising from the 'deriving' clause of a data type declaration

+    Possible fix:

+      add an instance declaration for (Foldable Trivial2)

+      or use a standalone 'deriving instance' declaration,

+           so you can specify the instance context yourself

+    When deriving the instance for (Traversable Trivial2)

+

+drvfail-foldable-traversable1.hs:17:22:

+    Can't make a derived instance of `Foldable Infinite':

+      Constructor `Infinite' must not contain function types

+    In the data declaration for `Infinite'

+

+drvfail-foldable-traversable1.hs:21:22:

+    Can't make a derived instance of `Traversable (Cont r)':

+      Constructor `Cont' must not contain function types

+    In the data declaration for `Cont'

diff --git a/testsuite/tests/deriving/should_fail/drvfail-functor1.stderr b/testsuite/tests/deriving/should_fail/drvfail-functor1.stderr
index d221f99f9d..54632ba05e 100644
--- a/testsuite/tests/deriving/should_fail/drvfail-functor1.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail-functor1.stderr
@@ -2,4 +2,4 @@
 drvfail-functor1.hs:6:14:

     Can't make a derived instance of `Functor List':

       You need -XDeriveFunctor to derive an instance for this class

-    In the data type declaration for `List'

+    In the data declaration for `List'

diff --git a/testsuite/tests/deriving/should_fail/drvfail-functor2.stderr b/testsuite/tests/deriving/should_fail/drvfail-functor2.stderr
index 030f6058f7..9c830aaec4 100644
--- a/testsuite/tests/deriving/should_fail/drvfail-functor2.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail-functor2.stderr
@@ -1,6 +1,6 @@
 

-drvfail-functor2.hs:1:29:

-    Warning: -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.

+drvfail-functor2.hs:1:29: Warning:

+    -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.

 

 drvfail-functor2.hs:7:14:

     Can't make a derived instance of `Functor InFunctionArgument':

@@ -20,7 +20,7 @@ drvfail-functor2.hs:15:14:
 drvfail-functor2.hs:20:14:

     Can't make a derived instance of `Functor StupidConstraint':

       Data type `StupidConstraint' must not have a class context (Eq a)

-    In the data type declaration for `StupidConstraint'

+    In the data declaration for `StupidConstraint'

 

 drvfail-functor2.hs:26:14:

     No instance for (Functor NoFunctor)

diff --git a/testsuite/tests/deriving/should_fail/drvfail005.stderr b/testsuite/tests/deriving/should_fail/drvfail005.stderr
index e27f3c1fd2..327eb7c3ce 100644
--- a/testsuite/tests/deriving/should_fail/drvfail005.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail005.stderr
@@ -2,4 +2,4 @@
 drvfail005.hs:4:13:

     Can't make a derived instance of `Show a (Test a)':

       `Show a' is not a class

-    In the data type declaration for `Test'

+    In the data declaration for `Test'

diff --git a/testsuite/tests/deriving/should_fail/drvfail010.stderr b/testsuite/tests/deriving/should_fail/drvfail010.stderr
index a61fb4892f..cf2baa644e 100644
--- a/testsuite/tests/deriving/should_fail/drvfail010.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail010.stderr
@@ -1,11 +1,11 @@
-
-drvfail010.hs:6:42:
-    Can't make a derived instance of
-      `Typeable (A a b c d e f g h i j)':
-      `A' must have 7 or fewer arguments
-    In the data type declaration for `A'
-
-drvfail010.hs:9:32:
-    Can't make a derived instance of `Typeable (B a b)':
-      `B' must only have arguments of kind `*'
-    In the data type declaration for `B'
+

+drvfail010.hs:6:42:

+    Can't make a derived instance of

+      `Typeable (A a b c d e f g h i j)':

+      `A' must have 7 or fewer arguments

+    In the data declaration for `A'

+

+drvfail010.hs:9:32:

+    Can't make a derived instance of `Typeable (B a b)':

+      `B' must only have arguments of kind `*'

+    In the data declaration for `B'

diff --git a/testsuite/tests/deriving/should_fail/drvfail014.stderr b/testsuite/tests/deriving/should_fail/drvfail014.stderr
index 865a78c44e..47b4aabf4b 100644
--- a/testsuite/tests/deriving/should_fail/drvfail014.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail014.stderr
@@ -1,9 +1,9 @@
-
-drvfail014.hs:8:28:
-    Use deriving( Typeable ) on a data type declaration
-    In the data type declaration for `T1'
-
-drvfail014.hs:12:1:
-    Derived typeable instance must be of form (Typeable2 T2)
-    In the stand-alone deriving instance for
-      `(Typeable a, Typeable b) => Typeable (T2 a b)'
+

+drvfail014.hs:8:28:

+    Use deriving( Typeable ) on a data type declaration

+    In the data declaration for `T1'

+

+drvfail014.hs:12:1:

+    Derived typeable instance must be of form (Typeable2 T2)

+    In the stand-alone deriving instance for

+      `(Typeable a, Typeable b) => Typeable (T2 a b)'

diff --git a/testsuite/tests/deriving/should_fail/drvfail016.hs-boot b/testsuite/tests/deriving/should_fail/drvfail016.hs-boot
index b3a388f736..6f3ed16636 100644
--- a/testsuite/tests/deriving/should_fail/drvfail016.hs-boot
+++ b/testsuite/tests/deriving/should_fail/drvfail016.hs-boot
@@ -3,5 +3,5 @@
 
 module A where
 
-data D
+data D = D
     deriving Show
diff --git a/testsuite/tests/deriving/should_fail/drvfail016.stderr b/testsuite/tests/deriving/should_fail/drvfail016.stderr
index 1bcb7363b1..bba7d0f0c4 100644
--- a/testsuite/tests/deriving/should_fail/drvfail016.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail016.stderr
@@ -1,4 +1,4 @@
-
-drvfail016.hs-boot:6:1:
-    Deriving not permitted in hs-boot file
-      Use an instance declaration instead
+

+drvfail016.hs-boot:7:14:

+    Deriving not permitted in hs-boot file

+      Use an instance declaration instead

diff --git a/testsuite/tests/gadt/T3163.stderr b/testsuite/tests/gadt/T3163.stderr
index e60ffcc47c..b93b523441 100644
--- a/testsuite/tests/gadt/T3163.stderr
+++ b/testsuite/tests/gadt/T3163.stderr
@@ -1,5 +1,5 @@
-
-T3163.hs:8:5:
-    Illegal polymorphic or qualified type: forall s. s
-    In the definition of data constructor `Unreached'
-    In the data type declaration for `Taker'
+

+T3163.hs:8:5:

+    Illegal polymorphic or qualified type: forall s. s

+    In the definition of data constructor `Unreached'

+    In the data declaration for `Taker'

diff --git a/testsuite/tests/gadt/gadt10.stderr b/testsuite/tests/gadt/gadt10.stderr
index b93128880b..00cb063d5d 100644
--- a/testsuite/tests/gadt/gadt10.stderr
+++ b/testsuite/tests/gadt/gadt10.stderr
@@ -1,6 +1,6 @@
-
-gadt10.hs:6:24:
-    Expecting one more argument to `RInt'
-    In the type `RInt'
-    In the definition of data constructor `R'
-    In the data type declaration for `RInt'
+

+gadt10.hs:6:24:

+    Expecting one more argument to `RInt'

+    In the type `RInt'

+    In the definition of data constructor `R'

+    In the data declaration for `RInt'

diff --git a/testsuite/tests/gadt/gadt11.stderr b/testsuite/tests/gadt/gadt11.stderr
index 721b148495..bfe38d43b3 100644
--- a/testsuite/tests/gadt/gadt11.stderr
+++ b/testsuite/tests/gadt/gadt11.stderr
@@ -1,6 +1,6 @@
-
-gadt11.hs:9:3:
-    Data constructor `B1' returns type `X []'
-      instead of an instance of its parent type `B a'
-    In the definition of data constructor `B1'
-    In the data type declaration for `B'
+

+gadt11.hs:9:3:

+    Data constructor `B1' returns type `X []'

+      instead of an instance of its parent type `B a'

+    In the definition of data constructor `B1'

+    In the data declaration for `B'

diff --git a/testsuite/tests/gadt/gadtSyntaxFail001.stderr b/testsuite/tests/gadt/gadtSyntaxFail001.stderr
index 363ad04d5a..aa837b7a89 100644
--- a/testsuite/tests/gadt/gadtSyntaxFail001.stderr
+++ b/testsuite/tests/gadt/gadtSyntaxFail001.stderr
@@ -1,6 +1,6 @@
-
-gadtSyntaxFail001.hs:8:5:
-    Data constructor `C2' has existential type variables, a context, or a specialised result type
-      (Use -XExistentialQuantification or -XGADTs to allow this)
-    In the definition of data constructor `C2'
-    In the data type declaration for `Foo'
+

+gadtSyntaxFail001.hs:8:5:

+    Data constructor `C2' has existential type variables, a context, or a specialised result type

+      (Use -XExistentialQuantification or -XGADTs to allow this)

+    In the definition of data constructor `C2'

+    In the data declaration for `Foo'

diff --git a/testsuite/tests/gadt/gadtSyntaxFail002.stderr b/testsuite/tests/gadt/gadtSyntaxFail002.stderr
index c8bdbab224..a2b101a977 100644
--- a/testsuite/tests/gadt/gadtSyntaxFail002.stderr
+++ b/testsuite/tests/gadt/gadtSyntaxFail002.stderr
@@ -1,6 +1,6 @@
-
-gadtSyntaxFail002.hs:8:5:
-    Data constructor `C2' has existential type variables, a context, or a specialised result type
-      (Use -XExistentialQuantification or -XGADTs to allow this)
-    In the definition of data constructor `C2'
-    In the data type declaration for `Foo'
+

+gadtSyntaxFail002.hs:8:5:

+    Data constructor `C2' has existential type variables, a context, or a specialised result type

+      (Use -XExistentialQuantification or -XGADTs to allow this)

+    In the definition of data constructor `C2'

+    In the data declaration for `Foo'

diff --git a/testsuite/tests/gadt/gadtSyntaxFail003.stderr b/testsuite/tests/gadt/gadtSyntaxFail003.stderr
index 436bb76ca2..3cd4611cd3 100644
--- a/testsuite/tests/gadt/gadtSyntaxFail003.stderr
+++ b/testsuite/tests/gadt/gadtSyntaxFail003.stderr
@@ -1,6 +1,6 @@
-
-gadtSyntaxFail003.hs:7:5:
-    Data constructor `C1' has existential type variables, a context, or a specialised result type
-      (Use -XExistentialQuantification or -XGADTs to allow this)
-    In the definition of data constructor `C1'
-    In the data type declaration for `Foo'
+

+gadtSyntaxFail003.hs:7:5:

+    Data constructor `C1' has existential type variables, a context, or a specialised result type

+      (Use -XExistentialQuantification or -XGADTs to allow this)

+    In the definition of data constructor `C1'

+    In the data declaration for `Foo'

diff --git a/testsuite/tests/gadt/records-fail1.stderr b/testsuite/tests/gadt/records-fail1.stderr
index 0ef628b5a6..829114e51f 100644
--- a/testsuite/tests/gadt/records-fail1.stderr
+++ b/testsuite/tests/gadt/records-fail1.stderr
@@ -1,5 +1,5 @@
-
-records-fail1.hs:7:1:
-    Constructors T1 and T4 have a common field `x',
-      but have different result types
-    In the data type declaration for `T'
+

+records-fail1.hs:7:1:

+    Constructors T1 and T4 have a common field `x',

+      but have different result types

+    In the data declaration for `T'

diff --git a/testsuite/tests/gadt/rw.stderr b/testsuite/tests/gadt/rw.stderr
index c6e800b910..418afad692 100644
--- a/testsuite/tests/gadt/rw.stderr
+++ b/testsuite/tests/gadt/rw.stderr
@@ -1,20 +1,20 @@
-
-rw.hs:14:47:
-    Couldn't match expected type `a' with actual type `Int'
-      `a' is a rigid type variable bound by
-          the type signature for writeInt :: T a -> IORef a -> IO ()
-          at rw.hs:12:14
-    In the second argument of `writeIORef', namely `(1 :: Int)'
-    In the expression: writeIORef ref (1 :: Int)
-    In a case alternative: ~(Li x) -> writeIORef ref (1 :: Int)
-
-rw.hs:19:51:
-    Couldn't match type `a' with `Bool'
-      `a' is a rigid type variable bound by
-          the type signature for readBool :: T a -> IORef a -> IO ()
-          at rw.hs:16:14
-    Expected type: a -> Bool
-      Actual type: Bool -> Bool
-    In the second argument of `(.)', namely `not'
-    In the second argument of `(>>=)', namely `(print . not)'
-    In the expression: readIORef ref >>= (print . not)
+

+rw.hs:14:47:

+    Couldn't match expected type `a' with actual type `Int'

+      `a' is a rigid type variable bound by

+          the type signature for writeInt :: T a -> IORef a -> IO ()

+          at rw.hs:12:12

+    In the second argument of `writeIORef', namely `(1 :: Int)'

+    In the expression: writeIORef ref (1 :: Int)

+    In a case alternative: ~(Li x) -> writeIORef ref (1 :: Int)

+

+rw.hs:19:51:

+    Couldn't match type `a' with `Bool'

+      `a' is a rigid type variable bound by

+          the type signature for readBool :: T a -> IORef a -> IO ()

+          at rw.hs:16:12

+    Expected type: a -> Bool

+      Actual type: Bool -> Bool

+    In the second argument of `(.)', namely `not'

+    In the second argument of `(>>=)', namely `(print . not)'

+    In the expression: readIORef ref >>= (print . not)

diff --git a/testsuite/tests/generics/GenCannotDoRep0.stderr b/testsuite/tests/generics/GenCannotDoRep0.stderr
index b5d2f01381..a12602d861 100644
--- a/testsuite/tests/generics/GenCannotDoRep0.stderr
+++ b/testsuite/tests/generics/GenCannotDoRep0.stderr
@@ -1,5 +1,5 @@
-
-GenCannotDoRep0.hs:9:45:
-    Can't make a derived instance of `Generic Dynamic':
-      Dynamic must be a vanilla data constructor
-    In the data type declaration for `Dynamic'
+

+GenCannotDoRep0.hs:9:45:

+    Can't make a derived instance of `Generic Dynamic':

+      Dynamic must be a vanilla data constructor

+    In the data declaration for `Dynamic'

diff --git a/testsuite/tests/generics/GenCannotDoRep1.stderr b/testsuite/tests/generics/GenCannotDoRep1.stderr
index 477a2955ce..dde1d5b0d8 100644
--- a/testsuite/tests/generics/GenCannotDoRep1.stderr
+++ b/testsuite/tests/generics/GenCannotDoRep1.stderr
@@ -1,8 +1,8 @@
-
-GenCannotDoRep1.hs:1:29:
-    Warning: -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
-
-GenCannotDoRep1.hs:8:49:
-    Can't make a derived instance of `Generic (Context a)':
-      Context must not have a datatype context
-    In the data type declaration for `Context'
+

+GenCannotDoRep1.hs:1:29: Warning:

+    -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.

+

+GenCannotDoRep1.hs:8:49:

+    Can't make a derived instance of `Generic (Context a)':

+      Context must not have a datatype context

+    In the data declaration for `Context'

diff --git a/testsuite/tests/ghci/scripts/Defer02.stderr b/testsuite/tests/ghci/scripts/Defer02.stderr
index 831da73914..005e85cb5f 100644
--- a/testsuite/tests/ghci/scripts/Defer02.stderr
+++ b/testsuite/tests/ghci/scripts/Defer02.stderr
@@ -1,91 +1,91 @@
-
-../../typecheck/should_run/Defer01.hs:11:40: Warning:
-    Couldn't match type `Char' with `[Char]'
-    Expected type: String
-      Actual type: Char
-    In the first argument of `putStr', namely ','
-    In the second argument of `(>>)', namely putStr ','
-    In the expression: putStr "Hello World" >> putStr ','
-
-../../typecheck/should_run/Defer01.hs:14:5: Warning:
-    Couldn't match expected type `Int' with actual type `Char'
-    In the expression: 'p'
-    In an equation for `a': a = 'p'
-
-../../typecheck/should_run/Defer01.hs:18:9: Warning:
-    No instance for (Eq B) arising from a use of `=='
-    Possible fix: add an instance declaration for (Eq B)
-    In the expression: x == x
-    In an equation for `b': b x = x == x
-
-../../typecheck/should_run/Defer01.hs:28:5: Warning:
-    No instance for (Num (a -> a)) arising from the literal `1'
-    Possible fix: add an instance declaration for (Num (a -> a))
-    In the expression: 1
-    In an equation for `d': d = 1
-
-../../typecheck/should_run/Defer01.hs:31:5: Warning:
-    Couldn't match expected type `Char -> t' with actual type `Char'
-    The function `e' is applied to one argument,
-    but its type `Char' has none
-    In the expression: e 'q'
-    In an equation for `f': f = e 'q'
-
-../../typecheck/should_run/Defer01.hs:34:8: Warning:
-    Couldn't match expected type `a' with actual type `Char'
-      `a' is a rigid type variable bound by
-          the type signature for h :: a -> (Char, Char)
-          at ../../typecheck/should_run/Defer01.hs:33:6
-    In the expression: x
-    In the expression: (x, 'c')
-    In an equation for `h': h x = (x, 'c')
-
-../../typecheck/should_run/Defer01.hs:39:17: Warning:
-    Couldn't match expected type `Bool' with actual type `T a'
-    In the return type of a call of `K'
-    In the first argument of `not', namely `(K a)'
-    In the expression: (not (K a))
-
-../../typecheck/should_run/Defer01.hs:43:5: Warning:
-    No instance for (MyClass a1) arising from a use of `myOp'
-    In the expression: myOp 23
-    In an equation for `j': j = myOp 23
-
-../../typecheck/should_run/Defer01.hs:43:10: Warning:
-    No instance for (Num a1) arising from the literal `23'
-    The type variable `a1' is ambiguous
-    Possible fix: add a type signature that fixes these type variable(s)
-    Note: there are several potential instances:
-      instance Num Double -- Defined in `GHC.Float'
-      instance Num Float -- Defined in `GHC.Float'
-      instance Num Int -- Defined in `GHC.Num'
-      ...plus one other
-    In the first argument of `myOp', namely `23'
-    In the expression: myOp 23
-    In an equation for `j': j = myOp 23
-
-../../typecheck/should_run/Defer01.hs:46:7: Warning:
-    Couldn't match expected type `Bool' with actual type `Int'
-    In the expression: x
-    In an equation for `k': k x = x
-
-../../typecheck/should_run/Defer01.hs:49:5: Warning:
-    Couldn't match expected type `IO a0'
-                with actual type `Char -> IO ()'
-    In the first argument of `(>>)', namely `putChar'
-    In the expression: putChar >> putChar 'p'
-    In an equation for `l': l = putChar >> putChar 'p'
-
-<interactive>:8:11:
-    Couldn't match type `Bool' with `Int'
-    Expected type: C Int
-      Actual type: C Bool
-    In the return type of a call of `C2'
-    In the first argument of `c', namely `(C2 True)'
-    In the first argument of `print', namely `(c (C2 True))'
-
-<interactive>:14:8:
-    Couldn't match expected type `Bool' with actual type `Int'
-    In the first argument of `print', namely `(k 2)'
-    In the expression: print (k 2)
-    In an equation for `it': it = print (k 2)
+

+../../typecheck/should_run/Defer01.hs:11:40: Warning:

+    Couldn't match type `Char' with `[Char]'

+    Expected type: String

+      Actual type: Char

+    In the first argument of `putStr', namely ','

+    In the second argument of `(>>)', namely putStr ','

+    In the expression: putStr "Hello World" >> putStr ','

+

+../../typecheck/should_run/Defer01.hs:14:5: Warning:

+    Couldn't match expected type `Int' with actual type `Char'

+    In the expression: 'p'

+    In an equation for `a': a = 'p'

+

+../../typecheck/should_run/Defer01.hs:18:9: Warning:

+    No instance for (Eq B) arising from a use of `=='

+    Possible fix: add an instance declaration for (Eq B)

+    In the expression: x == x

+    In an equation for `b': b x = x == x

+

+../../typecheck/should_run/Defer01.hs:28:5: Warning:

+    No instance for (Num (a -> a)) arising from the literal `1'

+    Possible fix: add an instance declaration for (Num (a -> a))

+    In the expression: 1

+    In an equation for `d': d = 1

+

+../../typecheck/should_run/Defer01.hs:31:5: Warning:

+    Couldn't match expected type `Char -> t' with actual type `Char'

+    The function `e' is applied to one argument,

+    but its type `Char' has none

+    In the expression: e 'q'

+    In an equation for `f': f = e 'q'

+

+../../typecheck/should_run/Defer01.hs:34:8: Warning:

+    Couldn't match expected type `a' with actual type `Char'

+      `a' is a rigid type variable bound by

+          the type signature for h :: a -> (Char, Char)

+          at ../../typecheck/should_run/Defer01.hs:33:6

+    In the expression: x

+    In the expression: (x, 'c')

+    In an equation for `h': h x = (x, 'c')

+

+../../typecheck/should_run/Defer01.hs:39:17: Warning:

+    Couldn't match expected type `Bool' with actual type `T a'

+    In the return type of a call of `K'

+    In the first argument of `not', namely `(K a)'

+    In the expression: (not (K a))

+

+../../typecheck/should_run/Defer01.hs:43:5: Warning:

+    No instance for (MyClass a1) arising from a use of `myOp'

+    In the expression: myOp 23

+    In an equation for `j': j = myOp 23

+

+../../typecheck/should_run/Defer01.hs:43:10: Warning:

+    No instance for (Num a1) arising from the literal `23'

+    The type variable `a1' is ambiguous

+    Possible fix: add a type signature that fixes these type variable(s)

+    Note: there are several potential instances:

+      instance Num Double -- Defined in `GHC.Float'

+      instance Num Float -- Defined in `GHC.Float'

+      instance Num Int -- Defined in `GHC.Num'

+      ...plus one other

+    In the first argument of `myOp', namely `23'

+    In the expression: myOp 23

+    In an equation for `j': j = myOp 23

+

+../../typecheck/should_run/Defer01.hs:46:7: Warning:

+    Couldn't match expected type `Bool' with actual type `Int'

+    In the expression: x

+    In an equation for `k': k x = x

+

+../../typecheck/should_run/Defer01.hs:49:5: Warning:

+    Couldn't match expected type `IO a0'

+                with actual type `Char -> IO ()'

+    In the first argument of `(>>)', namely `putChar'

+    In the expression: putChar >> putChar 'p'

+    In an equation for `l': l = putChar >> putChar 'p'

+

+<interactive>:8:11:

+    Couldn't match type `Bool' with `Int'

+    Expected type: C Int

+      Actual type: C Bool

+    In the return type of a call of `C2'

+    In the first argument of `c', namely `(C2 True)'

+    In the first argument of `print', namely `(c (C2 True))'

+

+<interactive>:14:8:

+    Couldn't match expected type `Bool' with actual type `Int'

+    In the first argument of `print', namely `(k 2)'

+    In the expression: print (k 2)

+    In an equation for `it': it = print (k 2)

diff --git a/testsuite/tests/ghci/scripts/Defer02.stdout b/testsuite/tests/ghci/scripts/Defer02.stdout
index 32e51d6d65..1061a95241 100644
--- a/testsuite/tests/ghci/scripts/Defer02.stdout
+++ b/testsuite/tests/ghci/scripts/Defer02.stdout
@@ -1,59 +1,59 @@
-Hello World*** Exception: ../../typecheck/should_run/Defer01.hs:11:40:
-    Couldn't match type `Char' with `[Char]'
-    Expected type: String
-      Actual type: Char
-    In the first argument of `putStr', namely ','
-    In the second argument of `(>>)', namely putStr ','
-    In the expression: putStr "Hello World" >> putStr ','
-(deferred type error)
-*** Exception: ../../typecheck/should_run/Defer01.hs:14:5:
-    Couldn't match expected type `Int' with actual type `Char'
-    In the expression: 'p'
-    In an equation for `a': a = 'p'
-(deferred type error)
-*** Exception: ../../typecheck/should_run/Defer01.hs:18:9:
-    No instance for (Eq B) arising from a use of `=='
-    Possible fix: add an instance declaration for (Eq B)
-    In the expression: x == x
-    In an equation for `b': b x = x == x
-(deferred type error)
-*** Exception: ../../typecheck/should_run/Defer01.hs:28:5:
-    No instance for (Num (a -> a)) arising from the literal `1'
-    Possible fix: add an instance declaration for (Num (a -> a))
-    In the expression: 1
-    In an equation for `d': d = 1
-(deferred type error)
-*** Exception: ../../typecheck/should_run/Defer01.hs:31:5:
-    Couldn't match expected type `Char -> t' with actual type `Char'
-    The function `e' is applied to one argument,
-    but its type `Char' has none
-    In the expression: e 'q'
-    In an equation for `f': f = e 'q'
-(deferred type error)
-(*** Exception: ../../typecheck/should_run/Defer01.hs:34:8:
-    Couldn't match expected type `a' with actual type `Char'
-      `a' is a rigid type variable bound by
-          the type signature for h :: a -> (Char, Char)
-          at ../../typecheck/should_run/Defer01.hs:33:6
-    In the expression: x
-    In the expression: (x, 'c')
-    In an equation for `h': h x = (x, 'c')
-(deferred type error)
-*** Exception: ../../typecheck/should_run/Defer01.hs:39:17:
-    Couldn't match expected type `Bool' with actual type `T a'
-    In the return type of a call of `K'
-    In the first argument of `not', namely `(K a)'
-    In the expression: (not (K a))
-(deferred type error)
-"*** Exception: ../../typecheck/should_run/Defer01.hs:43:5:
-    No instance for (MyClass a1) arising from a use of `myOp'
-    In the expression: myOp 23
-    In an equation for `j': j = myOp 23
-(deferred type error)
-*** Exception: ../../typecheck/should_run/Defer01.hs:49:5:
-    Couldn't match expected type `IO a0'
-                with actual type `Char -> IO ()'
-    In the first argument of `(>>)', namely `putChar'
-    In the expression: putChar >> putChar 'p'
-    In an equation for `l': l = putChar >> putChar 'p'
-(deferred type error)
+Hello World*** Exception: ..\..\typecheck\should_run\Defer01.hs:11:40:

+    Couldn't match type `Char' with `[Char]'

+    Expected type: String

+      Actual type: Char

+    In the first argument of `putStr', namely ','

+    In the second argument of `(>>)', namely putStr ','

+    In the expression: putStr "Hello World" >> putStr ','

+(deferred type error)

+*** Exception: ..\..\typecheck\should_run\Defer01.hs:14:5:

+    Couldn't match expected type `Int' with actual type `Char'

+    In the expression: 'p'

+    In an equation for `a': a = 'p'

+(deferred type error)

+*** Exception: ..\..\typecheck\should_run\Defer01.hs:18:9:

+    No instance for (Eq B) arising from a use of `=='

+    Possible fix: add an instance declaration for (Eq B)

+    In the expression: x == x

+    In an equation for `b': b x = x == x

+(deferred type error)

+*** Exception: ..\..\typecheck\should_run\Defer01.hs:28:5:

+    No instance for (Num (a -> a)) arising from the literal `1'

+    Possible fix: add an instance declaration for (Num (a -> a))

+    In the expression: 1

+    In an equation for `d': d = 1

+(deferred type error)

+*** Exception: ..\..\typecheck\should_run\Defer01.hs:31:5:

+    Couldn't match expected type `Char -> t' with actual type `Char'

+    The function `e' is applied to one argument,

+    but its type `Char' has none

+    In the expression: e 'q'

+    In an equation for `f': f = e 'q'

+(deferred type error)

+(*** Exception: ..\..\typecheck\should_run\Defer01.hs:34:8:

+    Couldn't match expected type `a' with actual type `Char'

+      `a' is a rigid type variable bound by

+          the type signature for h :: a -> (Char, Char)

+          at ..\..\typecheck\should_run\Defer01.hs:33:6

+    In the expression: x

+    In the expression: (x, 'c')

+    In an equation for `h': h x = (x, 'c')

+(deferred type error)

+*** Exception: ..\..\typecheck\should_run\Defer01.hs:39:17:

+    Couldn't match expected type `Bool' with actual type `T a'

+    In the return type of a call of `K'

+    In the first argument of `not', namely `(K a)'

+    In the expression: (not (K a))

+(deferred type error)

+"*** Exception: ..\..\typecheck\should_run\Defer01.hs:43:5:

+    No instance for (MyClass a1) arising from a use of `myOp'

+    In the expression: myOp 23

+    In an equation for `j': j = myOp 23

+(deferred type error)

+*** Exception: ..\..\typecheck\should_run\Defer01.hs:49:5:

+    Couldn't match expected type `IO a0'

+                with actual type `Char -> IO ()'

+    In the first argument of `(>>)', namely `putChar'

+    In the expression: putChar >> putChar 'p'

+    In an equation for `l': l = putChar >> putChar 'p'

+(deferred type error)

diff --git a/testsuite/tests/ghci/scripts/ghci050.stderr b/testsuite/tests/ghci/scripts/ghci050.stderr
index 74dc9a9b94..80725e4605 100644
--- a/testsuite/tests/ghci/scripts/ghci050.stderr
+++ b/testsuite/tests/ghci/scripts/ghci050.stderr
@@ -1,9 +1,9 @@
-
-<interactive>:6:49:
-    Couldn't match expected type `a'
-                with actual type `ListableElem (a, a)'
-      `a' is a rigid type variable bound by
-          the instance declaration at <interactive>:6:20
-    In the expression: a
-    In the expression: [a, b]
-    In an equation for `asList': asList (a, b) = [a, b]
+

+<interactive>:6:49:

+    Couldn't match expected type `a'

+                with actual type `ListableElem (a, a)'

+      `a' is a rigid type variable bound by

+          the instance declaration at <interactive>:6:10

+    In the expression: a

+    In the expression: [a, b]

+    In an equation for `asList': asList (a, b) = [a, b]

diff --git a/testsuite/tests/ghci/scripts/ghci057.stderr b/testsuite/tests/ghci/scripts/ghci057.stderr
index 383d951e0c..623bfb3c37 100644
--- a/testsuite/tests/ghci/scripts/ghci057.stderr
+++ b/testsuite/tests/ghci/scripts/ghci057.stderr
@@ -1,17 +1,17 @@
-
-<interactive>:5:1:
-    Illegal generalised algebraic data declaration for `T'
-      (Use -XGADTs to allow GADTs)
-    In the data type declaration for `T'
-
-ghci057.hs:3:3:
-    Data constructor `C' has existential type variables, a context, or a specialised result type
-      (Use -XExistentialQuantification or -XGADTs to allow this)
-    In the definition of data constructor `C'
-    In the data type declaration for `T'
-
-ghci057.hs:3:3:
-    Data constructor `C' has existential type variables, a context, or a specialised result type
-      (Use -XExistentialQuantification or -XGADTs to allow this)
-    In the definition of data constructor `C'
-    In the data type declaration for `T'
+

+<interactive>:5:1:

+    Illegal generalised algebraic data declaration for `T'

+      (Use -XGADTs to allow GADTs)

+    In the data declaration for `T'

+

+ghci057.hs:3:3:

+    Data constructor `C' has existential type variables, a context, or a specialised result type

+      (Use -XExistentialQuantification or -XGADTs to allow this)

+    In the definition of data constructor `C'

+    In the data declaration for `T'

+

+ghci057.hs:3:3:

+    Data constructor `C' has existential type variables, a context, or a specialised result type

+      (Use -XExistentialQuantification or -XGADTs to allow this)

+    In the definition of data constructor `C'

+    In the data declaration for `T'

diff --git a/testsuite/tests/haddock/haddock_examples/haddock.Test.stderr b/testsuite/tests/haddock/haddock_examples/haddock.Test.stderr
index 48cae1cf83..3e944ee313 100644
--- a/testsuite/tests/haddock/haddock_examples/haddock.Test.stderr
+++ b/testsuite/tests/haddock/haddock_examples/haddock.Test.stderr
@@ -1,166 +1,166 @@
-[1 of 3] Compiling Visible          ( Visible.hs, Visible.o )
-
-==================== Parser ====================
-module Visible where
-visible :: Int -> Int
-visible a = a
-
-
-[2 of 3] Compiling Hidden           ( Hidden.hs, Hidden.o )
-
-==================== Parser ====================
-module Hidden where
-hidden :: Int -> Int
-hidden a = a
-
-
-[3 of 3] Compiling Test             ( Test.hs, Test.o )
-
-==================== Parser ====================
-<document comment>
-module Test (
-        <IEGroup: 1>, <IEGroup: 2>, T(..), T2, T3(..), T4(..), T5(..),
-        T6(..), N1(..), N2(..), N3(..), N4, N5(..), N6(..), N7(..),
-        <IEGroup: 2>, R(..), R1(..), <document comment>, p, q, u,
-        <IEGroup: 1>, C(a, b), D(..), E, F(..), <document comment>, a,
-        <IEGroup: 1>, f, g, <IEGroup: 1>, <IEDocNamed: aux1>,
-        <IEDocNamed: aux2>, <IEDocNamed: aux3>, <IEDocNamed: aux4>,
-        <IEDocNamed: aux5>, <IEDocNamed: aux6>, <IEDocNamed: aux7>,
-        <IEDocNamed: aux8>, <IEDocNamed: aux9>, <IEDocNamed: aux10>,
-        <IEDocNamed: aux11>, <IEDocNamed: aux12>, <document comment>,
-        <IEGroup: 1>, module Hidden, <IEGroup: 1>, module Visible,
-        <document comment>, <IEGroup: 1>, Ex(..), <IEGroup: 1>, k, l, m, o,
-        <IEGroup: 1>, <IEGroup: 2>, <document comment>, f'
-    ) where
-import Hidden
-import Visible
-<document comment>
-data T a b
-    = <document comment> A Int Maybe Float |
-      <document comment> B (T a b, T Int Float)
-<document comment>
-data T2 a b = T2 a b
-<document comment>
-data T3 a b = A1 a | B1 b
-data T4 a b = A2 a | B2 b
-data T5 a b = <document comment> A3 a | <document comment> B3 b
-<document comment>
-data T6
-    = <document comment> A4 |
-      <document comment> B4 |
-      <document comment> C4
-<document comment>
-newtype N1 a = N1 a
-<document comment>
-newtype N2 a b = N2 {n :: a b}
-<document comment>
-newtype N3 a b = N3 {n3 :: a b <document comment>}
-<document comment>
-newtype N4 a b = N4 a
-newtype N5 a b = N5 {n5 :: a b <document comment>}
-newtype N6 a b = <document comment> N6 {n6 :: a b}
-<document comment>
-newtype N7 a b = <document comment> N7 {n7 :: a b}
-class D a => C a where
-  a :: IO a
-  b :: [a]
-  c :: a
-<document comment>
-class D a where
-  d :: T a b
-  e :: (a, a)
-<document comment>
-instance D Int where
-  d = undefined
-  e = undefined
-instance Test.D Float where
-  d = undefined
-  e = undefined
-class E a where
-  ee :: a
-<document comment>
-class F a where
-  ff :: a
-<document comment>
-data R
-    = <document comment>
-      C1 {p :: Int <document comment>,
-          q :: forall a. a -> a <document comment>,
-          r :: Int <document comment>,
-          s :: Int <document comment>} |
-      <document comment>
-      C2 {t :: T1
-               -> (T2 Int Int) -> (T3 Bool Bool) -> (T4 Float Float) -> T5 () (),
-          u :: Int,
-          v :: Int}
-<document comment>
-data R1
-    = <document comment>
-      C3 {s1 :: Int <document comment>,
-          s2 :: Int <document comment>,
-          s3 :: Int <document comment>}
-<document comment>
-<document comment>
-<document comment>
-<document comment>
-f :: C a => a -> Int
-<document comment>
-foreign import ccall safe "static header.h g" g :: Int -> IO CInt
-<document comment>
-h :: Int
-h = 42
-<document comment>
-<document comment>
-<document comment>
-<document comment>
-<document comment>
-<document comment>
-<document comment>
-<document comment>
-<document comment>
-<document comment>
-<document comment>
-<document comment>
-<document comment>
-data Ex a
-    = forall b. C b => Ex1 b |
-      forall b. Ex2 b |
-      forall b. C a => Ex3 b |
-      Ex4 forall a. a -> a
-<document comment>
-k ::
-  T () () <document comment>
-  -> (T2 Int Int) <document comment>
-     -> (T3 Bool Bool -> T4 Float Float) <document comment>
-        -> T5 () () <document comment> -> IO () <document comment>
-l :: (Int, Int, Float) <document comment> -> Int <document comment>
-<document comment>
-m :: R -> N1 () <document comment> -> IO Int <document comment>
-<document comment>
-newn :: R <document comment> -> N1 () <document comment> -> IO Int
-newn = undefined
-<document comment>
-foreign import ccall unsafe "static header.h o" o
-  :: Float <document comment> -> IO Float <document comment>
-<document comment>
-newp :: Int
-newp = undefined
-<document comment>
-f' :: Int
-data T1 =
-f = undefined
-f' = undefined
-type CInt = Int
-k = undefined
-l = undefined
-m = undefined
-
-
-
-Test.hs:32:9: Warning: `p' is exported by `p' and `R(..)'
-
-Test.hs:32:12: Warning: `q' is exported by `q' and `R(..)'
-
-Test.hs:32:15: Warning: `u' is exported by `u' and `R(..)'
-
-Test.hs:38:9: Warning: `a' is exported by `a' and `C(a, b)'
+[1 of 3] Compiling Visible          ( Visible.hs, Visible.o )

+

+==================== Parser ====================

+module Visible where

+visible :: Int -> Int

+visible a = a

+

+

+[2 of 3] Compiling Hidden           ( Hidden.hs, Hidden.o )

+

+==================== Parser ====================

+module Hidden where

+hidden :: Int -> Int

+hidden a = a

+

+

+[3 of 3] Compiling Test             ( Test.hs, Test.o )

+

+==================== Parser ====================

+<document comment>

+module Test (

+        <IEGroup: 1>, <IEGroup: 2>, T(..), T2, T3(..), T4(..), T5(..),

+        T6(..), N1(..), N2(..), N3(..), N4, N5(..), N6(..), N7(..),

+        <IEGroup: 2>, R(..), R1(..), <document comment>, p, q, u,

+        <IEGroup: 1>, C(a, b), D(..), E, F(..), <document comment>, a,

+        <IEGroup: 1>, f, g, <IEGroup: 1>, <IEDocNamed: aux1>,

+        <IEDocNamed: aux2>, <IEDocNamed: aux3>, <IEDocNamed: aux4>,

+        <IEDocNamed: aux5>, <IEDocNamed: aux6>, <IEDocNamed: aux7>,

+        <IEDocNamed: aux8>, <IEDocNamed: aux9>, <IEDocNamed: aux10>,

+        <IEDocNamed: aux11>, <IEDocNamed: aux12>, <document comment>,

+        <IEGroup: 1>, module Hidden, <IEGroup: 1>, module Visible,

+        <document comment>, <IEGroup: 1>, Ex(..), <IEGroup: 1>, k, l, m, o,

+        <IEGroup: 1>, <IEGroup: 2>, <document comment>, f'

+    ) where

+import Hidden

+import Visible

+<document comment>

+data T a b

+  = <document comment> A Int Maybe Float |

+    <document comment> B (T a b, T Int Float)

+<document comment>

+data T2 a b = T2 a b

+<document comment>

+data T3 a b = A1 a | B1 b

+data T4 a b = A2 a | B2 b

+data T5 a b = <document comment> A3 a | <document comment> B3 b

+<document comment>

+data T6

+  = <document comment> A4 |

+    <document comment> B4 |

+    <document comment> C4

+<document comment>

+newtype N1 a = N1 a

+<document comment>

+newtype N2 a b = N2 {n :: a b}

+<document comment>

+newtype N3 a b = N3 {n3 :: a b <document comment>}

+<document comment>

+newtype N4 a b = N4 a

+newtype N5 a b = N5 {n5 :: a b <document comment>}

+newtype N6 a b = <document comment> N6 {n6 :: a b}

+<document comment>

+newtype N7 a b = <document comment> N7 {n7 :: a b}

+class D a => C a where

+  a :: IO a

+  b :: [a]

+  c :: a

+<document comment>

+class D a where

+  d :: T a b

+  e :: (a, a)

+<document comment>

+instance D Int where

+  d = undefined

+  e = undefined

+instance Test.D Float where

+  d = undefined

+  e = undefined

+class E a where

+  ee :: a

+<document comment>

+class F a where

+  ff :: a

+<document comment>

+data R

+  = <document comment>

+    C1 {p :: Int <document comment>,

+        q :: forall a. a -> a <document comment>,

+        r :: Int <document comment>,

+        s :: Int <document comment>} |

+    <document comment>

+    C2 {t :: T1

+             -> (T2 Int Int) -> (T3 Bool Bool) -> (T4 Float Float) -> T5 () (),

+        u :: Int,

+        v :: Int}

+<document comment>

+data R1

+  = <document comment>

+    C3 {s1 :: Int <document comment>,

+        s2 :: Int <document comment>,

+        s3 :: Int <document comment>}

+<document comment>

+<document comment>

+<document comment>

+<document comment>

+f :: C a => a -> Int

+<document comment>

+foreign import ccall safe "static header.h g" g :: Int -> IO CInt

+<document comment>

+h :: Int

+h = 42

+<document comment>

+<document comment>

+<document comment>

+<document comment>

+<document comment>

+<document comment>

+<document comment>

+<document comment>

+<document comment>

+<document comment>

+<document comment>

+<document comment>

+<document comment>

+data Ex a

+  = forall b. C b => Ex1 b |

+    forall b. Ex2 b |

+    forall b. C a => Ex3 b |

+    Ex4 forall a. a -> a

+<document comment>

+k ::

+  T () () <document comment>

+  -> (T2 Int Int) <document comment>

+     -> (T3 Bool Bool -> T4 Float Float) <document comment>

+        -> T5 () () <document comment> -> IO () <document comment>

+l :: (Int, Int, Float) <document comment> -> Int <document comment>

+<document comment>

+m :: R -> N1 () <document comment> -> IO Int <document comment>

+<document comment>

+newn :: R <document comment> -> N1 () <document comment> -> IO Int

+newn = undefined

+<document comment>

+foreign import ccall unsafe "static header.h o" o

+  :: Float <document comment> -> IO Float <document comment>

+<document comment>

+newp :: Int

+newp = undefined

+<document comment>

+f' :: Int

+data T1

+f = undefined

+f' = undefined

+type CInt = Int

+k = undefined

+l = undefined

+m = undefined

+

+

+

+Test.hs:32:9: Warning: `p' is exported by `p' and `R(..)'

+

+Test.hs:32:12: Warning: `q' is exported by `q' and `R(..)'

+

+Test.hs:32:15: Warning: `u' is exported by `u' and `R(..)'

+

+Test.hs:38:9: Warning: `a' is exported by `a' and `C(a, b)'

diff --git a/testsuite/tests/indexed-types/should_compile/T2850.hs b/testsuite/tests/indexed-types/should_compile/T2850.hs
index bdb423b6eb..d284db05db 100644
--- a/testsuite/tests/indexed-types/should_compile/T2850.hs
+++ b/testsuite/tests/indexed-types/should_compile/T2850.hs
@@ -16,6 +16,8 @@ instance M Bool where
 instance K (B Bool) where

   bar = id

 

+-- The 'deriving K' gives the (K (B Int)) instance

+-- needed for the superclasses of M

 instance M Int where

   newtype B Int = BInt (B Bool) deriving K

   foo = id

diff --git a/testsuite/tests/indexed-types/should_fail/NotRelaxedExamples.stderr b/testsuite/tests/indexed-types/should_fail/NotRelaxedExamples.stderr
index dbc83696ee..030f742eed 100644
--- a/testsuite/tests/indexed-types/should_fail/NotRelaxedExamples.stderr
+++ b/testsuite/tests/indexed-types/should_fail/NotRelaxedExamples.stderr
@@ -1,18 +1,18 @@
-
-NotRelaxedExamples.hs:9:1:
-    Nested type family application
-      in the type family application: F1 (F1 Char)
-    (Use -XUndecidableInstances to permit this)
-    In the type synonym instance declaration for `F1'
-
-NotRelaxedExamples.hs:10:1:
-    Application is no smaller than the instance head
-      in the type family application: F2 [x]
-    (Use -XUndecidableInstances to permit this)
-    In the type synonym instance declaration for `F2'
-
-NotRelaxedExamples.hs:11:1:
-    Application is no smaller than the instance head
-      in the type family application: F3 [Char]
-    (Use -XUndecidableInstances to permit this)
-    In the type synonym instance declaration for `F3'
+

+NotRelaxedExamples.hs:9:1:

+    Nested type family application

+      in the type family application: F1 (F1 Char)

+    (Use -XUndecidableInstances to permit this)

+    In the type instance declaration for `F1'

+

+NotRelaxedExamples.hs:10:1:

+    Application is no smaller than the instance head

+      in the type family application: F2 [x]

+    (Use -XUndecidableInstances to permit this)

+    In the type instance declaration for `F2'

+

+NotRelaxedExamples.hs:11:1:

+    Application is no smaller than the instance head

+      in the type family application: F3 [Char]

+    (Use -XUndecidableInstances to permit this)

+    In the type instance declaration for `F3'

diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail12.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail12.stderr
index 24ac5f10a1..09420061a6 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail12.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail12.stderr
@@ -1,4 +1,4 @@
-
-SimpleFail12.hs:8:1:
-    Illegal polymorphic or qualified type: forall a. [a]
-    In the type synonym instance declaration for `C'
+

+SimpleFail12.hs:8:1:

+    Illegal polymorphic or qualified type: forall a. [a]

+    In the type instance declaration for `C'

diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail13.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail13.stderr
index f87d4059ae..116da4c0ff 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail13.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail13.stderr
@@ -1,8 +1,8 @@
-
-SimpleFail13.hs:9:1:
-    Illegal type synonym family application in instance: [C a]
-    In the data type instance declaration for `D'
-
-SimpleFail13.hs:13:1:
-    Illegal type synonym family application in instance: [C a]
-    In the type synonym instance declaration for `E'
+

+SimpleFail13.hs:9:1:

+    Illegal type synonym family application in instance: [C a]

+    In the data instance declaration for `D'

+

+SimpleFail13.hs:13:1:

+    Illegal type synonym family application in instance: [C a]

+    In the type instance declaration for `E'

diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail14.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail14.stderr
index 8dea4d07cc..8a86c21bcd 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail14.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail14.stderr
@@ -1,6 +1,6 @@
-
-SimpleFail14.hs:5:15:
-    Predicate `a ~ a' used as a type
-    In the type `a ~ a'
-    In the definition of data constructor `T'
-    In the data type declaration for `T'
+

+SimpleFail14.hs:5:15:

+    Predicate `a ~ a' used as a type

+    In the type `a ~ a'

+    In the definition of data constructor `T'

+    In the data declaration for `T'

diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail1a.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail1a.stderr
index 24be6db7ed..ba950b41f1 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail1a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail1a.stderr
@@ -1,4 +1,4 @@
-
-SimpleFail1a.hs:4:1:
-    Number of parameters must match family declaration; expected 2
-    In the data type instance declaration for `T1'
+

+SimpleFail1a.hs:4:1:

+    Number of parameters must match family declaration; expected 2

+    In the data instance declaration for `T1'

diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail1b.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail1b.stderr
index 3677317034..8becc3e8fc 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail1b.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail1b.stderr
@@ -1,4 +1,4 @@
-
-SimpleFail1b.hs:4:1:
-    Number of parameters must match family declaration; expected 2
-    In the data type instance declaration for `T1'
+

+SimpleFail1b.hs:4:1:

+    Number of parameters must match family declaration; expected 2

+    In the data instance declaration for `T1'

diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail2a.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail2a.stderr
index 3743d05168..67d9d24daf 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail2a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail2a.stderr
@@ -1,6 +1,6 @@
-
-SimpleFail2a.hs:11:3:
-    Type indexes must match class instance head
-    Found `a' but expected `Int'
-    In the data type instance declaration for `Sd'
-    In the instance declaration for `C Int'
+

+SimpleFail2a.hs:11:3:

+    Type indexes must match class instance head

+    Found `a' but expected `Int'

+    In the data instance declaration for `Sd'

+    In the instance declaration for `C Int'

diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail3a.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail3a.stderr
index 9a93d9fc90..164351a01f 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail3a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail3a.stderr
@@ -1,5 +1,5 @@
-
-SimpleFail3a.hs:10:3:
-    Wrong category of family instance; declaration was for a data type
-    In the type synonym instance declaration for `S1'
-    In the instance declaration for `C1 Int'
+

+SimpleFail3a.hs:10:3:

+    Wrong category of family instance; declaration was for a data type

+    In the type instance declaration for `S1'

+    In the instance declaration for `C1 Int'

diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail5a.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail5a.stderr
index b35b3712ee..76afd8aedf 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail5a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail5a.stderr
@@ -1,10 +1,10 @@
-
-SimpleFail5a.hs:31:11:
-    Couldn't match type `a' with `Int'
-      `a' is a rigid type variable bound by
-          the type signature for bar3wrong :: S3 a -> a
-          at SimpleFail5a.hs:30:17
-    Expected type: S3 a
-      Actual type: S3 Int
-    In the pattern: D3Int
-    In an equation for `bar3wrong': bar3wrong D3Int = 1
+

+SimpleFail5a.hs:31:11:

+    Couldn't match type `a' with `Int'

+      `a' is a rigid type variable bound by

+          the type signature for bar3wrong :: S3 a -> a

+          at SimpleFail5a.hs:30:14

+    Expected type: S3 a

+      Actual type: S3 Int

+    In the pattern: D3Int

+    In an equation for `bar3wrong': bar3wrong D3Int = 1

diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail7.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail7.stderr
index 04131efe33..59d2413441 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail7.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail7.stderr
@@ -1,4 +1,4 @@
-
-SimpleFail7.hs:8:1:
-    Associated type `S5' must be inside a class instance
-    In the data type instance declaration for `S5'
+

+SimpleFail7.hs:8:1:

+    Associated type `S5' must be inside a class instance

+    In the data instance declaration for `S5'

diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail9.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail9.stderr
index ac39575f6e..fb75e60bca 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail9.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail9.stderr
@@ -1,6 +1,6 @@
-
-SimpleFail9.hs:13:3:
-    Type indexes must match class instance head
-    Found `(b, Int)' but expected `(a, Int)'
-    In the data type instance declaration for `S7'
-    In the instance declaration for `C7 Char (a, Int)'
+

+SimpleFail9.hs:13:3:

+    Type indexes must match class instance head

+    Found `(b, Int)' but expected `(a, Int)'

+    In the data instance declaration for `S7'

+    In the instance declaration for `C7 Char (a, Int)'

diff --git a/testsuite/tests/indexed-types/should_fail/T2157.stderr b/testsuite/tests/indexed-types/should_fail/T2157.stderr
index b28f879663..d9e11c26df 100644
--- a/testsuite/tests/indexed-types/should_fail/T2157.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2157.stderr
@@ -1,4 +1,4 @@
-
-T2157.hs:7:1:
-    Type synonym `S' should have 2 arguments, but has been given 1
-    In the type synonym instance declaration for `F'
+

+T2157.hs:7:1:

+    Type synonym `S' should have 2 arguments, but has been given 1

+    In the type instance declaration for `F'

diff --git a/testsuite/tests/indexed-types/should_fail/T3092.stderr b/testsuite/tests/indexed-types/should_fail/T3092.stderr
index ceea069f8f..f45e35580a 100644
--- a/testsuite/tests/indexed-types/should_fail/T3092.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T3092.stderr
@@ -1,10 +1,10 @@
-
-T3092.hs:5:1:
-    Illegal family instance for `T'
-      (T is not an indexed type family)
-    In the data type instance declaration for `T'
-
-T3092.hs:8:1:
-    Illegal family instance for `S'
-      (S is not an indexed type family)
-    In the type synonym instance declaration for `S'
+

+T3092.hs:5:1:

+    Illegal family instance for `T'

+      (T is not an indexed type family)

+    In the data instance declaration for `T'

+

+T3092.hs:8:1:

+    Illegal family instance for `S'

+      (S is not an indexed type family)

+    In the type instance declaration for `S'

diff --git a/testsuite/tests/indexed-types/should_fail/T3330a.stderr b/testsuite/tests/indexed-types/should_fail/T3330a.stderr
index 9cd0995a05..6d76ade43f 100644
--- a/testsuite/tests/indexed-types/should_fail/T3330a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T3330a.stderr
@@ -1,22 +1,22 @@
-
-T3330a.hs:19:34:
-    Couldn't match type `s' with `(->) (s0 ix1 -> ix1)'
-      `s' is a rigid type variable bound by
-          the type signature for children :: s ix -> PF s r ix -> [AnyF s]
-          at T3330a.hs:18:13
-    Expected type: (s0 ix0 -> ix1) -> r ix1 -> Writer [AnyF s] (r ix1)
-      Actual type: s ix
-    In the first argument of `hmapM', namely `p'
-    In the first argument of `execWriter', namely `(hmapM p collect x)'
-    In the expression: execWriter (hmapM p collect x)
-
-T3330a.hs:19:36:
-    Couldn't match type `ix' with `r ix0 -> Writer [AnyF s0] (r ix0)'
-      `ix' is a rigid type variable bound by
-           the type signature for children :: s ix -> PF s r ix -> [AnyF s]
-           at T3330a.hs:18:15
-    Expected type: s0 ix0 -> ix
-      Actual type: s0 ix0 -> r ix0 -> Writer [AnyF s0] (r ix0)
-    In the second argument of `hmapM', namely `collect'
-    In the first argument of `execWriter', namely `(hmapM p collect x)'
-    In the expression: execWriter (hmapM p collect x)
+

+T3330a.hs:19:34:

+    Couldn't match type `s' with `(->) (s0 ix1 -> ix1)'

+      `s' is a rigid type variable bound by

+          the type signature for children :: s ix -> PF s r ix -> [AnyF s]

+          at T3330a.hs:18:13

+    Expected type: (s0 ix0 -> ix1) -> r ix1 -> Writer [AnyF s] (r ix1)

+      Actual type: s ix

+    In the first argument of `hmapM', namely `p'

+    In the first argument of `execWriter', namely `(hmapM p collect x)'

+    In the expression: execWriter (hmapM p collect x)

+

+T3330a.hs:19:36:

+    Couldn't match type `ix' with `r ix0 -> Writer [AnyF s0] (r ix0)'

+      `ix' is a rigid type variable bound by

+           the type signature for children :: s ix -> PF s r ix -> [AnyF s]

+           at T3330a.hs:18:13

+    Expected type: s0 ix0 -> ix

+      Actual type: s0 ix0 -> r ix0 -> Writer [AnyF s0] (r ix0)

+    In the second argument of `hmapM', namely `collect'

+    In the first argument of `execWriter', namely `(hmapM p collect x)'

+    In the expression: execWriter (hmapM p collect x)

diff --git a/testsuite/tests/indexed-types/should_fail/T3440.stderr b/testsuite/tests/indexed-types/should_fail/T3440.stderr
index 772d26c1be..ab7c5edf84 100644
--- a/testsuite/tests/indexed-types/should_fail/T3440.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T3440.stderr
@@ -1,19 +1,19 @@
-
-T3440.hs:11:22:
-    Could not deduce (a ~ a1)
-    from the context (Fam a ~ Fam a1)
-      bound by a pattern with constructor
-                 GADT :: forall a. a -> Fam a -> GADT (Fam a),
-               in an equation for `unwrap'
-      at T3440.hs:11:9-16
-      `a' is a rigid type variable bound by
-          the type signature for unwrap :: GADT (Fam a) -> (a, Fam a)
-          at T3440.hs:10:21
-      `a1' is a rigid type variable bound by
-           a pattern with constructor
-             GADT :: forall a. a -> Fam a -> GADT (Fam a),
-           in an equation for `unwrap'
-           at T3440.hs:11:9
-    In the expression: x
-    In the expression: (x, y)
-    In an equation for `unwrap': unwrap (GADT x y) = (x, y)
+

+T3440.hs:11:22:

+    Could not deduce (a ~ a1)

+    from the context (Fam a ~ Fam a1)

+      bound by a pattern with constructor

+                 GADT :: forall a. a -> Fam a -> GADT (Fam a),

+               in an equation for `unwrap'

+      at T3440.hs:11:9-16

+      `a' is a rigid type variable bound by

+          the type signature for unwrap :: GADT (Fam a) -> (a, Fam a)

+          at T3440.hs:10:11

+      `a1' is a rigid type variable bound by

+           a pattern with constructor

+             GADT :: forall a. a -> Fam a -> GADT (Fam a),

+           in an equation for `unwrap'

+           at T3440.hs:11:9

+    In the expression: x

+    In the expression: (x, y)

+    In an equation for `unwrap': unwrap (GADT x y) = (x, y)

diff --git a/testsuite/tests/indexed-types/should_fail/T4093a.stderr b/testsuite/tests/indexed-types/should_fail/T4093a.stderr
index bb6d5b915f..4a16563d9d 100644
--- a/testsuite/tests/indexed-types/should_fail/T4093a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T4093a.stderr
@@ -1,14 +1,14 @@
-
-T4093a.hs:8:8:
-    Could not deduce (e ~ ())
-    from the context (Foo e ~ Maybe e)
-      bound by the type signature for hang :: Foo e ~ Maybe e => Foo e
-      at T4093a.hs:7:9-34
-      `e' is a rigid type variable bound by
-          the type signature for hang :: Foo e ~ Maybe e => Foo e
-          at T4093a.hs:7:14
-    Expected type: Foo e
-      Actual type: Maybe ()
-    In the return type of a call of `Just'
-    In the expression: Just ()
-    In an equation for `hang': hang = Just ()
+

+T4093a.hs:8:8:

+    Could not deduce (e ~ ())

+    from the context (Foo e ~ Maybe e)

+      bound by the type signature for hang :: Foo e ~ Maybe e => Foo e

+      at T4093a.hs:7:9-34

+      `e' is a rigid type variable bound by

+          the type signature for hang :: Foo e ~ Maybe e => Foo e

+          at T4093a.hs:7:9

+    Expected type: Foo e

+      Actual type: Maybe ()

+    In the return type of a call of `Just'

+    In the expression: Just ()

+    In an equation for `hang': hang = Just ()

diff --git a/testsuite/tests/indexed-types/should_fail/TyFamArity1.stderr b/testsuite/tests/indexed-types/should_fail/TyFamArity1.stderr
index 7ee60167e1..f92f986d21 100644
--- a/testsuite/tests/indexed-types/should_fail/TyFamArity1.stderr
+++ b/testsuite/tests/indexed-types/should_fail/TyFamArity1.stderr
@@ -1,4 +1,4 @@
-
-TyFamArity1.hs:4:1:
-    Number of parameters must match family declaration; expected 2
-    In the type synonym instance declaration for `T'
+

+TyFamArity1.hs:4:1:

+    Number of parameters must match family declaration; expected 2

+    In the type instance declaration for `T'

diff --git a/testsuite/tests/indexed-types/should_fail/TyFamArity2.stderr b/testsuite/tests/indexed-types/should_fail/TyFamArity2.stderr
index 30d0526664..2423a065b2 100644
--- a/testsuite/tests/indexed-types/should_fail/TyFamArity2.stderr
+++ b/testsuite/tests/indexed-types/should_fail/TyFamArity2.stderr
@@ -1,4 +1,4 @@
-
-TyFamArity2.hs:4:1:
-    Number of parameters must match family declaration; expected 1
-    In the type synonym instance declaration for `T'
+

+TyFamArity2.hs:4:1:

+    Number of parameters must match family declaration; expected 1

+    In the type instance declaration for `T'

diff --git a/testsuite/tests/indexed-types/should_fail/TyFamUndec.stderr b/testsuite/tests/indexed-types/should_fail/TyFamUndec.stderr
index 2fc8e1b078..cbb0a6bde3 100644
--- a/testsuite/tests/indexed-types/should_fail/TyFamUndec.stderr
+++ b/testsuite/tests/indexed-types/should_fail/TyFamUndec.stderr
@@ -1,18 +1,18 @@
-
-TyFamUndec.hs:6:1:
-    Variable occurs more often than in instance head
-      in the type family application: T (b, b)
-    (Use -XUndecidableInstances to permit this)
-    In the type synonym instance declaration for `T'
-
-TyFamUndec.hs:7:1:
-    Application is no smaller than the instance head
-      in the type family application: T (a, Maybe b)
-    (Use -XUndecidableInstances to permit this)
-    In the type synonym instance declaration for `T'
-
-TyFamUndec.hs:8:1:
-    Nested type family application
-      in the type family application: T (a, T b)
-    (Use -XUndecidableInstances to permit this)
-    In the type synonym instance declaration for `T'
+

+TyFamUndec.hs:6:1:

+    Variable occurs more often than in instance head

+      in the type family application: T (b, b)

+    (Use -XUndecidableInstances to permit this)

+    In the type instance declaration for `T'

+

+TyFamUndec.hs:7:1:

+    Application is no smaller than the instance head

+      in the type family application: T (a, Maybe b)

+    (Use -XUndecidableInstances to permit this)

+    In the type instance declaration for `T'

+

+TyFamUndec.hs:8:1:

+    Nested type family application

+      in the type family application: T (a, T b)

+    (Use -XUndecidableInstances to permit this)

+    In the type instance declaration for `T'

diff --git a/testsuite/tests/module/mod53.stderr b/testsuite/tests/module/mod53.stderr
index b8b44a471e..2e142a5bfb 100644
--- a/testsuite/tests/module/mod53.stderr
+++ b/testsuite/tests/module/mod53.stderr
@@ -2,4 +2,4 @@
 mod53.hs:4:22:

     Can't make a derived instance of `C T':

       `C' is not a derivable class

-    In the data type declaration for `T'

+    In the data declaration for `T'

diff --git a/testsuite/tests/module/mod55.stderr b/testsuite/tests/module/mod55.stderr
index 7787ea3b2f..9db5ea55cc 100644
--- a/testsuite/tests/module/mod55.stderr
+++ b/testsuite/tests/module/mod55.stderr
@@ -1,6 +1,6 @@
-
-mod55.hs:3:26:
-    Can't make a derived instance of `Enum T':
-      `T' must be an enumeration type
-      (an enumeration consists of one or more nullary, non-GADT constructors)
-    In the data type declaration for `T'
+

+mod55.hs:3:26:

+    Can't make a derived instance of `Enum T':

+      `T' must be an enumeration type

+      (an enumeration consists of one or more nullary, non-GADT constructors)

+    In the data declaration for `T'

diff --git a/testsuite/tests/module/mod56.stderr b/testsuite/tests/module/mod56.stderr
index 3dca4e2e10..db194406ed 100644
--- a/testsuite/tests/module/mod56.stderr
+++ b/testsuite/tests/module/mod56.stderr
@@ -1,8 +1,8 @@
-
-mod56.hs:4:39:
-    Can't make a derived instance of `Ix T':
-      `T' must be an enumeration type
-      (an enumeration consists of one or more nullary, non-GADT constructors)
-        or
-      `T' must have precisely one constructor
-    In the data type declaration for `T'
+

+mod56.hs:4:39:

+    Can't make a derived instance of `Ix T':

+      `T' must be an enumeration type

+      (an enumeration consists of one or more nullary, non-GADT constructors)

+        or

+      `T' must have precisely one constructor

+    In the data declaration for `T'

diff --git a/testsuite/tests/parser/should_fail/readFail035.stderr b/testsuite/tests/parser/should_fail/readFail035.stderr
index 05f2d864ac..f0489b45eb 100644
--- a/testsuite/tests/parser/should_fail/readFail035.stderr
+++ b/testsuite/tests/parser/should_fail/readFail035.stderr
@@ -1,4 +1,4 @@
-
-readFail035.hs:6:1:
-    `Foo' has no constructors (-XEmptyDataDecls permits this)
-    In the data type declaration for `Foo'
+

+readFail035.hs:6:1:

+    `Foo' has no constructors (-XEmptyDataDecls permits this)

+    In the data declaration for `Foo'

diff --git a/testsuite/tests/polykinds/PolyKinds04.stderr b/testsuite/tests/polykinds/PolyKinds04.stderr
index dfac425cf8..484b0991ab 100644
--- a/testsuite/tests/polykinds/PolyKinds04.stderr
+++ b/testsuite/tests/polykinds/PolyKinds04.stderr
@@ -1,6 +1,6 @@
-
-PolyKinds04.hs:5:16:
-    Expecting one more argument to `Maybe'
-    In the type `A Maybe'
-    In the definition of data constructor `B1'
-    In the data type declaration for `B'
+

+PolyKinds04.hs:5:16:

+    Expecting one more argument to `Maybe'

+    In the type `A Maybe'

+    In the definition of data constructor `B1'

+    In the data declaration for `B'

diff --git a/testsuite/tests/polykinds/PolyKinds06.stderr b/testsuite/tests/polykinds/PolyKinds06.stderr
index b2de4bc596..314bb20a87 100644
--- a/testsuite/tests/polykinds/PolyKinds06.stderr
+++ b/testsuite/tests/polykinds/PolyKinds06.stderr
@@ -1,6 +1,6 @@
-
-PolyKinds06.hs:10:11:
-    Promoted kind `A1' used in a mutually recursive group
-    In the type `B A1'
-    In the definition of data constructor `B1'
-    In the data type declaration for `B'
+

+PolyKinds06.hs:10:11:

+    Promoted kind `A1' used in a mutually recursive group

+    In the type `B A1'

+    In the definition of data constructor `B1'

+    In the data declaration for `B'

diff --git a/testsuite/tests/polykinds/PolyKinds07.stderr b/testsuite/tests/polykinds/PolyKinds07.stderr
index 2063af0645..203e3aad4b 100644
--- a/testsuite/tests/polykinds/PolyKinds07.stderr
+++ b/testsuite/tests/polykinds/PolyKinds07.stderr
@@ -1,6 +1,6 @@
-
-PolyKinds07.hs:10:11:
-    Promoted kind `A1' used in a mutually recursive group
-    In the type `B A1'
-    In the definition of data constructor `B1'
-    In the data type declaration for `B'
+

+PolyKinds07.hs:10:11:

+    Promoted kind `A1' used in a mutually recursive group

+    In the type `B A1'

+    In the definition of data constructor `B1'

+    In the data declaration for `B'

diff --git a/testsuite/tests/polykinds/T5716.stderr b/testsuite/tests/polykinds/T5716.stderr
index 883985673f..76b20cdf86 100644
--- a/testsuite/tests/polykinds/T5716.stderr
+++ b/testsuite/tests/polykinds/T5716.stderr
@@ -1,6 +1,6 @@
-
-T5716.hs:13:33:
-    `U1' of type `DF * Int -> U' is not promotable
-    In the type `I (U1 DFInt)'
-    In the definition of data constructor `I1'
-    In the data type declaration for `I'
+

+T5716.hs:13:33:

+    `U1' of type `DF * Int -> U' is not promotable

+    In the type `I (U1 DFInt)'

+    In the definition of data constructor `I1'

+    In the data declaration for `I'

diff --git a/testsuite/tests/typecheck/should_compile/FD1.stderr b/testsuite/tests/typecheck/should_compile/FD1.stderr
index 0bec66931a..ea6833b2b7 100644
--- a/testsuite/tests/typecheck/should_compile/FD1.stderr
+++ b/testsuite/tests/typecheck/should_compile/FD1.stderr
@@ -1,12 +1,12 @@
-
-FD1.hs:16:1:
-    Could not deduce (a ~ (Int -> Int))
-    from the context (E a (Int -> Int))
-      bound by the type signature for
-                 plus :: E a (Int -> Int) => Int -> a
-      at FD1.hs:15:9-38
-      `a' is a rigid type variable bound by
-          the type signature for plus :: E a (Int -> Int) => Int -> a
-          at FD1.hs:15:12
-    The equation(s) for `plus' have two arguments,
-    but its type `Int -> a' has only one
+

+FD1.hs:16:1:

+    Could not deduce (a ~ (Int -> Int))

+    from the context (E a (Int -> Int))

+      bound by the type signature for

+                 plus :: E a (Int -> Int) => Int -> a

+      at FD1.hs:15:9-38

+      `a' is a rigid type variable bound by

+          the type signature for plus :: E a (Int -> Int) => Int -> a

+          at FD1.hs:15:9

+    The equation(s) for `plus' have two arguments,

+    but its type `Int -> a' has only one

diff --git a/testsuite/tests/typecheck/should_compile/FD2.stderr b/testsuite/tests/typecheck/should_compile/FD2.stderr
index 392f92723d..564917caef 100644
--- a/testsuite/tests/typecheck/should_compile/FD2.stderr
+++ b/testsuite/tests/typecheck/should_compile/FD2.stderr
@@ -1,25 +1,25 @@
-
-FD2.hs:26:36:
-    Could not deduce (e ~ e1)
-    from the context (Foldable a)
-      bound by the class declaration for `Foldable'
-      at FD2.hs:(17,1)-(26,39)
-    or from (Elem a e)
-      bound by the type signature for
-                 foldr1 :: Elem a e => (e -> e -> e) -> a -> e
-      at FD2.hs:21:13-47
-    or from (Elem a e1)
-      bound by the type signature for
-                 mf :: Elem a e1 => e1 -> Maybe e1 -> Maybe e1
-      at FD2.hs:24:18-54
-      `e' is a rigid type variable bound by
-          the type signature for
-            foldr1 :: Elem a e => (e -> e -> e) -> a -> e
-          at FD2.hs:21:20
-      `e1' is a rigid type variable bound by
-           the type signature for
-             mf :: Elem a e1 => e1 -> Maybe e1 -> Maybe e1
-           at FD2.hs:24:25
-    In the first argument of `f', namely `x'
-    In the first argument of `Just', namely `(f x y)'
-    In the expression: Just (f x y)
+

+FD2.hs:26:36:

+    Could not deduce (e ~ e1)

+    from the context (Foldable a)

+      bound by the class declaration for `Foldable'

+      at FD2.hs:(17,1)-(26,39)

+    or from (Elem a e)

+      bound by the type signature for

+                 foldr1 :: Elem a e => (e -> e -> e) -> a -> e

+      at FD2.hs:21:13-47

+    or from (Elem a e1)

+      bound by the type signature for

+                 mf :: Elem a e1 => e1 -> Maybe e1 -> Maybe e1

+      at FD2.hs:24:18-54

+      `e' is a rigid type variable bound by

+          the type signature for

+            foldr1 :: Elem a e => (e -> e -> e) -> a -> e

+          at FD2.hs:21:13

+      `e1' is a rigid type variable bound by

+           the type signature for

+             mf :: Elem a e1 => e1 -> Maybe e1 -> Maybe e1

+           at FD2.hs:24:18

+    In the first argument of `f', namely `x'

+    In the first argument of `Just', namely `(f x y)'

+    In the expression: Just (f x y)

diff --git a/testsuite/tests/typecheck/should_compile/FD3.stderr b/testsuite/tests/typecheck/should_compile/FD3.stderr
index 9144b5fdb3..68639ce730 100644
--- a/testsuite/tests/typecheck/should_compile/FD3.stderr
+++ b/testsuite/tests/typecheck/should_compile/FD3.stderr
@@ -1,13 +1,13 @@
-
-FD3.hs:15:15:
-    Couldn't match type `a' with `([Char], a)'
-      `a' is a rigid type variable bound by
-          the type signature for translate :: (String, a) -> A a
-          at FD3.hs:14:23
-    When using functional dependencies to combine
-      MkA a a,
-        arising from the dependency `a -> b'
-        in the instance declaration at FD3.hs:12:10
-      MkA ([Char], a) a, arising from a use of `mkA' at FD3.hs:15:15-17
-    In the expression: mkA a
-    In an equation for `translate': translate a = mkA a
+

+FD3.hs:15:15:

+    Couldn't match type `a' with `([Char], a)'

+      `a' is a rigid type variable bound by

+          the type signature for translate :: (String, a) -> A a

+          at FD3.hs:14:14

+    When using functional dependencies to combine

+      MkA a a,

+        arising from the dependency `a -> b'

+        in the instance declaration at FD3.hs:12:10

+      MkA ([Char], a) a, arising from a use of `mkA' at FD3.hs:15:15-17

+    In the expression: mkA a

+    In an equation for `translate': translate a = mkA a

diff --git a/testsuite/tests/typecheck/should_compile/T2494.stderr b/testsuite/tests/typecheck/should_compile/T2494.stderr
index 765858e198..8b173d5334 100644
--- a/testsuite/tests/typecheck/should_compile/T2494.stderr
+++ b/testsuite/tests/typecheck/should_compile/T2494.stderr
@@ -1,24 +1,24 @@
-
-T2494.hs:15:7:
-    Couldn't match type `b' with `a'
-      `b' is a rigid type variable bound by
-          the RULE "foo/foo" at T2494.hs:14:46
-      `a' is a rigid type variable bound by
-          the RULE "foo/foo" at T2494.hs:13:46
-    Expected type: Maybe (m b) -> Maybe (m b)
-      Actual type: Maybe (m a) -> Maybe (m a)
-    In the first argument of `foo', namely `f'
-    In the expression: foo f (foo g x)
-    When checking the transformation rule "foo/foo"
-
-T2494.hs:15:30:
-    Couldn't match type `b' with `a'
-      `b' is a rigid type variable bound by
-          the RULE "foo/foo" at T2494.hs:14:46
-      `a' is a rigid type variable bound by
-          the RULE "foo/foo" at T2494.hs:13:46
-    Expected type: Maybe (m b) -> Maybe (m a)
-      Actual type: Maybe (m b) -> Maybe (m b)
-    In the second argument of `(.)', namely `g'
-    In the first argument of `foo', namely `(f . g)'
-    In the expression: foo (f . g) x
+

+T2494.hs:15:7:

+    Couldn't match type `b' with `a'

+      `b' is a rigid type variable bound by

+          the RULE "foo/foo" at T2494.hs:14:16

+      `a' is a rigid type variable bound by

+          the RULE "foo/foo" at T2494.hs:13:16

+    Expected type: Maybe (m b) -> Maybe (m b)

+      Actual type: Maybe (m a) -> Maybe (m a)

+    In the first argument of `foo', namely `f'

+    In the expression: foo f (foo g x)

+    When checking the transformation rule "foo/foo"

+

+T2494.hs:15:30:

+    Couldn't match type `b' with `a'

+      `b' is a rigid type variable bound by

+          the RULE "foo/foo" at T2494.hs:14:16

+      `a' is a rigid type variable bound by

+          the RULE "foo/foo" at T2494.hs:13:16

+    Expected type: Maybe (m b) -> Maybe (m a)

+      Actual type: Maybe (m b) -> Maybe (m b)

+    In the second argument of `(.)', namely `g'

+    In the first argument of `foo', namely `(f . g)'

+    In the expression: foo (f . g) x

diff --git a/testsuite/tests/typecheck/should_fail/AssocTyDef03.stderr b/testsuite/tests/typecheck/should_fail/AssocTyDef03.stderr
index 668857a017..bd7fadfd8c 100644
--- a/testsuite/tests/typecheck/should_fail/AssocTyDef03.stderr
+++ b/testsuite/tests/typecheck/should_fail/AssocTyDef03.stderr
@@ -1,5 +1,5 @@
-
-AssocTyDef03.hs:6:5:
-    Wrong category of family instance; declaration was for a data type
-    In the type synonym instance default declaration for `Typ'
-    In the class declaration for `Cls'
+

+AssocTyDef03.hs:6:5:

+    Wrong category of family instance; declaration was for a data type

+    In the type instance declaration for `Typ'

+    In the class declaration for `Cls'

diff --git a/testsuite/tests/typecheck/should_fail/AssocTyDef04.stderr b/testsuite/tests/typecheck/should_fail/AssocTyDef04.stderr
index bf4164f98a..b7bc7c2fbe 100644
--- a/testsuite/tests/typecheck/should_fail/AssocTyDef04.stderr
+++ b/testsuite/tests/typecheck/should_fail/AssocTyDef04.stderr
@@ -1,6 +1,6 @@
-
-AssocTyDef04.hs:6:18:
-    Expecting one more argument to `Maybe'
-    In the type `Maybe'
-    In the type synonym instance default declaration for `Typ'
-    In the class declaration for `Cls'
+

+AssocTyDef04.hs:6:18:

+    Expecting one more argument to `Maybe'

+    In the type `Maybe'

+    In the type instance declaration for `Typ'

+    In the class declaration for `Cls'

diff --git a/testsuite/tests/typecheck/should_fail/AssocTyDef05.stderr b/testsuite/tests/typecheck/should_fail/AssocTyDef05.stderr
index 181f9f6f59..3416a3c44e 100644
--- a/testsuite/tests/typecheck/should_fail/AssocTyDef05.stderr
+++ b/testsuite/tests/typecheck/should_fail/AssocTyDef05.stderr
@@ -1,5 +1,5 @@
-
-AssocTyDef05.hs:6:5:
-    Number of parameters must match family declaration; expected 1
-    In the type synonym instance default declaration for `Typ'
-    In the class declaration for `Cls'
+

+AssocTyDef05.hs:6:5:

+    Number of parameters must match family declaration; expected 1

+    In the type instance declaration for `Typ'

+    In the class declaration for `Cls'

diff --git a/testsuite/tests/typecheck/should_fail/AssocTyDef06.stderr b/testsuite/tests/typecheck/should_fail/AssocTyDef06.stderr
index 417e0f8419..dd88bc3c1f 100644
--- a/testsuite/tests/typecheck/should_fail/AssocTyDef06.stderr
+++ b/testsuite/tests/typecheck/should_fail/AssocTyDef06.stderr
@@ -1,5 +1,5 @@
-
-AssocTyDef06.hs:6:5:
-    Number of parameters must match family declaration; expected 1
-    In the type synonym instance default declaration for `Typ'
-    In the class declaration for `Cls'
+

+AssocTyDef06.hs:6:5:

+    Number of parameters must match family declaration; expected 1

+    In the type instance declaration for `Typ'

+    In the class declaration for `Cls'

diff --git a/testsuite/tests/typecheck/should_fail/T1899.stderr b/testsuite/tests/typecheck/should_fail/T1899.stderr
index 5a37c8949a..9cb479cc6f 100644
--- a/testsuite/tests/typecheck/should_fail/T1899.stderr
+++ b/testsuite/tests/typecheck/should_fail/T1899.stderr
@@ -1,11 +1,11 @@
-
-T1899.hs:14:36:
-    Couldn't match type `a' with `Proposition a0'
-      `a' is a rigid type variable bound by
-          the type signature for transRHS :: [a] -> Int -> Constraint a
-          at T1899.hs:9:15
-    Expected type: [Proposition a0]
-      Actual type: [a]
-    In the first argument of `Auxiliary', namely `varSet'
-    In the first argument of `Prop', namely `(Auxiliary varSet)'
-    In the expression: Prop (Auxiliary varSet)
+

+T1899.hs:14:36:

+    Couldn't match type `a' with `Proposition a0'

+      `a' is a rigid type variable bound by

+          the type signature for transRHS :: [a] -> Int -> Constraint a

+          at T1899.hs:9:14

+    Expected type: [Proposition a0]

+      Actual type: [a]

+    In the first argument of `Auxiliary', namely `varSet'

+    In the first argument of `Prop', namely `(Auxiliary varSet)'

+    In the expression: Prop (Auxiliary varSet)

diff --git a/testsuite/tests/typecheck/should_fail/T2714.stderr b/testsuite/tests/typecheck/should_fail/T2714.stderr
index e7f3b4aa92..481a3bdb15 100644
--- a/testsuite/tests/typecheck/should_fail/T2714.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2714.stderr
@@ -1,20 +1,20 @@
-
-T2714.hs:8:5:
-    Couldn't match type `a' with `f0 b'
-      `a' is a rigid type variable bound by
-          the type signature for f :: ((a -> b) -> b) -> forall c. c -> a
-          at T2714.hs:7:8
-    Expected type: ((a -> b) -> b) -> c -> a
-      Actual type: ((a -> b) -> b) -> f0 (a -> b) -> f0 b
-    In the expression: ffmap
-    In an equation for `f': f = ffmap
-
-T2714.hs:8:5:
-    Couldn't match type `c' with `f0 (f0 b -> b)'
-      `c' is a rigid type variable bound by
-          the type signature for f :: ((a -> b) -> b) -> c -> a
-          at T2714.hs:8:1
-    Expected type: ((a -> b) -> b) -> c -> a
-      Actual type: ((a -> b) -> b) -> f0 (a -> b) -> f0 b
-    In the expression: ffmap
-    In an equation for `f': f = ffmap
+

+T2714.hs:8:5:

+    Couldn't match type `a' with `f0 b'

+      `a' is a rigid type variable bound by

+          the type signature for f :: ((a -> b) -> b) -> forall c. c -> a

+          at T2714.hs:7:6

+    Expected type: ((a -> b) -> b) -> c -> a

+      Actual type: ((a -> b) -> b) -> f0 (a -> b) -> f0 b

+    In the expression: ffmap

+    In an equation for `f': f = ffmap

+

+T2714.hs:8:5:

+    Couldn't match type `c' with `f0 (f0 b -> b)'

+      `c' is a rigid type variable bound by

+          the type signature for f :: ((a -> b) -> b) -> c -> a

+          at T2714.hs:8:1

+    Expected type: ((a -> b) -> b) -> c -> a

+      Actual type: ((a -> b) -> b) -> f0 (a -> b) -> f0 b

+    In the expression: ffmap

+    In an equation for `f': f = ffmap

diff --git a/testsuite/tests/typecheck/should_fail/T3966.stderr b/testsuite/tests/typecheck/should_fail/T3966.stderr
index b24087ff8b..9b081582a3 100644
--- a/testsuite/tests/typecheck/should_fail/T3966.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3966.stderr
@@ -1,9 +1,8 @@
-
-T3966.hs:6:16:
-    Warning: Ignoring unusable UNPACK pragma on the
-             first argument of `Foo'
-    In the definition of data constructor `Foo'
-    In the data type declaration for `Foo'
-
-<no location info>: 
-Failing due to -Werror.
+

+T3966.hs:6:16: Warning:

+    Ignoring unusable UNPACK pragma on the first argument of `Foo'

+    In the definition of data constructor `Foo'

+    In the data declaration for `Foo'

+

+<no location info>: 

+Failing due to -Werror.

diff --git a/testsuite/tests/typecheck/should_fail/tcfail028.stderr b/testsuite/tests/typecheck/should_fail/tcfail028.stderr
index 592fffe64b..6b573bfa07 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail028.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail028.stderr
@@ -1,6 +1,6 @@
-
-tcfail028.hs:4:17:
-    Expecting one more argument to `A a'
-    In the type `A a'
-    In the definition of data constructor `B'
-    In the data type declaration for `A'
+

+tcfail028.hs:4:17:

+    Expecting one more argument to `A a'

+    In the type `A a'

+    In the definition of data constructor `B'

+    In the data declaration for `A'

diff --git a/testsuite/tests/typecheck/should_fail/tcfail065.stderr b/testsuite/tests/typecheck/should_fail/tcfail065.stderr
index 3e9aecf817..fbe7e545c1 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail065.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail065.stderr
@@ -1,11 +1,11 @@
-
-tcfail065.hs:29:20:
-    Couldn't match expected type `x' with actual type `x1'
-      `x' is a rigid type variable bound by
-          the instance declaration at tcfail065.hs:28:18
-      `x1' is a rigid type variable bound by
-           the type signature for setX :: x1 -> X x -> X x
-           at tcfail065.hs:29:3
-    In the first argument of `X', namely `x'
-    In the expression: X x
-    In an equation for `setX': setX x (X _) = X x
+

+tcfail065.hs:29:20:

+    Couldn't match expected type `x' with actual type `x1'

+      `x' is a rigid type variable bound by

+          the instance declaration at tcfail065.hs:28:10

+      `x1' is a rigid type variable bound by

+           the type signature for setX :: x1 -> X x -> X x

+           at tcfail065.hs:29:3

+    In the first argument of `X', namely `x'

+    In the expression: X x

+    In an equation for `setX': setX x (X _) = X x

diff --git a/testsuite/tests/typecheck/should_fail/tcfail068.stderr b/testsuite/tests/typecheck/should_fail/tcfail068.stderr
index 4b9c8064a7..bf6e1448bd 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail068.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail068.stderr
@@ -1,97 +1,97 @@
-
-tcfail068.hs:14:9:
-    Could not deduce (s1 ~ s)
-    from the context (Constructed a)
-      bound by the type signature for
-                 itgen :: Constructed a => (Int, Int) -> a -> IndTree s a
-      at tcfail068.hs:11:10-55
-      `s1' is a rigid type variable bound by
-           a type expected by the context: GHC.ST.ST s1 (IndTree s a)
-           at tcfail068.hs:13:9
-      `s' is a rigid type variable bound by
-          the type signature for
-            itgen :: Constructed a => (Int, Int) -> a -> IndTree s a
-          at tcfail068.hs:11:53
-    Expected type: GHC.ST.ST s1 (IndTree s a)
-      Actual type: GHC.ST.ST s1 (STArray s1 (Int, Int) a)
-    In the return type of a call of `newSTArray'
-    In the first argument of `runST', namely
-      `(newSTArray ((1, 1), n) x)'
-    In the expression: runST (newSTArray ((1, 1), n) x)
-
-tcfail068.hs:19:21:
-    Could not deduce (s ~ s1)
-    from the context (Constructed a)
-      bound by the type signature for
-                 itiap :: Constructed a =>
-                          (Int, Int) -> (a -> a) -> IndTree s a -> IndTree s a
-      at tcfail068.hs:16:10-75
-      `s' is a rigid type variable bound by
-          the type signature for
-            itiap :: Constructed a =>
-                     (Int, Int) -> (a -> a) -> IndTree s a -> IndTree s a
-          at tcfail068.hs:16:58
-      `s1' is a rigid type variable bound by
-           a type expected by the context: GHC.ST.ST s1 (IndTree s a)
-           at tcfail068.hs:18:9
-    Expected type: STArray s1 (Int, Int) a
-      Actual type: IndTree s a
-    In the first argument of `readSTArray', namely `arr'
-    In the first argument of `(>>=)', namely `readSTArray arr i'
-    In the first argument of `runST', namely
-      `(readSTArray arr i
-        >>= \ val -> writeSTArray arr i (f val) >> return arr)'
-
-tcfail068.hs:24:35:
-    Could not deduce (s ~ s1)
-    from the context (Constructed a)
-      bound by the type signature for
-                 itrap :: Constructed a =>
-                          ((Int, Int), (Int, Int)) -> (a -> a) -> IndTree s a -> IndTree s a
-      at tcfail068.hs:23:10-87
-      `s' is a rigid type variable bound by
-          the type signature for
-            itrap :: Constructed a =>
-                     ((Int, Int), (Int, Int)) -> (a -> a) -> IndTree s a -> IndTree s a
-          at tcfail068.hs:23:70
-      `s1' is a rigid type variable bound by
-           a type expected by the context: GHC.ST.ST s1 (IndTree s a)
-           at tcfail068.hs:24:29
-    Expected type: GHC.ST.ST s1 (IndTree s a)
-      Actual type: GHC.ST.ST s (IndTree s a)
-    In the return type of a call of itrap'
-    In the first argument of `runST', namely `(itrap' i k)'
-    In the expression: runST (itrap' i k)
-
-tcfail068.hs:36:46:
-    Could not deduce (s ~ s1)
-    from the context (Constructed b)
-      bound by the type signature for
-                 itrapstate :: Constructed b =>
-                               ((Int, Int), (Int, Int))
-                               -> (a -> b -> (a, b))
-                               -> ((Int, Int) -> c -> a)
-                               -> (a -> c)
-                               -> c
-                               -> IndTree s b
-                               -> (c, IndTree s b)
-      at tcfail068.hs:(34,15)-(35,62)
-      `s' is a rigid type variable bound by
-          the type signature for
-            itrapstate :: Constructed b =>
-                          ((Int, Int), (Int, Int))
-                          -> (a -> b -> (a, b))
-                          -> ((Int, Int) -> c -> a)
-                          -> (a -> c)
-                          -> c
-                          -> IndTree s b
-                          -> (c, IndTree s b)
-          at tcfail068.hs:35:40
-      `s1' is a rigid type variable bound by
-           a type expected by the context: GHC.ST.ST s1 (c, IndTree s b)
-           at tcfail068.hs:36:40
-    Expected type: GHC.ST.ST s1 (c, IndTree s b)
-      Actual type: GHC.ST.ST s (c, IndTree s b)
-    In the return type of a call of itrapstate'
-    In the first argument of `runST', namely `(itrapstate' i k s)'
-    In the expression: runST (itrapstate' i k s)
+

+tcfail068.hs:14:9:

+    Could not deduce (s1 ~ s)

+    from the context (Constructed a)

+      bound by the type signature for

+                 itgen :: Constructed a => (Int, Int) -> a -> IndTree s a

+      at tcfail068.hs:11:10-55

+      `s1' is a rigid type variable bound by

+           a type expected by the context: GHC.ST.ST s1 (IndTree s a)

+           at tcfail068.hs:13:9

+      `s' is a rigid type variable bound by

+          the type signature for

+            itgen :: Constructed a => (Int, Int) -> a -> IndTree s a

+          at tcfail068.hs:11:10

+    Expected type: GHC.ST.ST s1 (IndTree s a)

+      Actual type: GHC.ST.ST s1 (STArray s1 (Int, Int) a)

+    In the return type of a call of `newSTArray'

+    In the first argument of `runST', namely

+      `(newSTArray ((1, 1), n) x)'

+    In the expression: runST (newSTArray ((1, 1), n) x)

+

+tcfail068.hs:19:21:

+    Could not deduce (s ~ s1)

+    from the context (Constructed a)

+      bound by the type signature for

+                 itiap :: Constructed a =>

+                          (Int, Int) -> (a -> a) -> IndTree s a -> IndTree s a

+      at tcfail068.hs:16:10-75

+      `s' is a rigid type variable bound by

+          the type signature for

+            itiap :: Constructed a =>

+                     (Int, Int) -> (a -> a) -> IndTree s a -> IndTree s a

+          at tcfail068.hs:16:10

+      `s1' is a rigid type variable bound by

+           a type expected by the context: GHC.ST.ST s1 (IndTree s a)

+           at tcfail068.hs:18:9

+    Expected type: STArray s1 (Int, Int) a

+      Actual type: IndTree s a

+    In the first argument of `readSTArray', namely `arr'

+    In the first argument of `(>>=)', namely `readSTArray arr i'

+    In the first argument of `runST', namely

+      `(readSTArray arr i

+        >>= \ val -> writeSTArray arr i (f val) >> return arr)'

+

+tcfail068.hs:24:35:

+    Could not deduce (s ~ s1)

+    from the context (Constructed a)

+      bound by the type signature for

+                 itrap :: Constructed a =>

+                          ((Int, Int), (Int, Int)) -> (a -> a) -> IndTree s a -> IndTree s a

+      at tcfail068.hs:23:10-87

+      `s' is a rigid type variable bound by

+          the type signature for

+            itrap :: Constructed a =>

+                     ((Int, Int), (Int, Int)) -> (a -> a) -> IndTree s a -> IndTree s a

+          at tcfail068.hs:23:10

+      `s1' is a rigid type variable bound by

+           a type expected by the context: GHC.ST.ST s1 (IndTree s a)

+           at tcfail068.hs:24:29

+    Expected type: GHC.ST.ST s1 (IndTree s a)

+      Actual type: GHC.ST.ST s (IndTree s a)

+    In the return type of a call of itrap'

+    In the first argument of `runST', namely `(itrap' i k)'

+    In the expression: runST (itrap' i k)

+

+tcfail068.hs:36:46:

+    Could not deduce (s ~ s1)

+    from the context (Constructed b)

+      bound by the type signature for

+                 itrapstate :: Constructed b =>

+                               ((Int, Int), (Int, Int))

+                               -> (a -> b -> (a, b))

+                               -> ((Int, Int) -> c -> a)

+                               -> (a -> c)

+                               -> c

+                               -> IndTree s b

+                               -> (c, IndTree s b)

+      at tcfail068.hs:(34,15)-(35,62)

+      `s' is a rigid type variable bound by

+          the type signature for

+            itrapstate :: Constructed b =>

+                          ((Int, Int), (Int, Int))

+                          -> (a -> b -> (a, b))

+                          -> ((Int, Int) -> c -> a)

+                          -> (a -> c)

+                          -> c

+                          -> IndTree s b

+                          -> (c, IndTree s b)

+          at tcfail068.hs:34:15

+      `s1' is a rigid type variable bound by

+           a type expected by the context: GHC.ST.ST s1 (c, IndTree s b)

+           at tcfail068.hs:36:40

+    Expected type: GHC.ST.ST s1 (c, IndTree s b)

+      Actual type: GHC.ST.ST s (c, IndTree s b)

+    In the return type of a call of itrapstate'

+    In the first argument of `runST', namely `(itrapstate' i k s)'

+    In the expression: runST (itrapstate' i k s)

diff --git a/testsuite/tests/typecheck/should_fail/tcfail070.stderr b/testsuite/tests/typecheck/should_fail/tcfail070.stderr
index 31dd66e77f..76e9feb515 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail070.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail070.stderr
@@ -1,5 +1,5 @@
-
-tcfail070.hs:15:15:
-    `[Int]' is applied to too many type arguments
-    In the type `[Int] Bool'
-    In the type synonym declaration for `State'
+

+tcfail070.hs:15:15:

+    `[Int]' is applied to too many type arguments

+    In the type `[Int] Bool'

+    In the type declaration for `State'

diff --git a/testsuite/tests/typecheck/should_fail/tcfail086.stderr b/testsuite/tests/typecheck/should_fail/tcfail086.stderr
index 4b221839ea..1aa420928d 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail086.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail086.stderr
@@ -1,6 +1,6 @@
-
-tcfail086.hs:6:38:
-    Can't make a derived instance of `Eq Ex':
-      Constructor `Ex' must have a Haskell-98 type
-      Possible fix: use a standalone deriving declaration instead
-    In the data type declaration for `Ex'
+

+tcfail086.hs:6:38:

+    Can't make a derived instance of `Eq Ex':

+      Constructor `Ex' must have a Haskell-98 type

+      Possible fix: use a standalone deriving declaration instead

+    In the data declaration for `Ex'

diff --git a/testsuite/tests/typecheck/should_fail/tcfail087.stderr b/testsuite/tests/typecheck/should_fail/tcfail087.stderr
index bd85f732ea..3c244ddc8b 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail087.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail087.stderr
@@ -1,7 +1,7 @@
-
-tcfail087.hs:6:14:
-    Kind mis-match
-    Expected kind `ArgKind', but `(# Int, Int #)' has kind `(#)'
-    In the type `(# Int, Int #)'
-    In the definition of data constructor `Ex'
-    In the data type declaration for `Ex'
+

+tcfail087.hs:6:14:

+    Kind mis-match

+    Expected kind `ArgKind', but `(# Int, Int #)' has kind `(#)'

+    In the type `(# Int, Int #)'

+    In the definition of data constructor `Ex'

+    In the data declaration for `Ex'

diff --git a/testsuite/tests/typecheck/should_fail/tcfail100.stderr b/testsuite/tests/typecheck/should_fail/tcfail100.stderr
index 36ee6f8218..885c8220b9 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail100.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail100.stderr
@@ -1,4 +1,4 @@
-
-tcfail100.hs:7:1:
-    Type synonym `A' should have 1 argument, but has been given none
-    In the type synonym declaration for `B'
+

+tcfail100.hs:7:1:

+    Type synonym `A' should have 1 argument, but has been given none

+    In the type declaration for `B'

diff --git a/testsuite/tests/typecheck/should_fail/tcfail103.stderr b/testsuite/tests/typecheck/should_fail/tcfail103.stderr
index 5a9b1839f6..134f36f193 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail103.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail103.stderr
@@ -1,12 +1,12 @@
-
-tcfail103.hs:15:23:
-    Couldn't match type `t' with `s'
-      `t' is a rigid type variable bound by
-          the type signature for f :: ST t Int at tcfail103.hs:10:8
-      `s' is a rigid type variable bound by
-          the type signature for g :: ST s Int at tcfail103.hs:13:17
-    Expected type: STRef s Int
-      Actual type: STRef t Int
-    In the first argument of `readSTRef', namely `v'
-    In the expression: readSTRef v
-    In an equation for `g': g = readSTRef v
+

+tcfail103.hs:15:23:

+    Couldn't match type `t' with `s'

+      `t' is a rigid type variable bound by

+          the type signature for f :: ST t Int at tcfail103.hs:10:5

+      `s' is a rigid type variable bound by

+          the type signature for g :: ST s Int at tcfail103.hs:13:14

+    Expected type: STRef s Int

+      Actual type: STRef t Int

+    In the first argument of `readSTRef', namely `v'

+    In the expression: readSTRef v

+    In an equation for `g': g = readSTRef v

diff --git a/testsuite/tests/typecheck/should_fail/tcfail117.stderr b/testsuite/tests/typecheck/should_fail/tcfail117.stderr
index 2bc3d7fd63..c7be9199c5 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail117.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail117.stderr
@@ -1,13 +1,13 @@
-
-tcfail117.hs:5:32:
-    Can't make a derived instance of `Enum N1':
-      `N1' must be an enumeration type
-      (an enumeration consists of one or more nullary, non-GADT constructors)
-      Try -XGeneralizedNewtypeDeriving for GHC's newtype-deriving extension
-    In the newtype declaration for `N1'
-
-tcfail117.hs:6:32:
-    Can't make a derived instance of `Enum N2':
-      `N2' must be an enumeration type
-      (an enumeration consists of one or more nullary, non-GADT constructors)
-    In the data type declaration for `N2'
+

+tcfail117.hs:5:32:

+    Can't make a derived instance of `Enum N1':

+      `N1' must be an enumeration type

+      (an enumeration consists of one or more nullary, non-GADT constructors)

+      Try -XGeneralizedNewtypeDeriving for GHC's newtype-deriving extension

+    In the newtype declaration for `N1'

+

+tcfail117.hs:6:32:

+    Can't make a derived instance of `Enum N2':

+      `N2' must be an enumeration type

+      (an enumeration consists of one or more nullary, non-GADT constructors)

+    In the data declaration for `N2'

diff --git a/testsuite/tests/typecheck/should_fail/tcfail131.stderr b/testsuite/tests/typecheck/should_fail/tcfail131.stderr
index 9c93a0f916..785801a9a4 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail131.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail131.stderr
@@ -1,11 +1,11 @@
-
-tcfail131.hs:7:9:
-    Could not deduce (b ~ Integer)
-    from the context (Num b)
-      bound by the type signature for g :: Num b => b -> b
-      at tcfail131.hs:6:8-22
-      `b' is a rigid type variable bound by
-          the type signature for g :: Num b => b -> b at tcfail131.hs:6:12
-    In the return type of a call of `f'
-    In the expression: f x x
-    In an equation for `g': g x = f x x
+

+tcfail131.hs:7:9:

+    Could not deduce (b ~ Integer)

+    from the context (Num b)

+      bound by the type signature for g :: Num b => b -> b

+      at tcfail131.hs:6:8-22

+      `b' is a rigid type variable bound by

+          the type signature for g :: Num b => b -> b at tcfail131.hs:6:8

+    In the return type of a call of `f'

+    In the expression: f x x

+    In an equation for `g': g x = f x x

diff --git a/testsuite/tests/typecheck/should_fail/tcfail132.stderr b/testsuite/tests/typecheck/should_fail/tcfail132.stderr
index 14e1f8d98c..bfe7fc3ab7 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail132.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail132.stderr
@@ -1,7 +1,7 @@
-
-tcfail132.hs:17:37:
-    Kind mis-match
-    The first argument of `T' should have kind `* -> * -> * -> *',
-    but `Object f' f t' has kind `* -> * -> *'
-    In the type `T (Object f' f t) (DUnit t)'
-    In the type synonym declaration for `LiftObject'
+

+tcfail132.hs:17:37:

+    Kind mis-match

+    The first argument of `T' should have kind `* -> * -> * -> *',

+    but `Object f' f t' has kind `* -> * -> *'

+    In the type `T (Object f' f t) (DUnit t)'

+    In the type declaration for `LiftObject'

diff --git a/testsuite/tests/typecheck/should_fail/tcfail136.stderr b/testsuite/tests/typecheck/should_fail/tcfail136.stderr
index cfcfa603af..c1071a11ec 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail136.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail136.stderr
@@ -1,6 +1,6 @@
-
-tcfail136.hs:9:35:
-    Expecting one more argument to `SymDict'
-    In the type `SymDict'
-    In the definition of data constructor `SymTable'
-    In the data type declaration for `SymTable'
+

+tcfail136.hs:9:35:

+    Expecting one more argument to `SymDict'

+    In the type `SymDict'

+    In the definition of data constructor `SymTable'

+    In the data declaration for `SymTable'

diff --git a/testsuite/tests/typecheck/should_fail/tcfail146.stderr b/testsuite/tests/typecheck/should_fail/tcfail146.stderr
index 8a0a77767e..433327a089 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail146.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail146.stderr
@@ -1,6 +1,6 @@
-
-tcfail146.hs:7:22:
-    Predicate `SClass a' used as a type
-    In the type `SClass a'
-    In the definition of data constructor `SCon'
-    In the data type declaration for `SData'
+

+tcfail146.hs:7:22:

+    Predicate `SClass a' used as a type

+    In the type `SClass a'

+    In the definition of data constructor `SCon'

+    In the data declaration for `SData'

diff --git a/testsuite/tests/typecheck/should_fail/tcfail147.stderr b/testsuite/tests/typecheck/should_fail/tcfail147.stderr
index 3cca86408b..f5aa074a80 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail147.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail147.stderr
@@ -1,6 +1,6 @@
-
-tcfail147.hs:7:19:
-    Expecting one more argument to `XClass'
-    In the type `XClass'
-    In the definition of data constructor `XCon'
-    In the data type declaration for `XData'
+

+tcfail147.hs:7:19:

+    Expecting one more argument to `XClass'

+    In the type `XClass'

+    In the definition of data constructor `XCon'

+    In the data declaration for `XData'

diff --git a/testsuite/tests/typecheck/should_fail/tcfail148.stderr b/testsuite/tests/typecheck/should_fail/tcfail148.stderr
index 32ef3abc75..252ffec3c0 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail148.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail148.stderr
@@ -1,6 +1,6 @@
-
-tcfail148.hs:5:28:
-    Expecting one more argument to `List'
-    In the type `List'
-    In the definition of data constructor `Cons'
-    In the data type declaration for `List'
+

+tcfail148.hs:5:28:

+    Expecting one more argument to `List'

+    In the type `List'

+    In the definition of data constructor `Cons'

+    In the data declaration for `List'

diff --git a/testsuite/tests/typecheck/should_fail/tcfail151.stderr b/testsuite/tests/typecheck/should_fail/tcfail151.stderr
index 01eec1d93e..c7dce325a0 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail151.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail151.stderr
@@ -1,7 +1,7 @@
-
-tcfail151.hs:1:14:
-    Warning: -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
-
-tcfail151.hs:8:6:
-    Expecting one more argument to `Name a'
-    In the data type declaration for `Exp'
+

+tcfail151.hs:1:14: Warning:

+    -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.

+

+tcfail151.hs:8:6:

+    Expecting one more argument to `Name a'

+    In the data declaration for `Exp'

diff --git a/testsuite/tests/typecheck/should_fail/tcfail155.stderr b/testsuite/tests/typecheck/should_fail/tcfail155.stderr
index fcc1133d4d..1b5f1f3b0e 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail155.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail155.stderr
@@ -1,6 +1,6 @@
-
-tcfail155.hs:8:6:
-    Data constructor `P' returns type `L2'
-      instead of an instance of its parent type `T a'
-    In the definition of data constructor `P'
-    In the data type declaration for `T'
+

+tcfail155.hs:8:6:

+    Data constructor `P' returns type `L2'

+      instead of an instance of its parent type `T a'

+    In the definition of data constructor `P'

+    In the data declaration for `T'

diff --git a/testsuite/tests/typecheck/should_fail/tcfail162.stderr b/testsuite/tests/typecheck/should_fail/tcfail162.stderr
index d1bb892ab0..de2b3129b9 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail162.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail162.stderr
@@ -1,6 +1,6 @@
-
-tcfail162.hs:10:33:
-    Expecting one more argument to `ForeignPtr'
-    In the type `ForeignPtr'
-    In the definition of data constructor `Foo'
-    In the data type declaration for `Foo'
+

+tcfail162.hs:10:33:

+    Expecting one more argument to `ForeignPtr'

+    In the type `ForeignPtr'

+    In the definition of data constructor `Foo'

+    In the data declaration for `Foo'

diff --git a/testsuite/tests/typecheck/should_fail/tcfail174.stderr b/testsuite/tests/typecheck/should_fail/tcfail174.stderr
index 52a627ad9f..c4fb525c5e 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail174.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail174.stderr
@@ -1,31 +1,31 @@
-
-tcfail174.hs:9:10:
-    Couldn't match expected type `forall a. a -> a'
-                with actual type `a0 -> a0'
-    In the first argument of `Base', namely `id'
-    In the expression: Base id
-    In an equation for `g': g = Base id
-
-tcfail174.hs:13:14:
-    Couldn't match type `a' with `a1'
-      `a' is a rigid type variable bound by
-          the inferred type of h1 :: Capture a at tcfail174.hs:13:1
-      `a1' is a rigid type variable bound by
-           the type forall a1. a1 -> a1 at tcfail174.hs:13:14
-    Expected type: Capture (forall x. x -> a)
-      Actual type: Capture (forall a. a -> a)
-    In the first argument of `Capture', namely `g'
-    In the expression: Capture g
-    In an equation for `h1': h1 = Capture g
-
-tcfail174.hs:16:14:
-    Couldn't match type `a' with `b'
-      `a' is a rigid type variable bound by
-          the type forall a. a -> a at tcfail174.hs:16:14
-      `b' is a rigid type variable bound by
-          the type signature for h2 :: Capture b at tcfail174.hs:15:15
-    Expected type: Capture (forall x. x -> b)
-      Actual type: Capture (forall a. a -> a)
-    In the first argument of `Capture', namely `g'
-    In the expression: Capture g
-    In an equation for `h2': h2 = Capture g
+

+tcfail174.hs:9:10:

+    Couldn't match expected type `forall a. a -> a'

+                with actual type `a0 -> a0'

+    In the first argument of `Base', namely `id'

+    In the expression: Base id

+    In an equation for `g': g = Base id

+

+tcfail174.hs:13:14:

+    Couldn't match type `a' with `a1'

+      `a' is a rigid type variable bound by

+          the inferred type of h1 :: Capture a at tcfail174.hs:13:1

+      `a1' is a rigid type variable bound by

+           the type forall a1. a1 -> a1 at tcfail174.hs:13:14

+    Expected type: Capture (forall x. x -> a)

+      Actual type: Capture (forall a. a -> a)

+    In the first argument of `Capture', namely `g'

+    In the expression: Capture g

+    In an equation for `h1': h1 = Capture g

+

+tcfail174.hs:16:14:

+    Couldn't match type `a' with `b'

+      `a' is a rigid type variable bound by

+          the type forall a. a -> a at tcfail174.hs:16:14

+      `b' is a rigid type variable bound by

+          the type signature for h2 :: Capture b at tcfail174.hs:15:7

+    Expected type: Capture (forall x. x -> b)

+      Actual type: Capture (forall a. a -> a)

+    In the first argument of `Capture', namely `g'

+    In the expression: Capture g

+    In an equation for `h2': h2 = Capture g

diff --git a/testsuite/tests/typecheck/should_fail/tcfail175.stderr b/testsuite/tests/typecheck/should_fail/tcfail175.stderr
index ded6ea65eb..797b701d6d 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail175.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail175.stderr
@@ -1,8 +1,8 @@
-
-tcfail175.hs:11:1:
-    Couldn't match expected type `a'
-                with actual type `String -> String -> String'
-      `a' is a rigid type variable bound by
-          the type signature for evalRHS :: Int -> a at tcfail175.hs:10:19
-    The equation(s) for `evalRHS' have three arguments,
-    but its type `Int -> a' has only one
+

+tcfail175.hs:11:1:

+    Couldn't match expected type `a'

+                with actual type `String -> String -> String'

+      `a' is a rigid type variable bound by

+          the type signature for evalRHS :: Int -> a at tcfail175.hs:10:12

+    The equation(s) for `evalRHS' have three arguments,

+    but its type `Int -> a' has only one

diff --git a/testsuite/tests/typecheck/should_fail/tcfail179.stderr b/testsuite/tests/typecheck/should_fail/tcfail179.stderr
index 7a29705723..4962c8aae7 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail179.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail179.stderr
@@ -1,13 +1,13 @@
-
-tcfail179.hs:14:39:
-    Couldn't match expected type `s' with actual type `x'
-      `s' is a rigid type variable bound by
-          the type signature for run :: T s -> Int at tcfail179.hs:12:10
-      `x' is a rigid type variable bound by
-          a pattern with constructor
-            T :: forall s x. (s -> (x -> s) -> (x, s, Int)) -> T s,
-          in a case alternative
-          at tcfail179.hs:14:14
-    In the first argument of `g', namely `x'
-    In the expression: g x id
-    In a pattern binding: (x, _, b) = g x id
+

+tcfail179.hs:14:39:

+    Couldn't match expected type `s' with actual type `x'

+      `s' is a rigid type variable bound by

+          the type signature for run :: T s -> Int at tcfail179.hs:12:8

+      `x' is a rigid type variable bound by

+          a pattern with constructor

+            T :: forall s x. (s -> (x -> s) -> (x, s, Int)) -> T s,

+          in a case alternative

+          at tcfail179.hs:14:14

+    In the first argument of `g', namely `x'

+    In the expression: g x id

+    In a pattern binding: (x, _, b) = g x id

diff --git a/testsuite/tests/typecheck/should_fail/tcfail195.stderr b/testsuite/tests/typecheck/should_fail/tcfail195.stderr
index 5816773f48..d690ebac82 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail195.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail195.stderr
@@ -1,5 +1,5 @@
-
-tcfail195.hs:6:3:
-    Illegal polymorphic or qualified type: forall a. a
-    In the definition of data constructor `Foo'
-    In the data type declaration for `Foo'
+

+tcfail195.hs:6:3:

+    Illegal polymorphic or qualified type: forall a. a

+    In the definition of data constructor `Foo'

+    In the data declaration for `Foo'

diff --git a/testsuite/tests/typecheck/should_fail/tcfail201.stderr b/testsuite/tests/typecheck/should_fail/tcfail201.stderr
index 0cb16557f8..1c5f59a6e4 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail201.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail201.stderr
@@ -1,15 +1,15 @@
-
-tcfail201.hs:18:28:
-    Couldn't match expected type `a' with actual type `HsDoc id0'
-      `a' is a rigid type variable bound by
-          the type signature for
-            gfoldl' :: (forall a1 b. c (a1 -> b) -> a1 -> c b)
-                       -> (forall g. g -> c g) -> a -> c a
-          at tcfail201.hs:15:78
-    In the pattern: DocParagraph hsDoc
-    In a case alternative:
-        (DocParagraph hsDoc) -> z DocParagraph `k` hsDoc
-    In the expression:
-      case hsDoc of {
-        DocEmpty -> z DocEmpty
-        (DocParagraph hsDoc) -> z DocParagraph `k` hsDoc }
+

+tcfail201.hs:18:28:

+    Couldn't match expected type `a' with actual type `HsDoc id0'

+      `a' is a rigid type variable bound by

+          the type signature for

+            gfoldl' :: (forall a1 b. c (a1 -> b) -> a1 -> c b)

+                       -> (forall g. g -> c g) -> a -> c a

+          at tcfail201.hs:15:12

+    In the pattern: DocParagraph hsDoc

+    In a case alternative:

+        (DocParagraph hsDoc) -> z DocParagraph `k` hsDoc

+    In the expression:

+      case hsDoc of {

+        DocEmpty -> z DocEmpty

+        (DocParagraph hsDoc) -> z DocParagraph `k` hsDoc }