Error messsage wibblification

34 files changed, 140 insertions, 141 deletions

diff --git a/testsuite/tests/ghci/scripts/T4015.stdout b/testsuite/tests/ghci/scripts/T4015.stdout
index e850fb9384..4ce312c581 100644
--- a/testsuite/tests/ghci/scripts/T4015.stdout
+++ b/testsuite/tests/ghci/scripts/T4015.stdout
@@ -8,7 +8,7 @@ data R
   | S {x :: Char}
   | T {y :: Int, z :: Float}
   | W
-  	-- Defined at T4015.hs:3:6
+  	-- Defined at T4015.hs:3:1
 data R = ... | S {...} | ... 	-- Defined at T4015.hs:4:10
 data R = ... | T {...} | ... 	-- Defined at T4015.hs:5:10
 data R = ... | W 	-- Defined at T4015.hs:6:10
diff --git a/testsuite/tests/ghci/scripts/T4087.stdout b/testsuite/tests/ghci/scripts/T4087.stdout
index e28eac1776..ece136b610 100644
--- a/testsuite/tests/ghci/scripts/T4087.stdout
+++ b/testsuite/tests/ghci/scripts/T4087.stdout
@@ -1,3 +1,3 @@
 data Equal a b where
   Equal :: Equal a a
-  	-- Defined at T4087.hs:5:6
+  	-- Defined at T4087.hs:5:1
diff --git a/testsuite/tests/ghci/scripts/T4175.stdout b/testsuite/tests/ghci/scripts/T4175.stdout
index 553d92a0ab..a253cf25bf 100644
--- a/testsuite/tests/ghci/scripts/T4175.stdout
+++ b/testsuite/tests/ghci/scripts/T4175.stdout
@@ -1,17 +1,17 @@
-type family A a b :: * 	-- Defined at T4175.hs:4:13
+type family A a b :: * 	-- Defined at T4175.hs:4:1
 type instance A (Maybe a) a -- Defined at T4175.hs:6:1
 type instance A Int Int -- Defined at T4175.hs:5:1
-data family B a 	-- Defined at T4175.hs:8:13
+data family B a 	-- Defined at T4175.hs:8:1
 data instance B () -- Defined at T4175.hs:9:15
 class C a where
   type family D a b :: *
-  	-- Defined at T4175.hs:12:10
+  	-- Defined at T4175.hs:12:5
 type D () () -- Defined at T4175.hs:18:5
 type D Int () -- Defined at T4175.hs:15:5
 type family E a :: * where
     E () = Bool
     E Int = String
-  	-- Defined at T4175.hs:20:13
+  	-- Defined at T4175.hs:20:1
 data () = () 	-- Defined in ‛GHC.Tuple’
 instance C () -- Defined at T4175.hs:17:10
 instance Bounded () -- Defined in ‛GHC.Enum’
diff --git a/testsuite/tests/ghci/scripts/T5417.stdout b/testsuite/tests/ghci/scripts/T5417.stdout
index ec42e184a0..80bb298860 100644
--- a/testsuite/tests/ghci/scripts/T5417.stdout
+++ b/testsuite/tests/ghci/scripts/T5417.stdout
@@ -3,5 +3,5 @@ data instance C.F (B1 a) = B2 a
 data family D a
 class C.C1 a where
   data family C.F a
-  	-- Defined at T5417a.hs:5:10
+  	-- Defined at T5417a.hs:5:5
 data C.F (B1 a) -- Defined at T5417.hs:8:10
diff --git a/testsuite/tests/ghci/scripts/T5820.stdout b/testsuite/tests/ghci/scripts/T5820.stdout
index 4102b1f987..e0a97a06d5 100644
--- a/testsuite/tests/ghci/scripts/T5820.stdout
+++ b/testsuite/tests/ghci/scripts/T5820.stdout
@@ -1,4 +1,4 @@
-data Foo = Foo 	-- Defined at T5820.hs:2:6
+data Foo = Foo 	-- Defined at T5820.hs:2:1
 instance Eq Foo -- Defined at T5820.hs:3:10
-data Foo = Foo 	-- Defined at T5820.hs:2:6
+data Foo = Foo 	-- Defined at T5820.hs:2:1
 instance Eq Foo -- Defined at T5820.hs:3:10
diff --git a/testsuite/tests/ghci/scripts/T6027ghci.stdout b/testsuite/tests/ghci/scripts/T6027ghci.stdout
index 3b5a01c5ad..2cc6934ea7 100644
--- a/testsuite/tests/ghci/scripts/T6027ghci.stdout
+++ b/testsuite/tests/ghci/scripts/T6027ghci.stdout
@@ -1 +1 @@
-data (?) 	-- Defined at <interactive>:3:6
+data (?) 	-- Defined at <interactive>:3:1
diff --git a/testsuite/tests/ghci/scripts/T7872.stdout b/testsuite/tests/ghci/scripts/T7872.stdout
index a2f8913307..81d960947c 100644
--- a/testsuite/tests/ghci/scripts/T7872.stdout
+++ b/testsuite/tests/ghci/scripts/T7872.stdout
@@ -1,2 +1,2 @@
-type T = forall a. a -> a 	-- Defined at <interactive>:3:6
-data D = MkT (forall b. b -> b) 	-- Defined at <interactive>:4:6
+type T = forall a. a -> a 	-- Defined at <interactive>:3:1
+data D = MkT (forall b. b -> b) 	-- Defined at <interactive>:4:1
diff --git a/testsuite/tests/ghci/scripts/T7873.stdout b/testsuite/tests/ghci/scripts/T7873.stdout
index 785fbf06b2..0167fb2eba 100644
--- a/testsuite/tests/ghci/scripts/T7873.stdout
+++ b/testsuite/tests/ghci/scripts/T7873.stdout
@@ -1,6 +1,6 @@
 data D1 where
   MkD1 :: (forall (p :: k -> *) (a :: k). p a -> Int) -> D1
-  	-- Defined at <interactive>:3:6
+  	-- Defined at <interactive>:3:1
 data D2 where
   MkD2 :: (forall (p :: k -> *) (a :: k). p a -> Int) -> D2
-  	-- Defined at <interactive>:4:6
+  	-- Defined at <interactive>:4:1
diff --git a/testsuite/tests/ghci/scripts/T7939.stdout b/testsuite/tests/ghci/scripts/T7939.stdout
index 863eb2ffef..9a88b5c294 100644
--- a/testsuite/tests/ghci/scripts/T7939.stdout
+++ b/testsuite/tests/ghci/scripts/T7939.stdout
@@ -1,23 +1,23 @@
-class Foo (a :: k) where

-  type family Bar (a :: k) b :: *

-  	-- Defined at T7939.hs:6:9

-Bar :: k -> * -> *

-type family F a :: * 	-- Defined at T7939.hs:8:13

-type instance F Int -- Defined at T7939.hs:9:1

-F :: * -> *

-type family G a :: * where G Int = Bool

-  	-- Defined at T7939.hs:11:13

-G :: * -> *

-type family H (a :: Bool) :: Bool where H 'False = 'True

-  	-- Defined at T7939.hs:14:13

-H :: Bool -> Bool

-type family J (a :: [k]) :: Bool where

-    J '[] = 'False

-    J (h : t) = 'True

-  	-- Defined at T7939.hs:17:13

-J :: [k] -> Bool

-type family K (a :: [k]) :: Maybe k where

-    K '[] = 'Nothing

-    K (h : t) = 'Just h

-  	-- Defined at T7939.hs:21:13

-K :: [k] -> Maybe k

+class Foo (a :: k) where
+  type family Bar (a :: k) b :: *
+  	-- Defined at T7939.hs:6:4
+Bar :: k -> * -> *
+type family F a :: * 	-- Defined at T7939.hs:8:1
+type instance F Int -- Defined at T7939.hs:9:1
+F :: * -> *
+type family G a :: * where G Int = Bool
+  	-- Defined at T7939.hs:11:1
+G :: * -> *
+type family H (a :: Bool) :: Bool where H 'False = 'True
+  	-- Defined at T7939.hs:14:1
+H :: Bool -> Bool
+type family J (a :: [k]) :: Bool where
+    J '[] = 'False
+    J (h : t) = 'True
+  	-- Defined at T7939.hs:17:1
+J :: [k] -> Bool
+type family K (a :: [k]) :: Maybe k where
+    K '[] = 'Nothing
+    K (h : t) = 'Just h
+  	-- Defined at T7939.hs:21:1
+K :: [k] -> Maybe k
diff --git a/testsuite/tests/ghci/scripts/ghci019.stdout b/testsuite/tests/ghci/scripts/ghci019.stdout
index f50279eeb9..4f346e70b5 100644
--- a/testsuite/tests/ghci/scripts/ghci019.stdout
+++ b/testsuite/tests/ghci/scripts/ghci019.stdout
@@ -1,2 +1,2 @@
-data Foo = Foo 	-- Defined at ghci019.hs:8:6
+data Foo = Foo 	-- Defined at ghci019.hs:8:1
 instance Prelude.Eq Foo -- Defined at ghci019.hs:9:10
diff --git a/testsuite/tests/ghci/scripts/ghci030.stdout b/testsuite/tests/ghci/scripts/ghci030.stdout
index 24fa768e6a..3ac8cc2307 100644
--- a/testsuite/tests/ghci/scripts/ghci030.stdout
+++ b/testsuite/tests/ghci/scripts/ghci030.stdout
@@ -1,6 +1,6 @@
 data D where
   C :: (Int -> a) -> Char -> D
-  	-- Defined at ghci030.hs:8:6
+  	-- Defined at ghci030.hs:8:1
 data D where
   C :: (Int -> a) -> Char -> D
   	-- Defined at ghci030.hs:8:21
diff --git a/testsuite/tests/ghci/scripts/ghci031.stdout b/testsuite/tests/ghci/scripts/ghci031.stdout
index 018dc4bc58..d90cc7aa00 100644
--- a/testsuite/tests/ghci/scripts/ghci031.stdout
+++ b/testsuite/tests/ghci/scripts/ghci031.stdout
@@ -1 +1 @@
-data Eq a => D a = C a 	-- Defined at ghci031.hs:7:14
+data Eq a => D a = C a 	-- Defined at ghci031.hs:7:1
diff --git a/testsuite/tests/ghci/scripts/ghci033.stdout b/testsuite/tests/ghci/scripts/ghci033.stdout
index 7c21dbe24e..e4bfebeb39 100644
--- a/testsuite/tests/ghci/scripts/ghci033.stdout
+++ b/testsuite/tests/ghci/scripts/ghci033.stdout
@@ -1,2 +1,2 @@
 data Foo = Foo1 Int | Int `InfixCon` Bool
-  	-- Defined at ghci033.hs:4:6
+  	-- Defined at ghci033.hs:4:1
diff --git a/testsuite/tests/ghci/scripts/ghci042.stdout b/testsuite/tests/ghci/scripts/ghci042.stdout
index c6717daf0f..043f88952b 100644
--- a/testsuite/tests/ghci/scripts/ghci042.stdout
+++ b/testsuite/tests/ghci/scripts/ghci042.stdout
@@ -4,4 +4,4 @@ a :: Integer 	-- Defined at <interactive>:6:5
 3
 data R = B {a :: Int} 	-- Defined at <interactive>:9:13
 data T = A {main::Interactive.a :: Int}
-  	-- Defined at <interactive>:3:6
+  	-- Defined at <interactive>:3:1
diff --git a/testsuite/tests/ghci/scripts/ghci051.stdout b/testsuite/tests/ghci/scripts/ghci051.stdout
index 7ddd1c9b73..2501da4d28 100644
--- a/testsuite/tests/ghci/scripts/ghci051.stdout
+++ b/testsuite/tests/ghci/scripts/ghci051.stdout
@@ -1,5 +1,5 @@
-data T = C | D 	-- Defined at <interactive>:9:10
-type T' = main::Interactive.T 	-- Defined at <interactive>:4:6
+data T = C | D 	-- Defined at <interactive>:9:1
+type T' = main::Interactive.T 	-- Defined at <interactive>:4:1
 data main::Interactive.T = A | ...
   	-- Defined at <interactive>:3:10
 data main::Interactive.T = B | ...
diff --git a/testsuite/tests/indexed-types/should_compile/T3017.stderr b/testsuite/tests/indexed-types/should_compile/T3017.stderr
index c77129c13e..02bc37e9e8 100644
--- a/testsuite/tests/indexed-types/should_compile/T3017.stderr
+++ b/testsuite/tests/indexed-types/should_compile/T3017.stderr
@@ -5,17 +5,17 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
   Coll :: * -> Constraint
   class Coll c
-      Roles: [nominal]
-      RecFlag NonRecursive
-      type family Elem c :: *
-      empty :: c insert :: Elem c -> c -> c
+    Roles: [nominal]
+    RecFlag NonRecursive
+    type family Elem c :: * (open)
+    empty :: c insert :: Elem c -> c -> c
   ListColl :: * -> *
   data ListColl a
-      No C type associated
-      Roles: [representational]
-      RecFlag NonRecursive, Promotable
-      = L :: forall a. [a] -> ListColl a Stricts: _
-      FamilyInstance: none
+    No C type associated
+    Roles: [representational]
+    RecFlag NonRecursive, Promotable
+    = L :: forall a. [a] -> ListColl a Stricts: _
+    FamilyInstance: none
 COERCION AXIOMS
   axiom Foo.TFCo:R:ElemListColl :: Elem (ListColl a) = a
 INSTANCES
diff --git a/testsuite/tests/indexed-types/should_fail/ClosedFam3.stderr b/testsuite/tests/indexed-types/should_fail/ClosedFam3.stderr
index 920e56d4d6..dfbb7dc142 100644
--- a/testsuite/tests/indexed-types/should_fail/ClosedFam3.stderr
+++ b/testsuite/tests/indexed-types/should_fail/ClosedFam3.stderr
@@ -1,25 +1,24 @@
-

-ClosedFam3.hs-boot:5:13:

-    Type constructor ‛Foo’ has conflicting definitions in the module

-    and its hs-boot file

-    Main module: closed type family Foo a :: * where

-                     Foo Int = Bool

-                     Foo Double = Char

-    Boot file:   closed type family Foo a :: * where Foo Int = Bool

-

-ClosedFam3.hs-boot:8:13:

-    Type constructor ‛Bar’ has conflicting definitions in the module

-    and its hs-boot file

-    Main module: closed type family Bar a :: * where

-                     Bar Int = Bool

-                     Bar Double = Double

-    Boot file:   closed type family Bar a :: * where

-                     Bar Int = Bool

-                     Bar Double = Char

-

-ClosedFam3.hs-boot:12:13:

-    Type constructor ‛Baz’ has conflicting definitions in the module

-    and its hs-boot file

-    Main module: closed type family Baz a :: * where Baz Int = Bool

-    Boot file:   closed type family Baz (k::BOX) (a::k) :: * where

-                     Baz Int = Bool

+
+ClosedFam3.hs-boot:5:1:
+    Type constructor ‛Foo’ has conflicting definitions in the module
+    and its hs-boot file
+    Main module: type family Foo a :: * where
+                     Foo Int = Bool
+                     Foo Double = Char
+    Boot file:   type family Foo a :: * where Foo Int = Bool
+
+ClosedFam3.hs-boot:8:1:
+    Type constructor ‛Bar’ has conflicting definitions in the module
+    and its hs-boot file
+    Main module: type family Bar a :: * where
+                     Bar Int = Bool
+                     Bar Double = Double
+    Boot file:   type family Bar a :: * where
+                     Bar Int = Bool
+                     Bar Double = Char
+
+ClosedFam3.hs-boot:12:1:
+    Type constructor ‛Baz’ has conflicting definitions in the module
+    and its hs-boot file
+    Main module: type family Baz a :: * where Baz Int = Bool
+    Boot file:   type family Baz (a :: k) :: * where Baz Int = Bool
diff --git a/testsuite/tests/indexed-types/should_fail/ClosedFam4.stderr b/testsuite/tests/indexed-types/should_fail/ClosedFam4.stderr
index 34f8c9721e..e70ec94a6d 100644
--- a/testsuite/tests/indexed-types/should_fail/ClosedFam4.stderr
+++ b/testsuite/tests/indexed-types/should_fail/ClosedFam4.stderr
@@ -2,4 +2,4 @@
 ClosedFam4.hs:5:1:
     You may omit the equations in a closed type family
     only in a .hs-boot file
-    In the family declaration for ‛Foo’
+    In the type family declaration for ‛Foo’
diff --git a/testsuite/tests/indexed-types/should_fail/Overlap4.stderr b/testsuite/tests/indexed-types/should_fail/Overlap4.stderr
index fd545b6334..329b1ee11a 100644
--- a/testsuite/tests/indexed-types/should_fail/Overlap4.stderr
+++ b/testsuite/tests/indexed-types/should_fail/Overlap4.stderr
@@ -2,4 +2,4 @@
 Overlap4.hs:7:3:
     Number of parameters must match family declaration; expected 2
     In the equations for closed type family ‛F’
-    In the family declaration for ‛F’
+    In the type family declaration for ‛F’
diff --git a/testsuite/tests/module/mod110.stderr b/testsuite/tests/module/mod110.stderr
index f394f56214..f3e3ce93fb 100644
--- a/testsuite/tests/module/mod110.stderr
+++ b/testsuite/tests/module/mod110.stderr
@@ -1,7 +1,7 @@
 
 mod110.hs:11:10:
     Ambiguous occurrence ‛Eq’
-    It could refer to either ‛M.Eq’, defined at mod110.hs:7:7
+    It could refer to either ‛M.Eq’, defined at mod110.hs:7:1
                           or ‛Prelude.Eq’,
                              imported from ‛Prelude’ at mod110.hs:4:1-14
                              (and originally defined in ‛GHC.Classes’)
diff --git a/testsuite/tests/module/mod143.stderr b/testsuite/tests/module/mod143.stderr
index cdec14c83e..a229aba016 100644
--- a/testsuite/tests/module/mod143.stderr
+++ b/testsuite/tests/module/mod143.stderr
@@ -3,5 +3,5 @@ mod143.hs:2:21:
     Conflicting exports for ‛Foo’:
        ‛module Mod143_A’ exports ‛Mod143_A.Foo’
          imported from ‛Mod143_A’ at mod143.hs:4:1-15
-         (and originally defined at Mod143_A.hs:3:6-8)
-       ‛module M’ exports ‛M.Foo’ defined at mod143.hs:6:6
+         (and originally defined at Mod143_A.hs:3:1-14)
+       ‛module M’ exports ‛M.Foo’ defined at mod143.hs:6:1
diff --git a/testsuite/tests/module/mod18.stderr b/testsuite/tests/module/mod18.stderr
index 1ef381f90e..922b86286f 100644
--- a/testsuite/tests/module/mod18.stderr
+++ b/testsuite/tests/module/mod18.stderr
@@ -1,5 +1,5 @@
 
-mod18.hs:3:6:
+mod18.hs:3:1:
     Multiple declarations of ‛T’
-    Declared at: mod18.hs:2:6
-                 mod18.hs:3:6
+    Declared at: mod18.hs:2:1
+                 mod18.hs:3:1
diff --git a/testsuite/tests/module/mod19.stderr b/testsuite/tests/module/mod19.stderr
index fd2f5f3192..d0e7173290 100644
--- a/testsuite/tests/module/mod19.stderr
+++ b/testsuite/tests/module/mod19.stderr
@@ -1,8 +1,8 @@
 
-mod19.hs:3:7:
+mod19.hs:3:1:
     Multiple declarations of ‛C’
-    Declared at: mod19.hs:2:7
-                 mod19.hs:3:7
+    Declared at: mod19.hs:2:1
+                 mod19.hs:3:1
 
 mod19.hs:3:17:
     Multiple declarations of ‛m’
diff --git a/testsuite/tests/module/mod21.stderr b/testsuite/tests/module/mod21.stderr
index 34620a6bd4..e9cd1a7f8a 100644
--- a/testsuite/tests/module/mod21.stderr
+++ b/testsuite/tests/module/mod21.stderr
@@ -1,5 +1,5 @@
 
-mod21.hs:3:6:
+mod21.hs:3:1:
     Multiple declarations of ‛T’
-    Declared at: mod21.hs:2:6
-                 mod21.hs:3:6
+    Declared at: mod21.hs:2:1
+                 mod21.hs:3:1
diff --git a/testsuite/tests/module/mod38.stderr b/testsuite/tests/module/mod38.stderr
index 7c5f277048..c271e8d326 100644
--- a/testsuite/tests/module/mod38.stderr
+++ b/testsuite/tests/module/mod38.stderr
@@ -1,5 +1,5 @@
 
-mod38.hs:4:7:
+mod38.hs:4:1:
     Multiple declarations of ‛C’
-    Declared at: mod38.hs:3:6
-                 mod38.hs:4:7
+    Declared at: mod38.hs:3:1
+                 mod38.hs:4:1
diff --git a/testsuite/tests/rename/should_fail/T3265.stderr b/testsuite/tests/rename/should_fail/T3265.stderr
index 185861a9df..802242460e 100644
--- a/testsuite/tests/rename/should_fail/T3265.stderr
+++ b/testsuite/tests/rename/should_fail/T3265.stderr
@@ -1,8 +1,8 @@
 
-T3265.hs:7:8:
+T3265.hs:7:1:
     Illegal declaration of a type or class operator ‛:+:’
       Use TypeOperators to declare operators in type and declarations
 
-T3265.hs:9:9:
+T3265.hs:9:1:
     Illegal declaration of a type or class operator ‛:*:’
       Use TypeOperators to declare operators in type and declarations
diff --git a/testsuite/tests/rename/should_fail/rn_dup.stderr b/testsuite/tests/rename/should_fail/rn_dup.stderr
index 223985f763..f0d101c0a3 100644
--- a/testsuite/tests/rename/should_fail/rn_dup.stderr
+++ b/testsuite/tests/rename/should_fail/rn_dup.stderr
@@ -11,10 +11,10 @@ rn_dup.hs:12:16:
                  rn_dup.hs:11:27
                  rn_dup.hs:12:16
 
-rn_dup.hs:17:8:
+rn_dup.hs:17:3:
     Multiple declarations of ‛CT’
-    Declared at: rn_dup.hs:15:8
-                 rn_dup.hs:17:8
+    Declared at: rn_dup.hs:15:3
+                 rn_dup.hs:17:3
 
 rn_dup.hs:18:3:
     Multiple declarations of ‛f’
diff --git a/testsuite/tests/rename/should_fail/rnfail011.stderr b/testsuite/tests/rename/should_fail/rnfail011.stderr
index 544455a08a..352b4da837 100644
--- a/testsuite/tests/rename/should_fail/rnfail011.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail011.stderr
@@ -1,5 +1,5 @@
 
-rnfail011.hs:6:6:
+rnfail011.hs:6:1:
     Multiple declarations of ‛A’
-    Declared at: rnfail011.hs:2:6
-                 rnfail011.hs:6:6
+    Declared at: rnfail011.hs:2:1
+                 rnfail011.hs:6:1
diff --git a/testsuite/tests/rename/should_fail/rnfail012.stderr b/testsuite/tests/rename/should_fail/rnfail012.stderr
index 83b1e1d2fb..0dd75d65f7 100644
--- a/testsuite/tests/rename/should_fail/rnfail012.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail012.stderr
@@ -1,5 +1,5 @@
 
-rnfail012.hs:8:7:
+rnfail012.hs:8:1:
     Multiple declarations of ‛A’
-    Declared at: rnfail012.hs:2:7
-                 rnfail012.hs:8:7
+    Declared at: rnfail012.hs:2:1
+                 rnfail012.hs:8:1
diff --git a/testsuite/tests/rename/should_fail/rnfail055.stderr b/testsuite/tests/rename/should_fail/rnfail055.stderr
index a995c5d2b9..adc491c481 100644
--- a/testsuite/tests/rename/should_fail/rnfail055.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail055.stderr
@@ -11,19 +11,19 @@ RnFail055.hs-boot:4:1:
     Main module: f1 :: Int -> Float
     Boot file:   f1 :: Float -> Int
 
-RnFail055.hs-boot:6:6:
+RnFail055.hs-boot:6:1:
     Type constructor ‛S1’ has conflicting definitions in the module
     and its hs-boot file
     Main module: type S1 a b = (a, b)
     Boot file:   type S1 a b c = (a, b)
 
-RnFail055.hs-boot:8:6:
+RnFail055.hs-boot:8:1:
     Type constructor ‛S2’ has conflicting definitions in the module
     and its hs-boot file
     Main module: type S2 a b = forall a1. (a1, b)
     Boot file:   type S2 a b = forall b1. (a, b1)
 
-RnFail055.hs-boot:12:6:
+RnFail055.hs-boot:12:1:
     Type constructor ‛T1’ has conflicting definitions in the module
     and its hs-boot file
     Main module: data T1 a b
@@ -39,7 +39,7 @@ RnFail055.hs-boot:12:6:
                      = T1 :: forall a b. [a] -> [b] -> T1 a b Stricts: _ _
                      FamilyInstance: none
 
-RnFail055.hs-boot:14:16:
+RnFail055.hs-boot:14:1:
     Type constructor ‛T2’ has conflicting definitions in the module
     and its hs-boot file
     Main module: data Eq b => T2 a b
@@ -61,7 +61,7 @@ RnFail055.hs-boot:16:11:
 RnFail055.hs-boot:17:12:
     T3' is exported by the hs-boot file, but not exported by the module
 
-RnFail055.hs-boot:21:6:
+RnFail055.hs-boot:21:1:
     Type constructor ‛T5’ has conflicting definitions in the module
     and its hs-boot file
     Main module: data T5 a
@@ -77,7 +77,7 @@ RnFail055.hs-boot:21:6:
                      = T5 :: forall a. a -> T5 a Stricts: _
                      FamilyInstance: none
 
-RnFail055.hs-boot:23:6:
+RnFail055.hs-boot:23:1:
     Type constructor ‛T6’ has conflicting definitions in the module
     and its hs-boot file
     Main module: data T6
@@ -91,7 +91,7 @@ RnFail055.hs-boot:23:6:
                      = T6 :: Int -> T6 HasWrapper Stricts: !
                      FamilyInstance: none
 
-RnFail055.hs-boot:25:6:
+RnFail055.hs-boot:25:1:
     Type constructor ‛T7’ has conflicting definitions in the module
     and its hs-boot file
     Main module: data T7 a
@@ -110,7 +110,7 @@ RnFail055.hs-boot:25:6:
 RnFail055.hs-boot:27:22:
     RnFail055.m1 is exported by the hs-boot file, but not exported by the module
 
-RnFail055.hs-boot:28:7:
+RnFail055.hs-boot:28:1:
     Class ‛C2’ has conflicting definitions in the module
     and its hs-boot file
     Main module: class C2 a b
@@ -122,7 +122,7 @@ RnFail055.hs-boot:28:7:
                      RecFlag NonRecursive
                      m2 :: a -> b
 
-RnFail055.hs-boot:29:24:
+RnFail055.hs-boot:29:1:
     Class ‛C3’ has conflicting definitions in the module
     and its hs-boot file
     Main module: class (Eq a, Ord a) => C3 a
diff --git a/testsuite/tests/roles/should_compile/Roles3.stderr b/testsuite/tests/roles/should_compile/Roles3.stderr
index 5a074179db..b18a5b5e86 100644
--- a/testsuite/tests/roles/should_compile/Roles3.stderr
+++ b/testsuite/tests/roles/should_compile/Roles3.stderr
@@ -2,27 +2,27 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
   C1 :: * -> Constraint
   class C1 a
-      Roles: [representational]
-      RecFlag NonRecursive
-      meth1 :: a -> a
+    Roles: [representational]
+    RecFlag NonRecursive
+    meth1 :: a -> a
   C2 :: * -> * -> Constraint
   class C2 a b
-      Roles: [nominal, nominal]
-      RecFlag NonRecursive
-      meth2 :: (~) * a b -> a -> b
+    Roles: [nominal, nominal]
+    RecFlag NonRecursive
+    meth2 :: (~) * a b -> a -> b
   C3 :: * -> * -> Constraint
   class C3 a b
-      Roles: [representational, nominal]
-      RecFlag NonRecursive
-      type family F3 b :: *
-      meth3 :: a -> F3 b -> F3 b
+    Roles: [representational, nominal]
+    RecFlag NonRecursive
+    type family F3 b :: * (open)
+    meth3 :: a -> F3 b -> F3 b
   C4 :: * -> * -> Constraint
   class C4 a b
-      Roles: [representational, nominal]
-      RecFlag NonRecursive
-      meth4 :: a -> F4 b -> F4 b
+    Roles: [representational, nominal]
+    RecFlag NonRecursive
+    meth4 :: a -> F4 b -> F4 b
   F4 :: * -> *
-  type family F4 a :: *
+  type family F4 a :: * (open)
   Syn1 :: * -> *
   type Syn1 a = F4 a
   Syn2 :: * -> *
diff --git a/testsuite/tests/roles/should_fail/Roles12.stderr b/testsuite/tests/roles/should_fail/Roles12.stderr
index 42d63463e0..94f31f37f2 100644
--- a/testsuite/tests/roles/should_fail/Roles12.stderr
+++ b/testsuite/tests/roles/should_fail/Roles12.stderr
@@ -1,15 +1,15 @@
 
-Roles12.hs:5:6:
+Roles12.hs:5:1:
     Type constructor ‛T’ has conflicting definitions in the module
     and its hs-boot file
     Main module: data T a
-                     No C type associated
-                     Roles: [phantom]
-                     RecFlag Recursive, Promotable
-                     =
-                     FamilyInstance: none
+                   No C type associated
+                   Roles: [phantom]
+                   RecFlag Recursive, Promotable
+                   =
+                   FamilyInstance: none
     Boot file:   abstract(False) T a
-                     No C type associated
-                     Roles: [representational]
-                     RecFlag NonRecursive, Not promotable
-                     FamilyInstance: none
+                   No C type associated
+                   Roles: [representational]
+                   RecFlag NonRecursive, Not promotable
+                   FamilyInstance: none
diff --git a/testsuite/tests/typecheck/should_fail/T3468.stderr b/testsuite/tests/typecheck/should_fail/T3468.stderr
index fb6f43bd74..d9da3b4671 100644
--- a/testsuite/tests/typecheck/should_fail/T3468.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3468.stderr
@@ -1,5 +1,5 @@
 
-T3468.hs-boot:3:6:
+T3468.hs-boot:3:1:
     Type constructor ‛Tool’ has conflicting definitions in the module
     and its hs-boot file
     Main module: data Tool d
diff --git a/testsuite/tests/typecheck/should_fail/tcfail173.stderr b/testsuite/tests/typecheck/should_fail/tcfail173.stderr
index 2c87b91d1b..f8dfd5749d 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail173.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail173.stderr
@@ -1,4 +1,4 @@
 
-tcfail173.hs:5:12:
+tcfail173.hs:5:1:
     Illegal declaration of a type or class operator ‛<.>’
       Use TypeOperators to declare operators in type and declarations