Error message wibbles

Almost all are re-orderings of relevant-binding output

       Relevant bindings include
  +      m :: Map (a, b) elt (bound at T3169.hs:12:17)
  +      b :: b (bound at T3169.hs:12:13)
         lookup :: (a, b) -> Map (a, b) elt -> Maybe elt
           (bound at T3169.hs:12:3)
  -      b :: b (bound at T3169.hs:12:13)
  -      m :: Map (a, b) elt (bound at T3169.hs:12:17)

30 files changed, 108 insertions, 110 deletions

diff --git a/testsuite/tests/typecheck/should_fail/T1899.stderr b/testsuite/tests/typecheck/should_fail/T1899.stderr
index 50754a6cb5..55fc356324 100644
--- a/testsuite/tests/typecheck/should_fail/T1899.stderr
+++ b/testsuite/tests/typecheck/should_fail/T1899.stderr
@@ -5,7 +5,7 @@ T1899.hs:12:29:
           the type signature for transRHS :: [a] -> Int -> Constraint a
           at T1899.hs:9:14
     Relevant bindings include
-      transRHS :: [a] -> Int -> Constraint a (bound at T1899.hs:10:2)
       varSet :: [a] (bound at T1899.hs:10:11)
+      transRHS :: [a] -> Int -> Constraint a (bound at T1899.hs:10:2)
     In the first argument of ‛Prop’, namely ‛(Auxiliary undefined)’
     In the expression: Prop (Auxiliary undefined)
diff --git a/testsuite/tests/typecheck/should_fail/T2688.stderr b/testsuite/tests/typecheck/should_fail/T2688.stderr
index 1729f65126..6ee894487d 100644
--- a/testsuite/tests/typecheck/should_fail/T2688.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2688.stderr
@@ -9,8 +9,8 @@ T2688.hs:8:22:
       ‛v’ is a rigid type variable bound by
           the class declaration for ‛VectorSpace’ at T2688.hs:5:19
     Relevant bindings include
-      (^/) :: v -> s -> v (bound at T2688.hs:8:5)
-      v :: v (bound at T2688.hs:8:5)
       s :: s (bound at T2688.hs:8:10)
+      v :: v (bound at T2688.hs:8:5)
+      (^/) :: v -> s -> v (bound at T2688.hs:8:5)
     In the second argument of ‛(/)’, namely ‛s’
     In the second argument of ‛(*^)’, namely ‛(1 / s)’
diff --git a/testsuite/tests/typecheck/should_fail/T5689.stderr b/testsuite/tests/typecheck/should_fail/T5689.stderr
index 6a67b2cac6..33d7fc9d6d 100644
--- a/testsuite/tests/typecheck/should_fail/T5689.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5689.stderr
@@ -2,31 +2,31 @@
 T5689.hs:10:36:
     Couldn't match expected type ‛Bool’ with actual type ‛t’
     Relevant bindings include
-      r :: IORef (t -> t) (bound at T5689.hs:7:14)
       v :: t (bound at T5689.hs:10:28)
+      r :: IORef (t -> t) (bound at T5689.hs:7:14)
     In the expression: v
     In the expression: if v then False else True
 
 T5689.hs:10:43:
     Couldn't match expected type ‛t’ with actual type ‛Bool’
     Relevant bindings include
-      r :: IORef (t -> t) (bound at T5689.hs:7:14)
       v :: t (bound at T5689.hs:10:28)
+      r :: IORef (t -> t) (bound at T5689.hs:7:14)
     In the expression: False
     In the expression: if v then False else True
 
 T5689.hs:10:54:
     Couldn't match expected type ‛t’ with actual type ‛Bool’
     Relevant bindings include
-      r :: IORef (t -> t) (bound at T5689.hs:7:14)
       v :: t (bound at T5689.hs:10:28)
+      r :: IORef (t -> t) (bound at T5689.hs:7:14)
     In the expression: True
     In the expression: if v then False else True
 
 T5689.hs:14:23:
     Couldn't match expected type ‛t’ with actual type ‛Bool’
     Relevant bindings include
-      r :: IORef (t -> t) (bound at T5689.hs:7:14)
       c :: t -> t (bound at T5689.hs:12:13)
+      r :: IORef (t -> t) (bound at T5689.hs:7:14)
     In the first argument of ‛c’, namely ‛True’
     In the second argument of ‛($)’, namely ‛c True’
diff --git a/testsuite/tests/typecheck/should_fail/T5853.stderr b/testsuite/tests/typecheck/should_fail/T5853.stderr
index 4fdef8cdd7..770b7bb621 100644
--- a/testsuite/tests/typecheck/should_fail/T5853.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5853.stderr
@@ -10,8 +10,8 @@ T5853.hs:15:52:
       bound by the RULE "map/map" at T5853.hs:15:2-57
     NB: ‛Subst’ is a type function, and may not be injective
     Relevant bindings include
-      xs :: Subst fa a (bound at T5853.hs:15:23)
-      g :: a -> Elem fa (bound at T5853.hs:15:21)
       f :: Elem fa -> b (bound at T5853.hs:15:19)
+      g :: a -> Elem fa (bound at T5853.hs:15:21)
+      xs :: Subst fa a (bound at T5853.hs:15:23)
     In the expression: (f . g) <$> xs
     When checking the transformation rule "map/map"
diff --git a/testsuite/tests/typecheck/should_fail/T7264.stderr b/testsuite/tests/typecheck/should_fail/T7264.stderr
index 71964fbb0e..6314b56f97 100644
--- a/testsuite/tests/typecheck/should_fail/T7264.stderr
+++ b/testsuite/tests/typecheck/should_fail/T7264.stderr
@@ -6,7 +6,7 @@ T7264.hs:13:19:
     Expected type: a -> Foo
       Actual type: (forall r. r -> String) -> Foo
     Relevant bindings include
-      mkFoo2 :: a -> Maybe Foo (bound at T7264.hs:13:1)
       val :: a (bound at T7264.hs:13:8)
+      mkFoo2 :: a -> Maybe Foo (bound at T7264.hs:13:1)
     In the first argument of ‛mmap’, namely ‛Foo’
     In the expression: mmap Foo (Just val)
diff --git a/testsuite/tests/typecheck/should_fail/T7453.stderr b/testsuite/tests/typecheck/should_fail/T7453.stderr
index 9345595fb4..48fdcb70ba 100644
--- a/testsuite/tests/typecheck/should_fail/T7453.stderr
+++ b/testsuite/tests/typecheck/should_fail/T7453.stderr
@@ -6,10 +6,10 @@ T7453.hs:10:30:
       the type signature for z :: Id t1
       at T7453.hs:8:16-19
     Relevant bindings include
-      cast1 :: t -> a (bound at T7453.hs:7:1)
-      v :: t (bound at T7453.hs:7:7)
-      z :: Id t1 (bound at T7453.hs:9:11)
       aux :: Id t1 (bound at T7453.hs:10:21)
+      z :: Id t1 (bound at T7453.hs:9:11)
+      v :: t (bound at T7453.hs:7:7)
+      cast1 :: t -> a (bound at T7453.hs:7:1)
     In the first argument of ‛Id’, namely ‛v’
     In the expression: Id v
 
@@ -20,10 +20,10 @@ T7453.hs:16:33:
       the type signature for z :: () -> t2
       at T7453.hs:14:16-22
     Relevant bindings include
-      cast2 :: t -> t1 (bound at T7453.hs:13:1)
-      v :: t (bound at T7453.hs:13:7)
-      z :: () -> t2 (bound at T7453.hs:15:11)
       aux :: b -> t2 (bound at T7453.hs:16:21)
+      z :: () -> t2 (bound at T7453.hs:15:11)
+      v :: t (bound at T7453.hs:13:7)
+      cast2 :: t -> t1 (bound at T7453.hs:13:1)
     In the first argument of ‛const’, namely ‛v’
     In the expression: const v
 
@@ -34,10 +34,10 @@ T7453.hs:21:15:
       the type signature for z :: t2
       at T7453.hs:20:16
     Relevant bindings include
-      cast3 :: t -> t1 (bound at T7453.hs:19:1)
-      v :: t (bound at T7453.hs:19:7)
-      z :: t2 (bound at T7453.hs:21:11)
       aux :: forall b. b -> t2 (bound at T7453.hs:22:21)
+      z :: t2 (bound at T7453.hs:21:11)
+      v :: t (bound at T7453.hs:19:7)
+      cast3 :: t -> t1 (bound at T7453.hs:19:1)
     In the expression: v
     In an equation for ‛z’:
         z = v
diff --git a/testsuite/tests/typecheck/should_fail/T7734.stderr b/testsuite/tests/typecheck/should_fail/T7734.stderr
index 0748826acb..fc3348abb7 100644
--- a/testsuite/tests/typecheck/should_fail/T7734.stderr
+++ b/testsuite/tests/typecheck/should_fail/T7734.stderr
@@ -2,15 +2,15 @@
 T7734.hs:4:13:
     Occurs check: cannot construct the infinite type: t2 ~ t2 -> t1
     Relevant bindings include
-      f :: (t2 -> t1) -> t -> t1 (bound at T7734.hs:4:1)
       x :: t2 -> t1 (bound at T7734.hs:4:1)
+      f :: (t2 -> t1) -> t -> t1 (bound at T7734.hs:4:1)
     In the first argument of ‛x’, namely ‛x’
     In the expression: x x
 
 T7734.hs:5:13:
     Occurs check: cannot construct the infinite type: t2 ~ t2 -> t1
     Relevant bindings include
-      (&) :: (t2 -> t1) -> t -> t1 (bound at T7734.hs:5:1)
       x :: t2 -> t1 (bound at T7734.hs:5:5)
+      (&) :: (t2 -> t1) -> t -> t1 (bound at T7734.hs:5:1)
     In the first argument of ‛x’, namely ‛x’
     In the expression: x x
diff --git a/testsuite/tests/typecheck/should_fail/T7748a.stderr b/testsuite/tests/typecheck/should_fail/T7748a.stderr
index f9204a1dd0..00f357147c 100644
--- a/testsuite/tests/typecheck/should_fail/T7748a.stderr
+++ b/testsuite/tests/typecheck/should_fail/T7748a.stderr
@@ -1,18 +1,18 @@
-

-T7748a.hs:14:24:

-    Couldn't match expected type ‛a’

-                with actual type ‛Maybe (Maybe (r -> ()))’

-      ‛a’ is a rigid type variable bound by

-          the type signature for test :: a -> r -> () at T7748a.hs:11:9

-    Relevant bindings include

-      test :: a -> r -> () (bound at T7748a.hs:12:1)

-      zd :: a (bound at T7748a.hs:12:6)

-      f :: r -> () (bound at T7748a.hs:13:8)

-      g :: r -> () (bound at T7748a.hs:13:16)

-    In the pattern: Nothing

-    In a case alternative: Nothing -> const ()

-    In the expression:

-      case zd of {

-        Nothing -> const ()

-        Just Nothing -> const ()

-        Just (Just p) -> p }

+
+T7748a.hs:14:24:
+    Couldn't match expected type ‛a’
+                with actual type ‛Maybe (Maybe (r -> ()))’
+      ‛a’ is a rigid type variable bound by
+          the type signature for test :: a -> r -> () at T7748a.hs:11:9
+    Relevant bindings include
+      g :: r -> () (bound at T7748a.hs:13:16)
+      f :: r -> () (bound at T7748a.hs:13:8)
+      zd :: a (bound at T7748a.hs:12:6)
+      test :: a -> r -> () (bound at T7748a.hs:12:1)
+    In the pattern: Nothing
+    In a case alternative: Nothing -> const ()
+    In the expression:
+      case zd of {
+        Nothing -> const ()
+        Just Nothing -> const ()
+        Just (Just p) -> p }
diff --git a/testsuite/tests/typecheck/should_fail/T7869.stderr b/testsuite/tests/typecheck/should_fail/T7869.stderr
index bdf814e78d..f9f8dbfcf1 100644
--- a/testsuite/tests/typecheck/should_fail/T7869.stderr
+++ b/testsuite/tests/typecheck/should_fail/T7869.stderr
@@ -21,8 +21,8 @@ T7869.hs:3:12:
     Expected type: [a1] -> b1
       Actual type: [a] -> b
     Relevant bindings include
-      f :: [a] -> b (bound at T7869.hs:3:1)
       x :: [a1] (bound at T7869.hs:3:7)
+      f :: [a] -> b (bound at T7869.hs:3:1)
     In the expression: f x
     In the expression: (\ x -> f x) :: [a] -> b
     In an equation for ‛f’: f = (\ x -> f x) :: [a] -> b
diff --git a/testsuite/tests/typecheck/should_fail/tcfail002.stderr b/testsuite/tests/typecheck/should_fail/tcfail002.stderr
index f055d66eb6..67248f4064 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail002.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail002.stderr
@@ -2,7 +2,7 @@
 tcfail002.hs:4:7:
     Occurs check: cannot construct the infinite type: t ~ [t]
     Relevant bindings include
-      c :: [t] -> t (bound at tcfail002.hs:3:1)
       z :: [t] (bound at tcfail002.hs:4:3)
+      c :: [t] -> t (bound at tcfail002.hs:3:1)
     In the expression: z
     In an equation for ‛c’: c z = z
diff --git a/testsuite/tests/typecheck/should_fail/tcfail004.stderr b/testsuite/tests/typecheck/should_fail/tcfail004.stderr
index bf439ab343..fd73db69ae 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail004.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail004.stderr
@@ -3,7 +3,7 @@ tcfail004.hs:3:9:
     Couldn't match expected type ‛(t, t3)’
                 with actual type ‛(t0, t1, t2)’
     Relevant bindings include
-      g :: t3 (bound at tcfail004.hs:3:4)
       f :: t (bound at tcfail004.hs:3:2)
+      g :: t3 (bound at tcfail004.hs:3:4)
     In the expression: (1, 2, 3)
     In a pattern binding: (f, g) = (1, 2, 3)
diff --git a/testsuite/tests/typecheck/should_fail/tcfail005.stderr b/testsuite/tests/typecheck/should_fail/tcfail005.stderr
index ebb2999f79..401bc35194 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail005.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail005.stderr
@@ -2,7 +2,7 @@
 tcfail005.hs:3:9:
     Couldn't match expected type ‛[t]’ with actual type ‛(t0, Char)’
     Relevant bindings include
-      i :: [t] (bound at tcfail005.hs:3:4)
       h :: t (bound at tcfail005.hs:3:2)
+      i :: [t] (bound at tcfail005.hs:3:4)
     In the expression: (1, 'a')
     In a pattern binding: (h : i) = (1, 'a')
diff --git a/testsuite/tests/typecheck/should_fail/tcfail014.stderr b/testsuite/tests/typecheck/should_fail/tcfail014.stderr
index d34411af96..79af8623e1 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail014.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail014.stderr
@@ -2,7 +2,7 @@
 tcfail014.hs:5:33:
     Occurs check: cannot construct the infinite type: t8 ~ t8 -> t7
     Relevant bindings include
-      h :: (t8 -> t7) -> t7 (bound at tcfail014.hs:5:25)
       z :: t8 -> t7 (bound at tcfail014.hs:5:27)
+      h :: (t8 -> t7) -> t7 (bound at tcfail014.hs:5:25)
     In the first argument of ‛z’, namely ‛z’
     In the expression: z z
diff --git a/testsuite/tests/typecheck/should_fail/tcfail016.stderr b/testsuite/tests/typecheck/should_fail/tcfail016.stderr
index a18f8032c1..3b8e2a9712 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail016.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail016.stderr
@@ -4,9 +4,9 @@ tcfail016.hs:9:20:
     Expected type: Expr t
       Actual type: AnnExpr t
     Relevant bindings include
-      g :: Expr t -> [[Char]] (bound at tcfail016.hs:8:1)
-      e1 :: AnnExpr t (bound at tcfail016.hs:9:8)
       e2 :: AnnExpr t (bound at tcfail016.hs:9:11)
+      e1 :: AnnExpr t (bound at tcfail016.hs:9:8)
+      g :: Expr t -> [[Char]] (bound at tcfail016.hs:8:1)
     In the first argument of ‛g’, namely ‛e1’
     In the first argument of ‛(++)’, namely ‛(g e1)’
 
@@ -15,8 +15,8 @@ tcfail016.hs:9:28:
     Expected type: Expr t
       Actual type: AnnExpr t
     Relevant bindings include
-      g :: Expr t -> [[Char]] (bound at tcfail016.hs:8:1)
-      e1 :: AnnExpr t (bound at tcfail016.hs:9:8)
       e2 :: AnnExpr t (bound at tcfail016.hs:9:11)
+      e1 :: AnnExpr t (bound at tcfail016.hs:9:8)
+      g :: Expr t -> [[Char]] (bound at tcfail016.hs:8:1)
     In the first argument of ‛g’, namely ‛e2’
     In the second argument of ‛(++)’, namely ‛(g e2)’
diff --git a/testsuite/tests/typecheck/should_fail/tcfail032.stderr b/testsuite/tests/typecheck/should_fail/tcfail032.stderr
index 56e4a791ad..75d64ee76b 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail032.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail032.stderr
@@ -6,7 +6,7 @@ tcfail032.hs:14:8:
       an expression type signature: Eq a1 => a1 -> Int
       at tcfail032.hs:14:8-30
     Relevant bindings include
-      f :: t -> a -> Int (bound at tcfail032.hs:14:1)
       x :: t (bound at tcfail032.hs:14:3)
+      f :: t -> a -> Int (bound at tcfail032.hs:14:1)
     In the expression: (x :: Eq a => a -> Int)
     In an equation for ‛f’: f x = (x :: Eq a => a -> Int)
diff --git a/testsuite/tests/typecheck/should_fail/tcfail033.stderr b/testsuite/tests/typecheck/should_fail/tcfail033.stderr
index 3a9496ead1..ea517ea7b4 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail033.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail033.stderr
@@ -2,8 +2,8 @@
 tcfail033.hs:4:12:
     Occurs check: cannot construct the infinite type: t ~ (t, t1)
     Relevant bindings include
-      buglet :: [(t, t1)] (bound at tcfail033.hs:4:1)
-      x :: t (bound at tcfail033.hs:4:17)
       y :: t1 (bound at tcfail033.hs:4:19)
+      x :: t (bound at tcfail033.hs:4:17)
+      buglet :: [(t, t1)] (bound at tcfail033.hs:4:1)
     In the expression: x
     In the expression: [x | (x, y) <- buglet]
diff --git a/testsuite/tests/typecheck/should_fail/tcfail043.stderr b/testsuite/tests/typecheck/should_fail/tcfail043.stderr
index 9be218f040..df750a4a3c 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail043.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail043.stderr
@@ -3,9 +3,9 @@ tcfail043.hs:38:17:
     No instance for (Ord_ a0) arising from a use of ‛gt’
     The type variable ‛a0’ is ambiguous
     Relevant bindings include
-      search :: a0 -> [a0] -> Bool (bound at tcfail043.hs:37:1)
-      a :: a0 (bound at tcfail043.hs:38:6)
       bs :: [a0] (bound at tcfail043.hs:38:8)
+      a :: a0 (bound at tcfail043.hs:38:6)
+      search :: a0 -> [a0] -> Bool (bound at tcfail043.hs:37:1)
     Note: there is a potential instance available:
       instance Ord_ Int -- Defined at tcfail043.hs:34:10
     In the expression: gt (hd bs) a
@@ -25,9 +25,9 @@ tcfail043.hs:40:25:
     No instance for (Eq_ a0) arising from a use of ‛eq’
     The type variable ‛a0’ is ambiguous
     Relevant bindings include
-      search :: a0 -> [a0] -> Bool (bound at tcfail043.hs:37:1)
-      a :: a0 (bound at tcfail043.hs:38:6)
       bs :: [a0] (bound at tcfail043.hs:38:8)
+      a :: a0 (bound at tcfail043.hs:38:6)
+      search :: a0 -> [a0] -> Bool (bound at tcfail043.hs:37:1)
     Note: there are several potential instances:
       instance Eq_ a => Eq_ [a] -- Defined at tcfail043.hs:23:10
       instance Eq_ Int -- Defined at tcfail043.hs:20:10
diff --git a/testsuite/tests/typecheck/should_fail/tcfail065.stderr b/testsuite/tests/typecheck/should_fail/tcfail065.stderr
index 75aad77065..89ac58145a 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail065.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail065.stderr
@@ -7,7 +7,7 @@ tcfail065.hs:29:20:
       ‛x’ is a rigid type variable bound by
           the instance declaration at tcfail065.hs:28:10
     Relevant bindings include
-      setX :: x1 -> X x -> X x (bound at tcfail065.hs:29:3)
       x :: x1 (bound at tcfail065.hs:29:8)
+      setX :: x1 -> X x -> X x (bound at tcfail065.hs:29:3)
     In the first argument of ‛X’, namely ‛x’
     In the expression: X x
diff --git a/testsuite/tests/typecheck/should_fail/tcfail068.stderr b/testsuite/tests/typecheck/should_fail/tcfail068.stderr
index e50e3da859..8b2cd42158 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail068.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail068.stderr
@@ -39,9 +39,9 @@ tcfail068.hs:19:21:
     Expected type: STArray s1 (Int, Int) a
       Actual type: IndTree s a
     Relevant bindings include
+      arr :: IndTree s a (bound at tcfail068.hs:17:11)
       itiap :: (Int, Int) -> (a -> a) -> IndTree s a -> IndTree s a
         (bound at tcfail068.hs:17:1)
-      arr :: IndTree s a (bound at tcfail068.hs:17:11)
     In the first argument of ‛readSTArray’, namely ‛arr’
     In the first argument of ‛(>>=)’, namely ‛readSTArray arr i’
 
@@ -63,14 +63,14 @@ tcfail068.hs:24:35:
     Expected type: GHC.ST.ST s1 (IndTree s a)
       Actual type: GHC.ST.ST s (IndTree s a)
     Relevant bindings include
+      itrap' :: Int -> Int -> GHC.ST.ST s (IndTree s a)
+        (bound at tcfail068.hs:26:9)
+      itrapsnd :: Int -> Int -> GHC.ST.ST s (IndTree s a)
+        (bound at tcfail068.hs:29:9)
+      arr :: IndTree s a (bound at tcfail068.hs:24:23)
       itrap :: ((Int, Int), (Int, Int))
                -> (a -> a) -> IndTree s a -> IndTree s a
         (bound at tcfail068.hs:24:1)
-      arr :: IndTree s a (bound at tcfail068.hs:24:23)
-      itrapsnd :: Int -> Int -> GHC.ST.ST s (IndTree s a)
-        (bound at tcfail068.hs:29:9)
-      itrap' :: Int -> Int -> GHC.ST.ST s (IndTree s a)
-        (bound at tcfail068.hs:26:9)
     In the first argument of ‛runST’, namely ‛(itrap' i k)’
     In the expression: runST (itrap' i k)
 
@@ -104,6 +104,11 @@ tcfail068.hs:36:46:
     Expected type: GHC.ST.ST s1 (c, IndTree s b)
       Actual type: GHC.ST.ST s (c, IndTree s b)
     Relevant bindings include
+      itrapstate' :: Int -> Int -> c -> GHC.ST.ST s (c, IndTree s b)
+        (bound at tcfail068.hs:38:9)
+      itrapstatesnd :: Int -> Int -> c -> GHC.ST.ST s (c, IndTree s b)
+        (bound at tcfail068.hs:41:9)
+      arr :: IndTree s b (bound at tcfail068.hs:36:34)
       itrapstate :: ((Int, Int), (Int, Int))
                     -> (a -> b -> (a, b))
                     -> ((Int, Int) -> c -> a)
@@ -112,10 +117,5 @@ tcfail068.hs:36:46:
                     -> IndTree s b
                     -> (c, IndTree s b)
         (bound at tcfail068.hs:36:1)
-      arr :: IndTree s b (bound at tcfail068.hs:36:34)
-      itrapstatesnd :: Int -> Int -> c -> GHC.ST.ST s (c, IndTree s b)
-        (bound at tcfail068.hs:41:9)
-      itrapstate' :: Int -> Int -> c -> GHC.ST.ST s (c, IndTree s b)
-        (bound at tcfail068.hs:38:9)
     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/tcfail076.stderr b/testsuite/tests/typecheck/should_fail/tcfail076.stderr
index 6ae9951e71..d6d23eb9c2 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail076.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail076.stderr
@@ -10,7 +10,7 @@ tcfail076.hs:18:82:
     Expected type: m res1
       Actual type: m res
     Relevant bindings include
-      cont :: a -> m res (bound at tcfail076.hs:18:37)
       cont' :: b -> m res1 (bound at tcfail076.hs:18:73)
+      cont :: a -> m res (bound at tcfail076.hs:18:37)
     In the expression: cont a
     In the first argument of ‛KContT’, namely ‛(\ cont' -> cont a)’
diff --git a/testsuite/tests/typecheck/should_fail/tcfail099.stderr b/testsuite/tests/typecheck/should_fail/tcfail099.stderr
index 3cedf90a5c..73293eb6b6 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail099.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail099.stderr
@@ -8,8 +8,8 @@ tcfail099.hs:9:20:
       in an equation for ‛call’
       at tcfail099.hs:9:7-9
     Relevant bindings include
-      call :: DS -> t -> Int (bound at tcfail099.hs:9:1)
-      f :: a -> Int (bound at tcfail099.hs:9:9)
       arg :: t (bound at tcfail099.hs:9:12)
+      f :: a -> Int (bound at tcfail099.hs:9:9)
+      call :: DS -> t -> Int (bound at tcfail099.hs:9:1)
     In the first argument of ‛f’, namely ‛arg’
     In the expression: f arg
diff --git a/testsuite/tests/typecheck/should_fail/tcfail103.stderr b/testsuite/tests/typecheck/should_fail/tcfail103.stderr
index 928939e737..4f1315331d 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail103.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail103.stderr
@@ -8,8 +8,8 @@ tcfail103.hs:15:23:
     Expected type: STRef s Int
       Actual type: STRef t Int
     Relevant bindings include
-      f :: ST t Int (bound at tcfail103.hs:11:1)
-      v :: STRef t Int (bound at tcfail103.hs:12:5)
       g :: ST s Int (bound at tcfail103.hs:15:9)
+      v :: STRef t Int (bound at tcfail103.hs:12:5)
+      f :: ST t Int (bound at tcfail103.hs:11:1)
     In the first argument of ‛readSTRef’, namely ‛v’
     In the expression: readSTRef v
diff --git a/testsuite/tests/typecheck/should_fail/tcfail122.stderr b/testsuite/tests/typecheck/should_fail/tcfail122.stderr
index 9e07184677..901ceb84d1 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail122.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail122.stderr
@@ -1,18 +1,17 @@
-

-tcfail122.hs:8:9:

-    Kind incompatibility when matching types:

-      c0 :: (* -> *) -> *

-      a0 :: * -> *

-    Expected type: a0 b0

-      Actual type: c0 d0

-    Relevant bindings include

-      foo :: [a0 b0] (bound at tcfail122.hs:7:1)

-    In the expression:

-        undefined :: forall (c :: (* -> *) -> *) (d :: * -> *). c d

-    In the expression:

-      [undefined :: forall a b. a b,

-       undefined :: forall (c :: (* -> *) -> *) (d :: * -> *). c d]

-    In an equation for ‛foo’:

-        foo

-          = [undefined :: forall a b. a b,

-             undefined :: forall (c :: (* -> *) -> *) (d :: * -> *). c d]

+
+tcfail122.hs:8:9:
+    Kind incompatibility when matching types:
+      c0 :: (* -> *) -> *
+      a :: * -> *
+    Expected type: a b
+      Actual type: c0 d0
+    Relevant bindings include foo :: [a b] (bound at tcfail122.hs:7:1)
+    In the expression:
+        undefined :: forall (c :: (* -> *) -> *) (d :: * -> *). c d
+    In the expression:
+      [undefined :: forall a b. a b,
+       undefined :: forall (c :: (* -> *) -> *) (d :: * -> *). c d]
+    In an equation for ‛foo’:
+        foo
+          = [undefined :: forall a b. a b,
+             undefined :: forall (c :: (* -> *) -> *) (d :: * -> *). c d]
diff --git a/testsuite/tests/typecheck/should_fail/tcfail131.stderr b/testsuite/tests/typecheck/should_fail/tcfail131.stderr
index c664ba45e4..da75512b9e 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail131.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail131.stderr
@@ -7,7 +7,7 @@ tcfail131.hs:7:9:
       ‛b’ is a rigid type variable bound by
           the type signature for g :: Num b => b -> b at tcfail131.hs:6:8
     Relevant bindings include
-      g :: b -> b (bound at tcfail131.hs:7:3)
       x :: b (bound at tcfail131.hs:7:5)
+      g :: b -> b (bound at tcfail131.hs:7:3)
     In the expression: f x x
     In an equation for ‛g’: g x = f x x
diff --git a/testsuite/tests/typecheck/should_fail/tcfail140.stderr b/testsuite/tests/typecheck/should_fail/tcfail140.stderr
index aff19cb16a..2ed025a870 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail140.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail140.stderr
@@ -19,8 +19,8 @@ tcfail140.hs:12:10:
 tcfail140.hs:14:15:
     Couldn't match expected type ‛a -> b’ with actual type ‛Int’
     Relevant bindings include
-      bot :: [a] -> [b] (bound at tcfail140.hs:14:1)
       xs :: [a] (bound at tcfail140.hs:14:5)
+      bot :: [a] -> [b] (bound at tcfail140.hs:14:1)
     The operator ‛f’ takes two arguments,
     but its type ‛Int -> Int’ has only one
     In the first argument of ‛map’, namely ‛(3 `f`)’
diff --git a/testsuite/tests/typecheck/should_fail/tcfail153.stderr b/testsuite/tests/typecheck/should_fail/tcfail153.stderr
index 6b360719d1..50908ec677 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail153.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail153.stderr
@@ -6,8 +6,8 @@ tcfail153.hs:6:7:
     Expected type: [a]
       Actual type: [Bool]
     Relevant bindings include
-      f :: a -> [a] (bound at tcfail153.hs:6:1)
       x :: a (bound at tcfail153.hs:6:3)
+      f :: a -> [a] (bound at tcfail153.hs:6:1)
     In the expression: g x
     In an equation for ‛f’:
         f x
diff --git a/testsuite/tests/typecheck/should_fail/tcfail179.stderr b/testsuite/tests/typecheck/should_fail/tcfail179.stderr
index 2892bddbf0..db5966f6f9 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail179.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail179.stderr
@@ -9,9 +9,9 @@ tcfail179.hs:14:39:
       ‛s’ is a rigid type variable bound by
           the type signature for run :: T s -> Int at tcfail179.hs:12:8
     Relevant bindings include
-      run :: T s -> Int (bound at tcfail179.hs:13:1)
-      ts :: T s (bound at tcfail179.hs:13:5)
-      g :: s -> (x -> s) -> (x, s, Int) (bound at tcfail179.hs:14:16)
       x :: x (bound at tcfail179.hs:14:26)
+      g :: s -> (x -> s) -> (x, s, Int) (bound at tcfail179.hs:14:16)
+      ts :: T s (bound at tcfail179.hs:13:5)
+      run :: T s -> Int (bound at tcfail179.hs:13:1)
     In the first argument of ‛g’, namely ‛x’
     In the expression: g x id
diff --git a/testsuite/tests/typecheck/should_fail/tcfail198.stderr b/testsuite/tests/typecheck/should_fail/tcfail198.stderr
index f8ec0405da..62e9eeed15 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail198.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail198.stderr
@@ -6,8 +6,8 @@ tcfail198.hs:6:36:
       an expression type signature: a1
       at tcfail198.hs:6:36-41
     Relevant bindings include
-      f3 :: [a] -> [a] (bound at tcfail198.hs:6:6)
-      x :: a (bound at tcfail198.hs:6:19)
       xs :: [a] (bound at tcfail198.hs:6:21)
+      x :: a (bound at tcfail198.hs:6:19)
+      f3 :: [a] -> [a] (bound at tcfail198.hs:6:6)
     In the expression: x :: a
     In the second argument of ‛(++)’, namely ‛[x :: a]’
diff --git a/testsuite/tests/typecheck/should_fail/tcfail200.stderr b/testsuite/tests/typecheck/should_fail/tcfail200.stderr
index f6d80a249a..e70a55cef9 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail200.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail200.stderr
@@ -1,11 +1,10 @@
-

-tcfail200.hs:5:15:

-    Kind incompatibility when matching types:

-      t0 :: *

-      GHC.Prim.Int# :: #

-    Relevant bindings include

-      f :: (t0, Char) (bound at tcfail200.hs:5:1)

-      x :: (t0, Char) (bound at tcfail200.hs:5:9)

-    In the expression: 1#

-    In the expression: (1#, 'c')

-    In an equation for ‛x’: x = (1#, 'c')

+
+tcfail200.hs:5:15:
+    Kind incompatibility when matching types:
+      t1 :: *
+      GHC.Prim.Int# :: #
+    Relevant bindings include
+      x :: (t1, Char) (bound at tcfail200.hs:5:9)
+    In the expression: 1#
+    In the expression: (1#, 'c')
+    In an equation for ‛x’: x = (1#, 'c')
diff --git a/testsuite/tests/typecheck/should_fail/tcfail201.stderr b/testsuite/tests/typecheck/should_fail/tcfail201.stderr
index ada710e43b..23d22744eb 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail201.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail201.stderr
@@ -7,10 +7,10 @@ tcfail201.hs:17:27:
                        -> (forall g. g -> c g) -> a -> c a
           at tcfail201.hs:15:12
     Relevant bindings include
+      hsDoc :: a (bound at tcfail201.hs:16:13)
       gfoldl' :: (forall a1 b. c (a1 -> b) -> a1 -> c b)
                  -> (forall g. g -> c g) -> a -> c a
         (bound at tcfail201.hs:16:1)
-      hsDoc :: a (bound at tcfail201.hs:16:13)
     In the pattern: DocEmpty
     In a case alternative: DocEmpty -> z DocEmpty
     In the expression: