From f1557f3b7cfb0b036d0ab350ffaa910f95ff58cc Mon Sep 17 00:00:00 2001
From: Simon Peyton Jones <simonpj@microsoft.com>
Date: Fri, 21 Sep 2012 12:19:56 +0100
Subject: [PATCH] A ton of error message wibbles

Notably
 * Showing relevant bindings
 * Not suggesting add instance (Num T); see Trac #7222
---
 .../annotations/should_fail/annfail05.stderr  |   2 -
 .../annotations/should_fail/annfail08.stderr  |   3 -
 .../tests/arrows/should_fail/T5380.stderr     |  55 +++--
 .../tests/deriving/should_fail/T2851.stderr   |   5 +-
 .../tests/deriving/should_fail/T3621.stderr   |   5 +-
 .../tests/deriving/should_fail/T5287.stderr   |   2 +
 .../drvfail-foldable-traversable1.stderr      |  54 ++---
 .../should_fail/drvfail-functor2.stderr       |  63 +++--
 .../deriving/should_fail/drvfail001.stderr    |   5 +-
 .../deriving/should_fail/drvfail002.stderr    |   7 +-
 .../deriving/should_fail/drvfail003.stderr    |   5 +-
 .../deriving/should_fail/drvfail004.stderr    |   5 +-
 .../deriving/should_fail/drvfail007.stderr    |   5 +-
 .../deriving/should_fail/drvfail012.stderr    |   5 +-
 .../deriving/should_fail/drvfail013.stderr    |  10 +-
 testsuite/tests/driver/T5147/T5147.stderr     |   1 -
 testsuite/tests/gadt/T3169.stderr             |  11 +
 testsuite/tests/gadt/rw.stderr                |  48 ++--
 .../ghci.debugger/scripts/break003.stderr     |   1 -
 .../ghci.debugger/scripts/break006.stderr     |   2 +
 .../ghci.debugger/scripts/print019.stderr     |   1 +
 testsuite/tests/ghci/scripts/ghci050.stderr   |  23 +-
 .../should_compile/Simple14.stderr            |  11 +-
 .../should_compile/T3208b.stderr              |  15 +-
 .../should_fail/ExtraTcsUntch.stderr          |   1 -
 .../should_fail/GADTwrong1.stderr             |   3 +
 .../should_fail/NoMatchErr.stderr             |   9 +-
 .../should_fail/SimpleFail16.stderr           |   5 +-
 .../should_fail/SimpleFail5a.stderr           |  22 +-
 .../indexed-types/should_fail/T1897b.stderr   |  30 +--
 .../indexed-types/should_fail/T1900.stderr    |   4 +-
 .../indexed-types/should_fail/T2239.stderr    |   2 +-
 .../indexed-types/should_fail/T2544.stderr    |  27 ++-
 .../indexed-types/should_fail/T2627b.stderr   |  19 +-
 .../indexed-types/should_fail/T2664.stderr    |   5 +-
 .../indexed-types/should_fail/T2693.stderr    |  63 +++--
 .../indexed-types/should_fail/T3330a.stderr   |  12 +
 .../indexed-types/should_fail/T3440.stderr    |  42 ++--
 .../indexed-types/should_fail/T4093a.stderr   |  29 +--
 .../indexed-types/should_fail/T4093b.stderr   |   9 +
 .../indexed-types/should_fail/T4099.stderr    |   6 +
 .../indexed-types/should_fail/T4179.stderr    |   3 +
 .../indexed-types/should_fail/T4272.stderr    |   3 +
 .../indexed-types/should_fail/T5439.stderr    |  13 +-
 .../indexed-types/should_fail/T5934.stderr    |   2 -
 .../indexed-types/should_fail/T6123.stderr    |   5 +-
 .../tests/mdo/should_fail/mdofail001.stderr   |  14 +-
 testsuite/tests/module/mod46.stderr           |   1 -
 .../parser/should_fail/readFail003.stderr     |  18 +-
 testsuite/tests/polykinds/T6054.stderr        |   3 +-
 testsuite/tests/polykinds/T7230.stderr        |   3 +
 testsuite/tests/rebindable/rebindable6.stderr |  20 +-
 testsuite/tests/safeHaskell/ghci/p15.stderr   |   1 -
 .../simplCore/should_compile/simpl017.stderr  |  30 ++-
 .../tests/typecheck/should_compile/FD1.stderr |  25 +-
 .../tests/typecheck/should_compile/FD2.stderr |   6 +
 .../typecheck/should_compile/T2494.stderr     |  24 +-
 .../typecheck/should_compile/tc141.stderr     |   9 +
 .../typecheck/should_compile/tc168.stderr     |   1 -
 .../typecheck/should_compile/tc211.stderr     |   4 +-
 .../should_fail/FDsFromGivens.stderr          |   6 +-
 .../tests/typecheck/should_fail/IPFail.stderr |   1 -
 .../should_fail/LongWayOverlapping.stderr     |  16 +-
 .../tests/typecheck/should_fail/SCLoop.stderr |   4 +-
 .../tests/typecheck/should_fail/T1899.stderr  |   3 +
 .../tests/typecheck/should_fail/T2414.stderr  |   2 +-
 .../tests/typecheck/should_fail/T2534.stderr  |   5 +-
 .../tests/typecheck/should_fail/T2688.stderr  |   4 +
 .../tests/typecheck/should_fail/T2714.stderr  |   4 +
 .../tests/typecheck/should_fail/T2846b.stderr |   1 -
 .../tests/typecheck/should_fail/T3592.stderr  |   1 -
 .../tests/typecheck/should_fail/T5300.stderr  |   3 +
 .../tests/typecheck/should_fail/T5570.stderr  |  12 +-
 .../tests/typecheck/should_fail/T5684.stderr  |  88 ++++++-
 .../tests/typecheck/should_fail/T5689.stderr  |   3 +
 .../tests/typecheck/should_fail/T5853.stderr  |  19 +-
 .../tests/typecheck/should_fail/T5858.stderr  |   2 -
 .../tests/typecheck/should_fail/mc20.stderr   |   4 +-
 .../tests/typecheck/should_fail/mc22.stderr   |  21 +-
 .../tests/typecheck/should_fail/mc23.stderr   |  19 +-
 .../tests/typecheck/should_fail/mc24.stderr   |  18 +-
 .../tests/typecheck/should_fail/mc25.stderr   |  17 +-
 .../typecheck/should_fail/tcfail001.stderr    |   1 +
 .../typecheck/should_fail/tcfail002.stderr    |   5 +-
 .../typecheck/should_fail/tcfail003.stderr    |   4 +-
 .../typecheck/should_fail/tcfail004.stderr    |   7 +-
 .../typecheck/should_fail/tcfail005.stderr    |   6 +-
 .../typecheck/should_fail/tcfail006.stderr    |  14 +-
 .../typecheck/should_fail/tcfail007.stderr    |  18 +-
 .../typecheck/should_fail/tcfail008.stderr    |   5 +-
 .../typecheck/should_fail/tcfail010.stderr    |   1 -
 .../typecheck/should_fail/tcfail013.stderr    |   3 +-
 .../typecheck/should_fail/tcfail014.stderr    |   5 +-
 .../typecheck/should_fail/tcfail015.stderr    |  12 +-
 .../typecheck/should_fail/tcfail016.stderr    |  20 +-
 .../typecheck/should_fail/tcfail017.stderr    |   1 -
 .../typecheck/should_fail/tcfail018.stderr    |   1 -
 .../typecheck/should_fail/tcfail019.stderr    |   1 -
 .../typecheck/should_fail/tcfail020.stderr    |   1 -
 .../typecheck/should_fail/tcfail029.stderr    |   4 +-
 .../typecheck/should_fail/tcfail032.stderr    |  16 +-
 .../typecheck/should_fail/tcfail033.stderr    |   6 +-
 .../typecheck/should_fail/tcfail043.stderr    |  14 +-
 .../typecheck/should_fail/tcfail046.stderr    |  10 +-
 .../typecheck/should_fail/tcfail065.stderr    |  25 +-
 .../typecheck/should_fail/tcfail068.stderr    | 224 ++++++++++--------
 .../typecheck/should_fail/tcfail076.stderr    |   3 +
 .../typecheck/should_fail/tcfail083.stderr    |  14 ++
 .../typecheck/should_fail/tcfail099.stderr    |   4 +
 .../typecheck/should_fail/tcfail102.stderr    |   1 -
 .../typecheck/should_fail/tcfail103.stderr    |  28 ++-
 .../typecheck/should_fail/tcfail106.stderr    |   1 -
 .../typecheck/should_fail/tcfail109.stderr    |   1 -
 .../typecheck/should_fail/tcfail128.stderr    |   3 -
 .../typecheck/should_fail/tcfail131.stderr    |  25 +-
 .../typecheck/should_fail/tcfail133.stderr    |   3 -
 .../typecheck/should_fail/tcfail137.stderr    |   8 +-
 .../typecheck/should_fail/tcfail140.stderr    |  12 +-
 .../typecheck/should_fail/tcfail153.stderr    |   3 +
 .../typecheck/should_fail/tcfail169.stderr    |   5 +-
 .../typecheck/should_fail/tcfail174.stderr    |  66 +++---
 .../typecheck/should_fail/tcfail175.stderr    |  18 +-
 .../typecheck/should_fail/tcfail178.stderr    |   8 +-
 .../typecheck/should_fail/tcfail179.stderr    |  31 ++-
 .../typecheck/should_fail/tcfail182.stderr    |   2 +
 .../typecheck/should_fail/tcfail189.stderr    |   4 +-
 .../typecheck/should_fail/tcfail190.stderr    |   4 +-
 .../typecheck/should_fail/tcfail192.stderr    |   4 +-
 .../typecheck/should_fail/tcfail194.stderr    |  19 +-
 .../typecheck/should_fail/tcfail198.stderr    |   4 +
 .../typecheck/should_fail/tcfail201.stderr    |   5 +
 .../typecheck/should_fail/tcfail206.stderr    |   4 +
 .../typecheck/should_fail/tcfail208.stderr    |   1 -
 133 files changed, 1060 insertions(+), 695 deletions(-)

diff --git a/testsuite/tests/annotations/should_fail/annfail05.stderr b/testsuite/tests/annotations/should_fail/annfail05.stderr
index 4e861c6b9710..04329eec1e1f 100644
--- a/testsuite/tests/annotations/should_fail/annfail05.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail05.stderr
@@ -2,7 +2,5 @@
 annfail05.hs:11:1:
     No instance for (Data.Data.Data NoInstances)
       arising from an annotation
-    Possible fix:
-      add an instance declaration for (Data.Data.Data NoInstances)
     In the expression: NoInstances
     In the annotation: {-# ANN f NoInstances #-}
diff --git a/testsuite/tests/annotations/should_fail/annfail08.stderr b/testsuite/tests/annotations/should_fail/annfail08.stderr
index d10fbe55d65a..df18d002ee65 100644
--- a/testsuite/tests/annotations/should_fail/annfail08.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail08.stderr
@@ -2,13 +2,10 @@
 annfail08.hs:9:1:
     No instance for (Data.Data.Data (a0 -> a0))
       arising from an annotation
-    Possible fix:
-      add an instance declaration for (Data.Data.Data (a0 -> a0))
     In the expression: (id + 1)
     In the annotation: {-# ANN f (id + 1) #-}
 
 annfail08.hs:9:15:
     No instance for (Num (a0 -> a0)) arising from a use of `+'
-    Possible fix: add an instance declaration for (Num (a0 -> a0))
     In the expression: (id + 1)
     In the annotation: {-# ANN f (id + 1) #-}
diff --git a/testsuite/tests/arrows/should_fail/T5380.stderr b/testsuite/tests/arrows/should_fail/T5380.stderr
index 7e0004f95d4e..36cf8a4ff3e8 100644
--- a/testsuite/tests/arrows/should_fail/T5380.stderr
+++ b/testsuite/tests/arrows/should_fail/T5380.stderr
@@ -1,24 +1,31 @@
-
-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 -< ()
+
+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
+    Relevant bindings include
+      testB :: not_bool -> (() -> ()) -> () -> not_unit
+        (bound at T5380.hs:7:1)
+      b :: not_bool (bound at T5380.hs:7:7)
+    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: () -> ()
+    Relevant bindings include
+      testB :: not_bool -> (() -> ()) -> () -> not_unit
+        (bound at T5380.hs:7:1)
+    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/T2851.stderr b/testsuite/tests/deriving/should_fail/T2851.stderr
index a2beb9869de0..70802ab997bb 100644
--- a/testsuite/tests/deriving/should_fail/T2851.stderr
+++ b/testsuite/tests/deriving/should_fail/T2851.stderr
@@ -3,7 +3,6 @@ T2851.hs:9:15:
     No instance for (Show (F a))
       arising from the 'deriving' clause of a data type declaration
     Possible fix:
-      add an instance declaration for (Show (F a))
-      or use a standalone 'deriving instance' declaration,
-           so you can specify the instance context yourself
+      use a standalone 'deriving instance' declaration,
+        so you can specify the instance context yourself
     When deriving the instance for (Show (D a))
diff --git a/testsuite/tests/deriving/should_fail/T3621.stderr b/testsuite/tests/deriving/should_fail/T3621.stderr
index 68213c61e8fa..b70fc33bda5e 100644
--- a/testsuite/tests/deriving/should_fail/T3621.stderr
+++ b/testsuite/tests/deriving/should_fail/T3621.stderr
@@ -3,7 +3,6 @@ T3621.hs:21:21:
     No instance for (MonadState state (State s))
       arising from the 'deriving' clause of a data type declaration
     Possible fix:
-      add an instance declaration for (MonadState state (State s))
-      or use a standalone 'deriving instance' declaration,
-           so you can specify the instance context yourself
+      use a standalone 'deriving instance' declaration,
+        so you can specify the instance context yourself
     When deriving the instance for (MonadState state (WrappedState s))
diff --git a/testsuite/tests/deriving/should_fail/T5287.stderr b/testsuite/tests/deriving/should_fail/T5287.stderr
index 93ea7d6cb7fa..e95212f67e80 100644
--- a/testsuite/tests/deriving/should_fail/T5287.stderr
+++ b/testsuite/tests/deriving/should_fail/T5287.stderr
@@ -2,6 +2,8 @@
 T5287.hs:6:29:
     No instance for (A e oops)
       arising from the 'deriving' clause of a data type declaration
+    The type variable `oops' is ambiguous
+    Possible fix: add a type signature that fixes these type variable(s)
     Possible fix:
       use a standalone 'deriving instance' declaration,
         so you can specify the instance context yourself
diff --git a/testsuite/tests/deriving/should_fail/drvfail-foldable-traversable1.stderr b/testsuite/tests/deriving/should_fail/drvfail-foldable-traversable1.stderr
index b9d1eb559162..fa5633e7861c 100644
--- a/testsuite/tests/deriving/should_fail/drvfail-foldable-traversable1.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail-foldable-traversable1.stderr
@@ -1,28 +1,26 @@
-
-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'
+
+drvfail-foldable-traversable1.hs:9:23:
+    No instance for (Functor Trivial1)
+      arising from the 'deriving' clause of a data type declaration
+    Possible fix:
+      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:
+      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-functor2.stderr b/testsuite/tests/deriving/should_fail/drvfail-functor2.stderr
index 9c830aaec46d..54dc6f7019aa 100644
--- a/testsuite/tests/deriving/should_fail/drvfail-functor2.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail-functor2.stderr
@@ -1,32 +1,31 @@
-
-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':
-      Constructor `InFunctionArgument' must not use the type variable in a function argument
-    In the newtype declaration for `InFunctionArgument'
-
-drvfail-functor2.hs:10:14:
-    Can't make a derived instance of `Functor OnSecondArg':
-      Constructor `OnSecondArg' must use the type variable only as the last argument of a data type
-    In the newtype declaration for `OnSecondArg'
-
-drvfail-functor2.hs:15:14:
-    Cannot derive well-kinded instance of form `Functor (NoArguments ...)'
-      Class `Functor' expects an argument of kind `* -> *'
-    In the newtype declaration for `NoArguments'
-
-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 declaration for `StupidConstraint'
-
-drvfail-functor2.hs:26:14:
-    No instance for (Functor NoFunctor)
-      arising from the 'deriving' clause of a data type declaration
-    Possible fix:
-      add an instance declaration for (Functor NoFunctor)
-      or use a standalone 'deriving instance' declaration,
-           so you can specify the instance context yourself
-    When deriving the instance for (Functor UseNoFunctor)
+
+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':
+      Constructor `InFunctionArgument' must not use the type variable in a function argument
+    In the newtype declaration for `InFunctionArgument'
+
+drvfail-functor2.hs:10:14:
+    Can't make a derived instance of `Functor OnSecondArg':
+      Constructor `OnSecondArg' must use the type variable only as the last argument of a data type
+    In the newtype declaration for `OnSecondArg'
+
+drvfail-functor2.hs:15:14:
+    Cannot derive well-kinded instance of form `Functor (NoArguments ...)'
+      Class `Functor' expects an argument of kind `* -> *'
+    In the newtype declaration for `NoArguments'
+
+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 declaration for `StupidConstraint'
+
+drvfail-functor2.hs:26:14:
+    No instance for (Functor NoFunctor)
+      arising from the 'deriving' clause of a data type declaration
+    Possible fix:
+      use a standalone 'deriving instance' declaration,
+        so you can specify the instance context yourself
+    When deriving the instance for (Functor UseNoFunctor)
diff --git a/testsuite/tests/deriving/should_fail/drvfail001.stderr b/testsuite/tests/deriving/should_fail/drvfail001.stderr
index a2a149594caf..8c0be37ecae0 100644
--- a/testsuite/tests/deriving/should_fail/drvfail001.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail001.stderr
@@ -3,7 +3,6 @@ drvfail001.hs:16:33:
     No instance for (Show (f (f a)))
       arising from the 'deriving' clause of a data type declaration
     Possible fix:
-      add an instance declaration for (Show (f (f a)))
-      or use a standalone 'deriving instance' declaration,
-           so you can specify the instance context yourself
+      use a standalone 'deriving instance' declaration,
+        so you can specify the instance context yourself
     When deriving the instance for (Show (SM f a))
diff --git a/testsuite/tests/deriving/should_fail/drvfail002.stderr b/testsuite/tests/deriving/should_fail/drvfail002.stderr
index 281c6a3ac363..4594fe927480 100644
--- a/testsuite/tests/deriving/should_fail/drvfail002.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail002.stderr
@@ -2,8 +2,9 @@
 drvfail002.hs:19:23:
     No instance for (X T c)
       arising from the 'deriving' clause of a data type declaration
+    The type variable `c' is ambiguous
+    Possible fix: add a type signature that fixes these type variable(s)
     Possible fix:
-      add an instance declaration for (X T c)
-      or use a standalone 'deriving instance' declaration,
-           so you can specify the instance context yourself
+      use a standalone 'deriving instance' declaration,
+        so you can specify the instance context yourself
     When deriving the instance for (Show S)
diff --git a/testsuite/tests/deriving/should_fail/drvfail003.stderr b/testsuite/tests/deriving/should_fail/drvfail003.stderr
index 4aa98531b8dc..f329420cca41 100644
--- a/testsuite/tests/deriving/should_fail/drvfail003.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail003.stderr
@@ -3,7 +3,6 @@ drvfail003.hs:16:56:
     No instance for (Show (v (v a)))
       arising from the 'deriving' clause of a data type declaration
     Possible fix:
-      add an instance declaration for (Show (v (v a)))
-      or use a standalone 'deriving instance' declaration,
-           so you can specify the instance context yourself
+      use a standalone 'deriving instance' declaration,
+        so you can specify the instance context yourself
     When deriving the instance for (Show (Square_ v w a))
diff --git a/testsuite/tests/deriving/should_fail/drvfail004.stderr b/testsuite/tests/deriving/should_fail/drvfail004.stderr
index d08f315cb705..fe193b929ab2 100644
--- a/testsuite/tests/deriving/should_fail/drvfail004.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail004.stderr
@@ -3,7 +3,6 @@ drvfail004.hs:8:12:
     No instance for (Eq (Foo a b))
       arising from the 'deriving' clause of a data type declaration
     Possible fix:
-      add an instance declaration for (Eq (Foo a b))
-      or use a standalone 'deriving instance' declaration,
-           so you can specify the instance context yourself
+      use a standalone 'deriving instance' declaration,
+        so you can specify the instance context yourself
     When deriving the instance for (Ord (Foo a b))
diff --git a/testsuite/tests/deriving/should_fail/drvfail007.stderr b/testsuite/tests/deriving/should_fail/drvfail007.stderr
index 7dc7124fd1ce..d47c14e000d0 100644
--- a/testsuite/tests/deriving/should_fail/drvfail007.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail007.stderr
@@ -3,7 +3,6 @@ drvfail007.hs:4:38:
     No instance for (Eq (Int -> Int))
       arising from the 'deriving' clause of a data type declaration
     Possible fix:
-      add an instance declaration for (Eq (Int -> Int))
-      or use a standalone 'deriving instance' declaration,
-           so you can specify the instance context yourself
+      use a standalone 'deriving instance' declaration,
+        so you can specify the instance context yourself
     When deriving the instance for (Eq Foo)
diff --git a/testsuite/tests/deriving/should_fail/drvfail012.stderr b/testsuite/tests/deriving/should_fail/drvfail012.stderr
index 22fac4887dd5..602033fecd30 100644
--- a/testsuite/tests/deriving/should_fail/drvfail012.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail012.stderr
@@ -3,7 +3,6 @@ drvfail012.hs:5:33:
     No instance for (Eq (Ego a))
       arising from the 'deriving' clause of a data type declaration
     Possible fix:
-      add an instance declaration for (Eq (Ego a))
-      or use a standalone 'deriving instance' declaration,
-           so you can specify the instance context yourself
+      use a standalone 'deriving instance' declaration,
+        so you can specify the instance context yourself
     When deriving the instance for (Ord (Ego a))
diff --git a/testsuite/tests/deriving/should_fail/drvfail013.stderr b/testsuite/tests/deriving/should_fail/drvfail013.stderr
index 94927cd790a6..29d8ba6168d2 100644
--- a/testsuite/tests/deriving/should_fail/drvfail013.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail013.stderr
@@ -3,16 +3,14 @@ drvfail013.hs:4:70:
     No instance for (Eq (m (Maybe a)))
       arising from the 'deriving' clause of a data type declaration
     Possible fix:
-      add an instance declaration for (Eq (m (Maybe a)))
-      or use a standalone 'deriving instance' declaration,
-           so you can specify the instance context yourself
+      use a standalone 'deriving instance' declaration,
+        so you can specify the instance context yourself
     When deriving the instance for (Eq (MaybeT m a))
 
 drvfail013.hs:6:70:
     No instance for (Eq (m (Maybe a)))
       arising from the 'deriving' clause of a data type declaration
     Possible fix:
-      add an instance declaration for (Eq (m (Maybe a)))
-      or use a standalone 'deriving instance' declaration,
-           so you can specify the instance context yourself
+      use a standalone 'deriving instance' declaration,
+        so you can specify the instance context yourself
     When deriving the instance for (Eq (MaybeT' m a))
diff --git a/testsuite/tests/driver/T5147/T5147.stderr b/testsuite/tests/driver/T5147/T5147.stderr
index 9d37468dfe34..6e8427b940ec 100644
--- a/testsuite/tests/driver/T5147/T5147.stderr
+++ b/testsuite/tests/driver/T5147/T5147.stderr
@@ -1,6 +1,5 @@
 
 A.hs:6:15:
     No instance for (Show (Fields v)) arising from a use of `show'
-    Possible fix: add an instance declaration for (Show (Fields v))
     In the expression: show a
     In an equation for `showField': showField a = show a
diff --git a/testsuite/tests/gadt/T3169.stderr b/testsuite/tests/gadt/T3169.stderr
index 7ca72f965490..f256f8cbfeec 100644
--- a/testsuite/tests/gadt/T3169.stderr
+++ b/testsuite/tests/gadt/T3169.stderr
@@ -5,6 +5,12 @@ T3169.hs:13:22:
       bound by the instance declaration at T3169.hs:10:10-36
     Expected type: Map a (Map b elt)
       Actual type: Map (a, b) elt
+    Relevant bindings include
+      lookup :: (a, b) -> Map (a, b) elt -> Maybe elt
+        (bound at T3169.hs:12:3)
+      a :: a (bound at T3169.hs:12:11)
+      b :: b (bound at T3169.hs:12:13)
+      m :: Map (a, b) elt (bound at T3169.hs:12:17)
     In the second argument of `lookup', namely `m'
     In the expression: lookup a m :: Maybe (Map b elt)
     In the expression:
@@ -21,6 +27,11 @@ T3169.hs:13:22:
             at T3169.hs:12:3
     Expected type: Map a (Map b elt)
       Actual type: Map (a, b) elt
+    Relevant bindings include
+      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)
     In the second argument of `lookup', namely `m'
     In the expression: lookup a m :: Maybe (Map b elt)
     In the expression:
diff --git a/testsuite/tests/gadt/rw.stderr b/testsuite/tests/gadt/rw.stderr
index 418afad6922f..ef5453ca6fbd 100644
--- a/testsuite/tests/gadt/rw.stderr
+++ b/testsuite/tests/gadt/rw.stderr
@@ -1,20 +1,28 @@
-
-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)
+
+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
+    Relevant bindings include
+      writeInt :: T a -> IORef a -> IO () (bound at rw.hs:13:1)
+      v :: T a (bound at rw.hs:13:10)
+      ref :: IORef a (bound at rw.hs:13: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
+    Relevant bindings include
+      readBool :: T a -> IORef a -> IO () (bound at rw.hs:17:1)
+      v :: T a (bound at rw.hs:17:10)
+      ref :: IORef a (bound at rw.hs:17:12)
+    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/ghci.debugger/scripts/break003.stderr b/testsuite/tests/ghci.debugger/scripts/break003.stderr
index 36c125babf23..03dc88bfd816 100644
--- a/testsuite/tests/ghci.debugger/scripts/break003.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/break003.stderr
@@ -1,5 +1,4 @@
 
 <interactive>:5:1:
     No instance for (Show (t -> a)) arising from a use of `print'
-    Possible fix: add an instance declaration for (Show (t -> a))
     In a stmt of an interactive GHCi command: print it
diff --git a/testsuite/tests/ghci.debugger/scripts/break006.stderr b/testsuite/tests/ghci.debugger/scripts/break006.stderr
index ae2585f00fcb..45f6f8343711 100644
--- a/testsuite/tests/ghci.debugger/scripts/break006.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/break006.stderr
@@ -3,6 +3,7 @@
     No instance for (Show a) arising from a use of `print'
     Cannot resolve unknown runtime type `a'
     Use :print or :force to determine these types
+    Relevant bindings include it :: a (bound at <interactive>:6:1)
     Note: there are several potential instances:
       instance Show Double -- Defined in `GHC.Float'
       instance Show Float -- Defined in `GHC.Float'
@@ -15,6 +16,7 @@
     No instance for (Show a) arising from a use of `print'
     Cannot resolve unknown runtime type `a'
     Use :print or :force to determine these types
+    Relevant bindings include it :: a (bound at <interactive>:8:1)
     Note: there are several potential instances:
       instance Show Double -- Defined in `GHC.Float'
       instance Show Float -- Defined in `GHC.Float'
diff --git a/testsuite/tests/ghci.debugger/scripts/print019.stderr b/testsuite/tests/ghci.debugger/scripts/print019.stderr
index f23daf219135..e5bcb7f1c4ad 100644
--- a/testsuite/tests/ghci.debugger/scripts/print019.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/print019.stderr
@@ -3,6 +3,7 @@
     No instance for (Show a1) arising from a use of `print'
     Cannot resolve unknown runtime type `a1'
     Use :print or :force to determine these types
+    Relevant bindings include it :: a1 (bound at <interactive>:11:1)
     Note: there are several potential instances:
       instance Show a => Show (List1 a) -- Defined at ../Test.hs:11:12
       instance Show MyInt -- Defined at ../Test.hs:14:16
diff --git a/testsuite/tests/ghci/scripts/ghci050.stderr b/testsuite/tests/ghci/scripts/ghci050.stderr
index 80725e460571..f31b5c425c3a 100644
--- a/testsuite/tests/ghci/scripts/ghci050.stderr
+++ b/testsuite/tests/ghci/scripts/ghci050.stderr
@@ -1,9 +1,14 @@
-
-<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]
+
+<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
+    Relevant bindings include
+      asList :: (a, a) -> [ListableElem (a, a)]
+        (bound at <interactive>:6:33)
+      a :: a (bound at <interactive>:6:41)
+      b :: a (bound at <interactive>:6:43)
+    In the expression: a
+    In the expression: [a, b]
+    In an equation for `asList': asList (a, b) = [a, b]
diff --git a/testsuite/tests/indexed-types/should_compile/Simple14.stderr b/testsuite/tests/indexed-types/should_compile/Simple14.stderr
index 18221db64e3e..1665ccae834b 100644
--- a/testsuite/tests/indexed-types/should_compile/Simple14.stderr
+++ b/testsuite/tests/indexed-types/should_compile/Simple14.stderr
@@ -1,15 +1,18 @@
 
-Simple14.hs:17:12:
+Simple14.hs:17:19:
     Couldn't match type `z0' with `n'
       `z0' is untouchable
-           inside the constraints (Maybe m ~ Maybe n)
-           bound at a type expected by the context:
-                      Maybe m ~ Maybe n => EQ_ z0 z0
+        inside the constraints (Maybe m ~ Maybe n)
+        bound by a type expected by the context:
+                   Maybe m ~ Maybe n => EQ_ z0 z0
+        at Simple14.hs:17:12-33
       `n' is a rigid type variable bound by
           the type signature for foo :: EQ_ (Maybe m) (Maybe n)
           at Simple14.hs:16:17
     Expected type: EQ_ z0 z0
       Actual type: EQ_ m n
+    Relevant bindings include
+      foo :: EQ_ (Maybe m) (Maybe n) (bound at Simple14.hs:17:1)
     In the second argument of `eqE', namely `(eqI :: EQ_ m n)'
     In the first argument of `ntI', namely `(`eqE` (eqI :: EQ_ m n))'
     In the expression: ntI (`eqE` (eqI :: EQ_ m n))
diff --git a/testsuite/tests/indexed-types/should_compile/T3208b.stderr b/testsuite/tests/indexed-types/should_compile/T3208b.stderr
index 6dc3e84a5ba2..1026e5f62c74 100644
--- a/testsuite/tests/indexed-types/should_compile/T3208b.stderr
+++ b/testsuite/tests/indexed-types/should_compile/T3208b.stderr
@@ -10,17 +10,8 @@ T3208b.hs:15:10:
     Possible fix: add a type signature that fixes these type variable(s)
     Expected type: STerm o0
       Actual type: OTerm o0
-    In the expression: fce (apply f)
-    In an equation for fce': fce' f = fce (apply f)
-
-T3208b.hs:15:15:
-    Could not deduce (STerm a ~ OTerm o0)
-    from the context (OTerm a ~ STerm a, OBJECT a, SUBST a)
-      bound by the type signature for
-                 fce' :: (OTerm a ~ STerm a, OBJECT a, SUBST a) => a -> c
-      at T3208b.hs:14:9-56
-    The type variable `o0' is ambiguous
-    Possible fix: add a type signature that fixes these type variable(s)
-    In the first argument of `fce', namely `(apply f)'
+    Relevant bindings include
+      fce' :: a -> c (bound at T3208b.hs:15:1)
+      f :: a (bound at T3208b.hs:15:6)
     In the expression: fce (apply f)
     In an equation for fce': fce' f = fce (apply f)
diff --git a/testsuite/tests/indexed-types/should_fail/ExtraTcsUntch.stderr b/testsuite/tests/indexed-types/should_fail/ExtraTcsUntch.stderr
index f9dbbb1ae316..428d4b968d31 100644
--- a/testsuite/tests/indexed-types/should_fail/ExtraTcsUntch.stderr
+++ b/testsuite/tests/indexed-types/should_fail/ExtraTcsUntch.stderr
@@ -5,7 +5,6 @@ ExtraTcsUntch.hs:24:53:
       bound by the inferred type of
                f :: F Int ~ [[t]] => [t] -> ((), ((), ()))
       at ExtraTcsUntch.hs:(21,1)-(25,29)
-    Possible fix: add an instance declaration for (C [t] [a])
     In the expression: op x [y]
     In the expression: (h [[undefined]], op x [y])
     In a case alternative: TEx y -> (h [[undefined]], op x [y])
diff --git a/testsuite/tests/indexed-types/should_fail/GADTwrong1.stderr b/testsuite/tests/indexed-types/should_fail/GADTwrong1.stderr
index a6010f671199..a90b09d6ebc9 100644
--- a/testsuite/tests/indexed-types/should_fail/GADTwrong1.stderr
+++ b/testsuite/tests/indexed-types/should_fail/GADTwrong1.stderr
@@ -13,6 +13,9 @@ GADTwrong1.hs:12:19:
              T :: forall a. a -> T (Const a),
            in a case alternative
            at GADTwrong1.hs:12:12
+    Relevant bindings include
+      coerce :: a -> b (bound at GADTwrong1.hs:11:1)
+      y :: a1 (bound at GADTwrong1.hs:12:14)
     In the expression: y
     In a case alternative: T y -> y
     In the expression: case T x :: T (Const b) of { T y -> y }
diff --git a/testsuite/tests/indexed-types/should_fail/NoMatchErr.stderr b/testsuite/tests/indexed-types/should_fail/NoMatchErr.stderr
index 003c0144707b..b8a45c3ef747 100644
--- a/testsuite/tests/indexed-types/should_fail/NoMatchErr.stderr
+++ b/testsuite/tests/indexed-types/should_fail/NoMatchErr.stderr
@@ -1,13 +1,16 @@
 
 NoMatchErr.hs:20:5:
-    Could not deduce (Memo d ~ Memo d0)
+    Could not deduce (Memo d0 ~ Memo d)
     from the context (Fun d)
       bound by the type signature for f :: Fun d => Memo d a -> Memo d a
       at NoMatchErr.hs:19:7-37
     NB: `Memo' is a type function, and may not be injective
     The type variable `d0' is ambiguous
     Possible fix: add a type signature that fixes these type variable(s)
-    Expected type: Memo d a -> Memo d a
-      Actual type: Memo d0 a -> Memo d0 a
+    Expected type: (d0 -> a) -> Memo d a
+      Actual type: (d0 -> a) -> Memo d0 a
+    Relevant bindings include
+      f :: Memo d a -> Memo d a (bound at NoMatchErr.hs:20:1)
+    In the first argument of `(.)', namely `abst'
     In the expression: abst . appl
     In an equation for `f': f = abst . appl
diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail16.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail16.stderr
index 9466ee14a792..1410fca369ae 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail16.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail16.stderr
@@ -2,10 +2,11 @@
 SimpleFail16.hs:10:12:
     Couldn't match expected type `F ()' with actual type `p0 a0'
     The type variables `p0', `a0' are ambiguous
-    Possible cause: the monomorphism restriction applied to the following:
-      bar :: p0 a0 (bound at SimpleFail16.hs:10:1)
+    Possible cause: the monomorphism restriction applied to: `bar'
     Probable fix: give these definition(s) an explicit type signature
                   or use -XNoMonomorphismRestriction
+    Relevant bindings include
+      bar :: p0 a0 (bound at SimpleFail16.hs:10:1)
     In the first argument of `foo', namely `(undefined :: F ())'
     In the expression: foo (undefined :: F ())
     In an equation for `bar': bar = foo (undefined :: F ())
diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail5a.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail5a.stderr
index 76afd8aedfb9..124eb7948e26 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail5a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail5a.stderr
@@ -1,10 +1,12 @@
-
-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
+
+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
+    Relevant bindings include
+      bar3wrong :: S3 a -> a (bound at SimpleFail5a.hs:31:1)
+    In the pattern: D3Int
+    In an equation for `bar3wrong': bar3wrong D3Int = 1
diff --git a/testsuite/tests/indexed-types/should_fail/T1897b.stderr b/testsuite/tests/indexed-types/should_fail/T1897b.stderr
index ff0667af2dea..731127016809 100644
--- a/testsuite/tests/indexed-types/should_fail/T1897b.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T1897b.stderr
@@ -1,15 +1,15 @@
-
-T1897b.hs:16:1:
-    Could not deduce (Depend a ~ Depend a0)
-    from the context (Bug a)
-      bound by the inferred type for `isValid':
-                 Bug a => [Depend a] -> Bool
-      at T1897b.hs:16:1-41
-    NB: `Depend' is a type function, and may not be injective
-    The type variable `a0' is ambiguous
-    Possible fix: add a type signature that fixes these type variable(s)
-    Expected type: [Depend a] -> Bool
-      Actual type: [Depend a0] -> Bool
-    When checking that `isValid'
-      has the inferred type `forall a. Bug a => [Depend a] -> Bool'
-    Probable cause: the inferred type is ambiguous
+
+T1897b.hs:16:1:
+    Could not deduce (Depend a0 ~ Depend a)
+    from the context (Bug a)
+      bound by the inferred type for `isValid':
+                 Bug a => [Depend a] -> Bool
+      at T1897b.hs:16:1-41
+    NB: `Depend' is a type function, and may not be injective
+    The type variable `a0' is ambiguous
+    Possible fix: add a type signature that fixes these type variable(s)
+    Expected type: [Depend a] -> Bool
+      Actual type: [Depend a0] -> Bool
+    When checking that `isValid'
+      has the inferred type `forall a. Bug a => [Depend a] -> Bool'
+    Probable cause: the inferred type is ambiguous
diff --git a/testsuite/tests/indexed-types/should_fail/T1900.stderr b/testsuite/tests/indexed-types/should_fail/T1900.stderr
index d20a63216bb2..c170c984d607 100644
--- a/testsuite/tests/indexed-types/should_fail/T1900.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T1900.stderr
@@ -1,7 +1,6 @@
 
 T1900.hs:11:12:
     No instance for (Num ()) arising from a use of `+'
-    Possible fix: add an instance declaration for (Num ())
     In the expression: (+ 1)
     In an equation for `trans': trans = (+ 1)
     In the instance declaration for `Bug Int'
@@ -14,6 +13,9 @@ T1900.hs:14:16:
     NB: `Depend' is a type function, and may not be injective
     The type variable `s0' is ambiguous
     Possible fix: add a type signature that fixes these type variable(s)
+    Relevant bindings include
+      check :: Depend s -> Bool (bound at T1900.hs:14:1)
+      d :: Depend s (bound at T1900.hs:14:7)
     In the return type of a call of `trans'
     In the second argument of `(==)', namely `trans d'
     In the expression: d == trans d
diff --git a/testsuite/tests/indexed-types/should_fail/T2239.stderr b/testsuite/tests/indexed-types/should_fail/T2239.stderr
index 759ba2babdcd..d360bfd748cf 100644
--- a/testsuite/tests/indexed-types/should_fail/T2239.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2239.stderr
@@ -17,7 +17,7 @@ T2239.hs:47:13:
 
 T2239.hs:50:13:
     Couldn't match type `forall b1. b1 ~ Bool => b1 -> b1'
-                  with `b -> b'
+                  with `Bool -> Bool'
     Expected type: (forall b. b ~ Bool => b -> b) -> b -> b
       Actual type: (forall b. b ~ Bool => b -> b)
                    -> forall b. b ~ Bool => b -> b
diff --git a/testsuite/tests/indexed-types/should_fail/T2544.stderr b/testsuite/tests/indexed-types/should_fail/T2544.stderr
index b6bc222fa04a..bd816720c3d2 100644
--- a/testsuite/tests/indexed-types/should_fail/T2544.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2544.stderr
@@ -1,13 +1,30 @@
 
-T2544.hs:15:12:
-    Could not deduce (IxMap r ~ IxMap i1)
+T2544.hs:15:18:
+    Could not deduce (IxMap i0 ~ IxMap l)
+    from the context (Ix l, Ix r)
+      bound by the instance declaration at T2544.hs:13:10-37
+    NB: `IxMap' is a type function, and may not be injective
+    The type variable `i0' is ambiguous
+    Possible fix: add a type signature that fixes these type variable(s)
+    Expected type: IxMap l [Int]
+      Actual type: IxMap i0 [Int]
+    Relevant bindings include
+      empty :: IxMap (l :|: r) [Int] (bound at T2544.hs:15:4)
+    In the first argument of `BiApp', namely `empty'
+    In the expression: BiApp empty empty
+    In an equation for `empty': empty = BiApp empty empty
+
+T2544.hs:15:24:
+    Could not deduce (IxMap i1 ~ IxMap r)
     from the context (Ix l, Ix r)
       bound by the instance declaration at T2544.hs:13:10-37
     NB: `IxMap' is a type function, and may not be injective
     The type variable `i1' is ambiguous
     Possible fix: add a type signature that fixes these type variable(s)
-    Expected type: IxMap (l :|: r) [Int]
-      Actual type: BiApp (IxMap i0) (IxMap i1) [Int]
-    In the return type of a call of `BiApp'
+    Expected type: IxMap r [Int]
+      Actual type: IxMap i1 [Int]
+    Relevant bindings include
+      empty :: IxMap (l :|: r) [Int] (bound at T2544.hs:15:4)
+    In the second argument of `BiApp', namely `empty'
     In the expression: BiApp empty empty
     In an equation for `empty': empty = BiApp empty empty
diff --git a/testsuite/tests/indexed-types/should_fail/T2627b.stderr b/testsuite/tests/indexed-types/should_fail/T2627b.stderr
index 624cd7e73850..0338bf620f1a 100644
--- a/testsuite/tests/indexed-types/should_fail/T2627b.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2627b.stderr
@@ -1,13 +1,12 @@
 
-T2627b.hs:20:14:
-    Couldn't match type `t0' with `Dual (Dual t0)'
-      `t0' is untouchable
-           inside the constraints (b ~ W a2 b2)
-           bound at a pattern with constructor
-                      Wr :: forall a b. a -> Comm b -> Comm (W a b),
-                    in an equation for `conn'
-    Expected type: Dual t0
-      Actual type: Dual (Dual (Dual t0))
-    In the pattern: Wr a r
+T2627b.hs:20:24:
+    Couldn't match expected type `a0' with actual type `Dual (Dual a0)'
+      `a0' is untouchable
+        inside the constraints (b ~ W a2 b2)
+        bound by a pattern with constructor
+                   Wr :: forall a b. a -> Comm b -> Comm (W a b),
+                 in an equation for `conn'
+        at T2627b.hs:20:14-19
+    In the expression: conn undefined undefined
     In an equation for `conn':
         conn (Rd k) (Wr a r) = conn undefined undefined
diff --git a/testsuite/tests/indexed-types/should_fail/T2664.stderr b/testsuite/tests/indexed-types/should_fail/T2664.stderr
index cfd248dc1543..07b12e4ea0a9 100644
--- a/testsuite/tests/indexed-types/should_fail/T2664.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2664.stderr
@@ -7,13 +7,16 @@ T2664.hs:31:52:
       bound by the type signature for
                  newPChan :: ((a :*: b) ~ Dual c, c ~ Dual (a :*: b)) =>
                              IO (PChan (a :*: b), PChan c)
-      at T2664.hs:(23,5)-(31,87)
+      at T2664.hs:23:5-12
       `b' is a rigid type variable bound by
           the instance declaration at T2664.hs:22:10
       `a' is a rigid type variable bound by
           the instance declaration at T2664.hs:22:10
     Expected type: Dual (Dual a)
       Actual type: b
+    Relevant bindings include
+      newPChan :: IO (PChan (a :*: b), PChan c) (bound at T2664.hs:23:5)
+      v :: MVar (Either (PChan a) (PChan b)) (bound at T2664.hs:24:9)
     In the third argument of `pchoose', namely `newPChan'
     In the first argument of `E', namely `(pchoose Right v newPChan)'
     In the expression:
diff --git a/testsuite/tests/indexed-types/should_fail/T2693.stderr b/testsuite/tests/indexed-types/should_fail/T2693.stderr
index 4894b895ebe0..b873cf2171fc 100644
--- a/testsuite/tests/indexed-types/should_fail/T2693.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2693.stderr
@@ -1,16 +1,47 @@
-
-T2693.hs:10:7:
-    Couldn't match expected type `TFn a' with actual type `TFn a0'
-    NB: `TFn' is a type function, and may not be injective
-    The type variable `a0' is ambiguous
-    Possible fix: add a type signature that fixes these type variable(s)
-    When checking that `x' has the inferred type `forall a. TFn a'
-    Probable cause: the inferred type is ambiguous
-    In the expression:
-      do { let Just x = ...;
-           let n = fst x + fst x;
-           return () }
-    In an equation for `f':
-        f = do { let Just x = ...;
-                 let n = ...;
-                 return () }
+
+T2693.hs:10:7:
+    Couldn't match expected type `TFn a' with actual type `TFn a0'
+    NB: `TFn' is a type function, and may not be injective
+    The type variable `a0' is ambiguous
+    Possible fix: add a type signature that fixes these type variable(s)
+    When checking that `x' has the inferred type `forall a. TFn a'
+    Probable cause: the inferred type is ambiguous
+    In the expression:
+      do { let Just x = ...;
+           let n = fst x + fst x;
+           return () }
+    In an equation for `f':
+        f = do { let Just x = ...;
+                 let n = ...;
+                 return () }
+
+T2693.hs:18:15:
+    Couldn't match expected type `(a2, b0)' with actual type `TFn a3'
+    The type variables `a2', `b0', `a3' are ambiguous
+    Possible fix: add a type signature that fixes these type variable(s)
+    Relevant bindings include n :: a2 (bound at T2693.hs:18:7)
+    In the first argument of `fst', namely `x'
+    In the first argument of `(+)', namely `fst x'
+    In the expression: fst x + snd x
+
+T2693.hs:18:23:
+    Couldn't match expected type `(a4, a2)' with actual type `TFn a5'
+    The type variables `a2', `a4', `a5' are ambiguous
+    Possible fix: add a type signature that fixes these type variable(s)
+    Relevant bindings include n :: a2 (bound at T2693.hs:18:7)
+    In the first argument of `snd', namely `x'
+    In the second argument of `(+)', namely `snd x'
+    In the expression: fst x + snd x
+
+T2693.hs:28:20:
+    Couldn't match type `TFn a0' with `PVR a1'
+    The type variables `a0', `a1' are ambiguous
+    Possible fix: add a type signature that fixes these type variable(s)
+    Expected type: () -> Maybe (PVR a1)
+      Actual type: () -> Maybe (TFn a0)
+    In the first argument of `mapM', namely `g'
+    In a stmt of a 'do' block: pvs <- mapM g undefined
+    In the expression:
+      do { pvs <- mapM g undefined;
+           let n = (map pvrX pvs) `min` (map pvrX pvs);
+           undefined }
diff --git a/testsuite/tests/indexed-types/should_fail/T3330a.stderr b/testsuite/tests/indexed-types/should_fail/T3330a.stderr
index 362c46859f14..e44ab4d6f70c 100644
--- a/testsuite/tests/indexed-types/should_fail/T3330a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T3330a.stderr
@@ -8,6 +8,10 @@ T3330a.hs:19:34:
     Expected type: (s0 ix0 -> ix1)
                    -> r ix1 -> Writer [AnyF s] (r'0 ix1)
       Actual type: s ix
+    Relevant bindings include
+      children :: s ix -> PF s r ix -> [AnyF s] (bound at T3330a.hs:19:1)
+      p :: s ix (bound at T3330a.hs:19:10)
+      x :: PF s r ix (bound at T3330a.hs:19:12)
     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)
@@ -20,6 +24,10 @@ T3330a.hs:19:34:
     Expected type: (s0 ix0 -> ix1)
                    -> r ix1 -> Writer [AnyF s] (r'0 ix1)
       Actual type: s ix
+    Relevant bindings include
+      children :: s ix -> PF s r ix -> [AnyF s] (bound at T3330a.hs:19:1)
+      p :: s ix (bound at T3330a.hs:19:10)
+      x :: PF s r ix (bound at T3330a.hs:19:12)
     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)
@@ -31,6 +39,10 @@ T3330a.hs:19:44:
            at T3330a.hs:18:13
     Expected type: PF s r (r0 ix0 -> Writer [AnyF s0] (r0 ix0))
       Actual type: PF s r ix
+    Relevant bindings include
+      children :: s ix -> PF s r ix -> [AnyF s] (bound at T3330a.hs:19:1)
+      p :: s ix (bound at T3330a.hs:19:10)
+      x :: PF s r ix (bound at T3330a.hs:19:12)
     In the third argument of `hmapM', namely `x'
     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 ab7c5edf842a..55b021b6487e 100644
--- a/testsuite/tests/indexed-types/should_fail/T3440.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T3440.stderr
@@ -1,19 +1,23 @@
-
-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)
+
+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
+    Relevant bindings include
+      unwrap :: GADT (Fam a) -> (a, Fam a) (bound at T3440.hs:11:1)
+      x :: a1 (bound at T3440.hs:11:14)
+      y :: Fam a1 (bound at T3440.hs:11:16)
+    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 4a16563d9ddf..5a5ce0826d0c 100644
--- a/testsuite/tests/indexed-types/should_fail/T4093a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T4093a.stderr
@@ -1,14 +1,15 @@
-
-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 ()
+
+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 ()
+    Relevant bindings include hang :: Foo e (bound at T4093a.hs:8:1)
+    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/T4093b.stderr b/testsuite/tests/indexed-types/should_fail/T4093b.stderr
index 948ba565df92..67f9b7d924d5 100644
--- a/testsuite/tests/indexed-types/should_fail/T4093b.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T4093b.stderr
@@ -16,6 +16,15 @@ T4093b.hs:31:13:
           at T4093b.hs:20:12
     Expected type: EitherCO e (A C O n) (A O O n)
       Actual type: (MaybeC C (n C O), MaybeC O (n O C))
+    Relevant bindings include
+      blockToNodeList :: Block n e x -> A e x n (bound at T4093b.hs:25:1)
+      b :: Block n e x (bound at T4093b.hs:25:17)
+      l :: n O C
+           -> EitherCO e (A C O n) (A O O n) -> EitherCO e (A C C n) (A O C n)
+        (bound at T4093b.hs:34:5)
+      f :: n C O
+           -> EitherCO e (A C O n) (A O O n) -> EitherCO e (A C O n) (A O O n)
+        (bound at T4093b.hs:31:5)
     In the expression: (JustC n, NothingC)
     In an equation for `f': f n _ = (JustC n, NothingC)
     In an equation for `blockToNodeList':
diff --git a/testsuite/tests/indexed-types/should_fail/T4099.stderr b/testsuite/tests/indexed-types/should_fail/T4099.stderr
index 3512e321bdd0..74410ec108cb 100644
--- a/testsuite/tests/indexed-types/should_fail/T4099.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T4099.stderr
@@ -4,6 +4,9 @@ T4099.hs:11:14:
     NB: `T' is a type function, and may not be injective
     The type variable `a0' is ambiguous
     Possible fix: add a type signature that fixes these type variable(s)
+    Relevant bindings include
+      bar1 :: T b -> Int (bound at T4099.hs:11:1)
+      x :: T b (bound at T4099.hs:11:6)
     In the first argument of `foo', namely `x'
     In the expression: foo x
     In an equation for `bar1': bar1 x = foo x
@@ -12,6 +15,9 @@ T4099.hs:14:14:
     Couldn't match expected type `T a1' with actual type `Maybe b'
     The type variable `a1' is ambiguous
     Possible fix: add a type signature that fixes these type variable(s)
+    Relevant bindings include
+      bar2 :: Maybe b -> Int (bound at T4099.hs:14:1)
+      x :: Maybe b (bound at T4099.hs:14:6)
     In the first argument of `foo', namely `x'
     In the expression: foo x
     In an equation for `bar2': bar2 x = foo x
diff --git a/testsuite/tests/indexed-types/should_fail/T4179.stderr b/testsuite/tests/indexed-types/should_fail/T4179.stderr
index 45fbdaf03f3f..7236a50c8811 100644
--- a/testsuite/tests/indexed-types/should_fail/T4179.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T4179.stderr
@@ -13,6 +13,9 @@ T4179.hs:26:16:
       Actual type: x (A2 (FCon x) -> A3 (FCon x))
                    -> A2 (x (A2 (FCon x) -> A3 (FCon x)))
                    -> A3 (x (A2 (FCon x) -> A3 (FCon x)))
+    Relevant bindings include
+      fCon :: Con x -> A2 (FCon x) -> A3 (FCon x)
+        (bound at T4179.hs:26:1)
     In the first argument of `foldDoC', namely `op'
     In the expression: foldDoC op
     In an equation for `fCon': fCon = foldDoC op
diff --git a/testsuite/tests/indexed-types/should_fail/T4272.stderr b/testsuite/tests/indexed-types/should_fail/T4272.stderr
index 01f01267f772..a4e952556b19 100644
--- a/testsuite/tests/indexed-types/should_fail/T4272.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T4272.stderr
@@ -10,6 +10,9 @@ T4272.hs:15:26:
           at T4272.hs:14:16
     Expected type: TermFamily a (TermFamily a a)
       Actual type: TermFamily a a
+    Relevant bindings include
+      laws :: TermFamily a a -> b (bound at T4272.hs:15:1)
+      t :: TermFamily a a (bound at T4272.hs:15:6)
     In the first argument of `terms', namely
       `(undefined :: TermFamily a a)'
     In the second argument of `prune', namely
diff --git a/testsuite/tests/indexed-types/should_fail/T5439.stderr b/testsuite/tests/indexed-types/should_fail/T5439.stderr
index 4d8742c955aa..81453a0f540d 100644
--- a/testsuite/tests/indexed-types/should_fail/T5439.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T5439.stderr
@@ -1,9 +1,18 @@
 
 T5439.hs:83:28:
-    Couldn't match type `Attempt (WaitOpResult (WaitOps rs))'
-                  with `Attempt (HNth n0 l0) -> Attempt (HElemOf l0)'
+    Couldn't match type `Attempt t0 -> Attempt (HElemOf l0)'
+                  with `Attempt (HElemOf rs)'
     Expected type: f (Attempt (HNth n0 l0) -> Attempt (HElemOf l0))
       Actual type: f (Attempt (WaitOpResult (WaitOps rs)))
+    Relevant bindings include
+      registerWaitOp :: WaitOps rs
+                        -> f (Attempt (WaitOpResult (WaitOps rs))) -> IO Bool
+        (bound at T5439.hs:62:3)
+      ops :: WaitOps rs (bound at T5439.hs:62:18)
+      ev :: f (Attempt (WaitOpResult (WaitOps rs)))
+        (bound at T5439.hs:62:22)
+      register :: Bool -> Peano n -> WaitOps (HDrop n rs) -> IO Bool
+        (bound at T5439.hs:65:9)
     In the first argument of `complete', namely `ev'
     In the expression: complete ev
     In a stmt of a 'do' block:
diff --git a/testsuite/tests/indexed-types/should_fail/T5934.stderr b/testsuite/tests/indexed-types/should_fail/T5934.stderr
index 4ec24d3cc901..bb32907e7353 100644
--- a/testsuite/tests/indexed-types/should_fail/T5934.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T5934.stderr
@@ -2,7 +2,5 @@
 T5934.hs:10:7:
     No instance for (Num ((forall s. GenST s) -> Int))
       arising from the literal `0'
-    Possible fix:
-      add an instance declaration for (Num ((forall s. GenST s) -> Int))
     In the expression: 0
     In an equation for `run': run = 0
diff --git a/testsuite/tests/indexed-types/should_fail/T6123.stderr b/testsuite/tests/indexed-types/should_fail/T6123.stderr
index c38986667797..0a82222f61fb 100644
--- a/testsuite/tests/indexed-types/should_fail/T6123.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T6123.stderr
@@ -2,9 +2,10 @@
 T6123.hs:10:14:
     Couldn't match expected type `a0' with actual type `Id a0'
     The type variable `a0' is ambiguous
-    Possible cause: the monomorphism restriction applied to the following:
-      cundefined :: a0 (bound at T6123.hs:10:1)
+    Possible cause: the monomorphism restriction applied to:
+      `cundefined'
     Probable fix: give these definition(s) an explicit type signature
                   or use -XNoMonomorphismRestriction
+    Relevant bindings include cundefined :: a0 (bound at T6123.hs:10:1)
     In the expression: cid undefined
     In an equation for `cundefined': cundefined = cid undefined
diff --git a/testsuite/tests/mdo/should_fail/mdofail001.stderr b/testsuite/tests/mdo/should_fail/mdofail001.stderr
index e20d82ad49e4..67929e58ed45 100644
--- a/testsuite/tests/mdo/should_fail/mdofail001.stderr
+++ b/testsuite/tests/mdo/should_fail/mdofail001.stderr
@@ -1,8 +1,6 @@
-
-mdofail001.hs:10:32:
-    No instance for (Num Char)
-      arising from the literal `1'
-    Possible fix: add an instance declaration for (Num Char)
-    In the expression: 1
-    In the first argument of `l', namely `[1, 2, 3]'
-    In the expression: l [1, 2, 3]
+
+mdofail001.hs:10:32:
+    No instance for (Num Char) arising from the literal `1'
+    In the expression: 1
+    In the first argument of `l', namely `[1, 2, 3]'
+    In the expression: l [1, 2, 3]
diff --git a/testsuite/tests/module/mod46.stderr b/testsuite/tests/module/mod46.stderr
index 603d0d6e79ba..c4c82032668a 100644
--- a/testsuite/tests/module/mod46.stderr
+++ b/testsuite/tests/module/mod46.stderr
@@ -2,5 +2,4 @@
 mod46.hs:4:10:
     No instance for (Eq T)
       arising from the superclasses of an instance declaration
-    Possible fix: add an instance declaration for (Eq T)
     In the instance declaration for `Ord T'
diff --git a/testsuite/tests/parser/should_fail/readFail003.stderr b/testsuite/tests/parser/should_fail/readFail003.stderr
index fe8ce0057740..ae3518eeed55 100644
--- a/testsuite/tests/parser/should_fail/readFail003.stderr
+++ b/testsuite/tests/parser/should_fail/readFail003.stderr
@@ -1,7 +1,11 @@
 
 readFail003.hs:4:27:
     Occurs check: cannot construct the infinite type:
-      t0 = (t0, [a0], [a1])
+      t ~ (t, [a], [a1])
+    Relevant bindings include
+      c :: [a1] (bound at readFail003.hs:4:7)
+      b :: [a] (bound at readFail003.hs:4:5)
+      a :: t (bound at readFail003.hs:4:3)
     In the expression: a
     In a pattern binding:
       ~(a, b, c)
@@ -13,7 +17,11 @@ readFail003.hs:4:27:
 
 readFail003.hs:5:27:
     Occurs check: cannot construct the infinite type:
-      t0 = (t0, [a0], [a1])
+      t ~ (t, [a], [a1])
+    Relevant bindings include
+      c :: [a1] (bound at readFail003.hs:4:7)
+      b :: [a] (bound at readFail003.hs:4:5)
+      a :: t (bound at readFail003.hs:4:3)
     In the expression: a
     In a pattern binding:
       ~(a, b, c)
@@ -25,7 +33,11 @@ readFail003.hs:5:27:
 
 readFail003.hs:6:27:
     Occurs check: cannot construct the infinite type:
-      t0 = (t0, [a0], [a1])
+      t ~ (t, [a], [a1])
+    Relevant bindings include
+      c :: [a1] (bound at readFail003.hs:4:7)
+      b :: [a] (bound at readFail003.hs:4:5)
+      a :: t (bound at readFail003.hs:4:3)
     In the expression: a
     In a pattern binding:
       ~(a, b, c)
diff --git a/testsuite/tests/polykinds/T6054.stderr b/testsuite/tests/polykinds/T6054.stderr
index 9b190ce4d88b..8270f4dd4bfd 100644
--- a/testsuite/tests/polykinds/T6054.stderr
+++ b/testsuite/tests/polykinds/T6054.stderr
@@ -2,7 +2,8 @@
 T6054.hs:7:14:
     No instance for (Bar () '() a0)
       arising from an expression type signature
-    Possible fix: add an instance declaration for (Bar () '() a0)
+    The type variable `a0' is ambiguous
+    Possible fix: add a type signature that fixes these type variable(s)
     In the first argument of `print', namely
       `(Proxy :: Bar () a => Proxy a)'
     In the expression: print (Proxy :: Bar () a => Proxy a)
diff --git a/testsuite/tests/polykinds/T7230.stderr b/testsuite/tests/polykinds/T7230.stderr
index ee82a2bb197c..3bcccee8f267 100644
--- a/testsuite/tests/polykinds/T7230.stderr
+++ b/testsuite/tests/polykinds/T7230.stderr
@@ -20,6 +20,9 @@ T7230.hs:48:32:
       at T7230.hs:48:17-26
     Expected type: SBool (Increasing xs)
       Actual type: SBool (x :<<= x1)
+    Relevant bindings include
+      x :: Sing Nat x (bound at T7230.hs:48:14)
+      y :: Sing Nat x1 (bound at T7230.hs:48:23)
     In the expression: x %:<<= y
     In an equation for `crash':
         crash (SCons x (SCons y xs)) = x %:<<= y
diff --git a/testsuite/tests/rebindable/rebindable6.stderr b/testsuite/tests/rebindable/rebindable6.stderr
index f380db44462d..5130968c023f 100644
--- a/testsuite/tests/rebindable/rebindable6.stderr
+++ b/testsuite/tests/rebindable/rebindable6.stderr
@@ -4,11 +4,14 @@ rebindable6.hs:106:17:
       arising from a do statement
     The type variable `t0' is ambiguous
     Possible fix: add a type signature that fixes these type variable(s)
+    Relevant bindings include
+      test_do :: IO a -> IO (Maybe b) -> IO b
+        (bound at rebindable6.hs:104:9)
+      f :: IO a (bound at rebindable6.hs:104:17)
+      g :: IO (Maybe b) (bound at rebindable6.hs:104:19)
     Note: there is a potential instance available:
       instance HasSeq (IO a -> IO b -> IO b)
         -- Defined at rebindable6.hs:52:18
-    Possible fix:
-      add an instance declaration for (HasSeq (IO a -> t0 -> IO b))
     In a stmt of a 'do' block: f
     In the expression:
       do { f;
@@ -25,12 +28,13 @@ rebindable6.hs:107:17:
       arising from a do statement
     The type variables `t0', `t1' are ambiguous
     Possible fix: add a type signature that fixes these type variable(s)
+    Relevant bindings include
+      test_do :: IO a -> IO (Maybe b) -> IO b
+        (bound at rebindable6.hs:104:9)
+      g :: IO (Maybe b) (bound at rebindable6.hs:104:19)
     Note: there is a potential instance available:
       instance HasBind (IO a -> (a -> IO b) -> IO b)
         -- Defined at rebindable6.hs:47:18
-    Possible fix:
-      add an instance declaration for
-      (HasBind (IO (Maybe b) -> (Maybe b -> t1) -> t0))
     In a stmt of a 'do' block: Just (b :: b) <- g
     In the expression:
       do { f;
@@ -47,9 +51,13 @@ rebindable6.hs:108:17:
       arising from a use of `return'
     The type variable `t1' is ambiguous
     Possible fix: add a type signature that fixes these type variable(s)
+    Relevant bindings include
+      test_do :: IO a -> IO (Maybe b) -> IO b
+        (bound at rebindable6.hs:104:9)
+      g :: IO (Maybe b) (bound at rebindable6.hs:104:19)
+      b :: b (bound at rebindable6.hs:107:23)
     Note: there is a potential instance available:
       instance HasReturn (a -> IO a) -- Defined at rebindable6.hs:42:18
-    Possible fix: add an instance declaration for (HasReturn (b -> t1))
     In a stmt of a 'do' block: return b
     In the expression:
       do { f;
diff --git a/testsuite/tests/safeHaskell/ghci/p15.stderr b/testsuite/tests/safeHaskell/ghci/p15.stderr
index 30c24471f74d..bc1069c87ff4 100644
--- a/testsuite/tests/safeHaskell/ghci/p15.stderr
+++ b/testsuite/tests/safeHaskell/ghci/p15.stderr
@@ -4,7 +4,6 @@
 
 <interactive>:22:22:
     No instance for (Typeable G) arising from a use of `cast'
-    Possible fix: add an instance declaration for (Typeable G)
     In the expression: (cast y) :: Maybe H
     In a pattern binding: (Just y_as_H) = (cast y) :: Maybe H
 
diff --git a/testsuite/tests/simplCore/should_compile/simpl017.stderr b/testsuite/tests/simplCore/should_compile/simpl017.stderr
index 497bc8b51ad6..334691d2c254 100644
--- a/testsuite/tests/simplCore/should_compile/simpl017.stderr
+++ b/testsuite/tests/simplCore/should_compile/simpl017.stderr
@@ -2,6 +2,12 @@
 simpl017.hs:44:12:
     Couldn't match expected type `forall v. [E m i] -> E' v m a'
                 with actual type `[E m i] -> E' v0 m a'
+    Relevant bindings include
+      liftArray :: arr i a -> E m (forall v. [E m i] -> E' v m a)
+        (bound at simpl017.hs:39:1)
+      a :: arr i a (bound at simpl017.hs:39:11)
+      ix :: [E m i] -> m i (bound at simpl017.hs:41:9)
+      f :: [E m i] -> E' v0 m a (bound at simpl017.hs:43:9)
     In the first argument of `return', namely `f'
     In a stmt of a 'do' block: return f
     In the first argument of `E', namely
@@ -12,16 +18,32 @@ simpl017.hs:44:12:
              return f })'
 
 simpl017.hs:63:5:
-    Couldn't match expected type `[E (ST t0) Int] -> E (ST s) Int'
-                with actual type `forall v. [E (ST s) Int] -> E' v (ST s) Int'
+    Couldn't match type `forall v.
+                         [E' RValue (ST s) Int] -> E' v (ST s) Int'
+                  with `[E (ST t0) Int] -> E' RValue (ST s) Int'
+    Expected type: [E (ST t0) Int] -> E (ST s) Int
+      Actual type: forall v. [E (ST s) Int] -> E' v (ST s) Int
+    Relevant bindings include
+      foo :: STArray s Int Int -> ST s Int (bound at simpl017.hs:59:1)
+      ma :: STArray s Int Int (bound at simpl017.hs:59:5)
+      a :: forall v. [E (ST s) Int] -> E' v (ST s) Int
+        (bound at simpl017.hs:60:5)
     The function `a' is applied to one argument,
     but its type `forall v. [E (ST s) Int] -> E' v (ST s) Int' has none
     In the first argument of `plus', namely `a [one]'
     In a stmt of a 'do' block: a [one] `plus` a [one]
 
 simpl017.hs:63:19:
-    Couldn't match expected type `[E (ST t1) Int] -> E (ST s) Int'
-                with actual type `forall v. [E (ST s) Int] -> E' v (ST s) Int'
+    Couldn't match type `forall v.
+                         [E' RValue (ST s) Int] -> E' v (ST s) Int'
+                  with `[E (ST t1) Int] -> E' RValue (ST s) Int'
+    Expected type: [E (ST t1) Int] -> E (ST s) Int
+      Actual type: forall v. [E (ST s) Int] -> E' v (ST s) Int
+    Relevant bindings include
+      foo :: STArray s Int Int -> ST s Int (bound at simpl017.hs:59:1)
+      ma :: STArray s Int Int (bound at simpl017.hs:59:5)
+      a :: forall v. [E (ST s) Int] -> E' v (ST s) Int
+        (bound at simpl017.hs:60:5)
     The function `a' is applied to one argument,
     but its type `forall v. [E (ST s) Int] -> E' v (ST s) Int' has none
     In the second argument of `plus', namely `a [one]'
diff --git a/testsuite/tests/typecheck/should_compile/FD1.stderr b/testsuite/tests/typecheck/should_compile/FD1.stderr
index ea6833b2b705..fdeb30e42dd7 100644
--- a/testsuite/tests/typecheck/should_compile/FD1.stderr
+++ b/testsuite/tests/typecheck/should_compile/FD1.stderr
@@ -1,12 +1,13 @@
-
-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
+
+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
+    Relevant bindings include plus :: Int -> a (bound at FD1.hs:16:1)
+    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 47221c5b0077..d23dd33e65fd 100644
--- a/testsuite/tests/typecheck/should_compile/FD2.stderr
+++ b/testsuite/tests/typecheck/should_compile/FD2.stderr
@@ -20,6 +20,12 @@ FD2.hs:26:34:
           the type signature for
             foldr1 :: Elem a e => (e -> e -> e) -> a -> e
           at FD2.hs:21:13
+    Relevant bindings include
+      foldr1 :: (e -> e -> e) -> a -> e (bound at FD2.hs:22:3)
+      f :: e -> e -> e (bound at FD2.hs:22:10)
+      mf :: e1 -> Maybe e1 -> Maybe e1 (bound at FD2.hs:25:12)
+      x :: e1 (bound at FD2.hs:26:15)
+      y :: e1 (bound at FD2.hs:26:23)
     In the return type of a call of `f'
     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/T2494.stderr b/testsuite/tests/typecheck/should_compile/T2494.stderr
index 2e943ac0a5e8..bbb8d0c94618 100644
--- a/testsuite/tests/typecheck/should_compile/T2494.stderr
+++ b/testsuite/tests/typecheck/should_compile/T2494.stderr
@@ -1,24 +1,36 @@
 
 T2494.hs:15:14:
-    Couldn't match type `b' with `a'
-      `b' is a rigid type variable bound by
-          the RULE "foo/foo" at T2494.hs:14:16
+    Couldn't match type `a' with `b'
       `a' is a rigid type variable bound by
           the RULE "foo/foo" at T2494.hs:13:16
+      `b' is a rigid type variable bound by
+          the RULE "foo/foo" at T2494.hs:14:16
     Expected type: Maybe (m a) -> Maybe (m a)
       Actual type: Maybe (m b) -> Maybe (m b)
+    Relevant bindings include
+      x :: Maybe a (bound at T2494.hs:14:65)
+      g :: forall (m :: * -> *). Monad m => Maybe (m b) -> Maybe (m b)
+        (bound at T2494.hs:14:11)
+      f :: forall (m :: * -> *). Monad m => Maybe (m a) -> Maybe (m a)
+        (bound at T2494.hs:13:11)
     In the first argument of `foo', namely `g'
     In the second argument of `foo', namely `(foo g x)'
     In the expression: foo f (foo g x)
 
 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
+    Couldn't match type `a' with `b'
       `a' is a rigid type variable bound by
           the RULE "foo/foo" at T2494.hs:13:16
+      `b' is a rigid type variable bound by
+          the RULE "foo/foo" at T2494.hs:14:16
     Expected type: Maybe (m a) -> Maybe (m a)
       Actual type: Maybe (m b) -> Maybe (m b)
+    Relevant bindings include
+      x :: Maybe a (bound at T2494.hs:14:65)
+      g :: forall (m :: * -> *). Monad m => Maybe (m b) -> Maybe (m b)
+        (bound at T2494.hs:14:11)
+      f :: forall (m :: * -> *). Monad m => Maybe (m a) -> Maybe (m a)
+        (bound at T2494.hs:13:11)
     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_compile/tc141.stderr b/testsuite/tests/typecheck/should_compile/tc141.stderr
index a22689b10f57..1942963d3b13 100644
--- a/testsuite/tests/typecheck/should_compile/tc141.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc141.stderr
@@ -12,6 +12,11 @@ tc141.hs:11:31:
            an expression type signature: a1 at tc141.hs:11:31
       `a' is a rigid type variable bound by
           the inferred type of f :: (a, a) -> (t, a) at tc141.hs:11:1
+    Relevant bindings include
+      f :: (a, a) -> (t, a) (bound at tc141.hs:11:1)
+      x :: (a, a) (bound at tc141.hs:11:3)
+      q :: a (bound at tc141.hs:11:17)
+      p :: a (bound at tc141.hs:11:12)
     In the expression: q :: a
     In the expression: (q :: a, p)
     In the expression: let (p :: a, q :: a) = x in (q :: a, p)
@@ -34,6 +39,10 @@ tc141.hs:15:18:
            the type signature for v :: a2 at tc141.hs:14:19
       `t' is a rigid type variable bound by
           the inferred type of g :: a -> t -> a1 at tc141.hs:13:1
+    Relevant bindings include
+      g :: a -> t -> a1 (bound at tc141.hs:13:1)
+      b :: t (bound at tc141.hs:13:5)
+      v :: a2 (bound at tc141.hs:15:14)
     In the expression: b
     In an equation for `v': v = b
     In the expression:
diff --git a/testsuite/tests/typecheck/should_compile/tc168.stderr b/testsuite/tests/typecheck/should_compile/tc168.stderr
index cbaa0aceeb40..8c0c81330f49 100644
--- a/testsuite/tests/typecheck/should_compile/tc168.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc168.stderr
@@ -7,7 +7,6 @@ tc168.hs:17:1:
       at tc168.hs:17:1-16
     The type variable `b0' is ambiguous
     Possible fix: add a type signature that fixes these type variable(s)
-    Possible fix: add an instance declaration for (C a1 (a, b0))
     When checking that `g'
       has the inferred type `forall a b a1. C a1 (a, b) => a1 -> a'
     Probable cause: the inferred type is ambiguous
diff --git a/testsuite/tests/typecheck/should_compile/tc211.stderr b/testsuite/tests/typecheck/should_compile/tc211.stderr
index e6c56754227a..3fc5e256a63a 100644
--- a/testsuite/tests/typecheck/should_compile/tc211.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc211.stderr
@@ -14,9 +14,9 @@ tc211.hs:15:22:
         (head foo) foo
 
 tc211.hs:70:9:
-    Couldn't match type `forall a1. a1 -> a1' with `a -> a'
+    Couldn't match type `forall a2. a2 -> a2' with `a1 -> a1'
     Expected type: List (forall a. a -> a)
-                   -> (forall a. a -> a) -> a -> a
+                   -> (forall a. a -> a) -> a1 -> a1
       Actual type: List (forall a. a -> a)
                    -> (forall a. a -> a) -> forall a. a -> a
     In the expression:
diff --git a/testsuite/tests/typecheck/should_fail/FDsFromGivens.stderr b/testsuite/tests/typecheck/should_fail/FDsFromGivens.stderr
index 8a942de48357..60a334232e18 100644
--- a/testsuite/tests/typecheck/should_fail/FDsFromGivens.stderr
+++ b/testsuite/tests/typecheck/should_fail/FDsFromGivens.stderr
@@ -1,12 +1,14 @@
 
 FDsFromGivens.hs:21:15:
-    Couldn't match type `Char' with `[a0]'
+    Couldn't match type `Char' with `[a]'
+    Relevant bindings include
+      bar :: KCC -> a -> a (bound at FDsFromGivens.hs:21:1)
     When using functional dependencies to combine
       C Char Char,
         arising from a pattern with constructor
                        KCC :: C Char Char => () -> KCC,
                      in an equation for `bar'
         at FDsFromGivens.hs:21:6-10
-      C Char [a0], arising from a use of `f' at FDsFromGivens.hs:21:15
+      C Char [a], arising from a use of `f' at FDsFromGivens.hs:21:15
     In the expression: f
     In an equation for `bar': bar (KCC _) = f
diff --git a/testsuite/tests/typecheck/should_fail/IPFail.stderr b/testsuite/tests/typecheck/should_fail/IPFail.stderr
index efad8b3d5650..d8efdfec56b8 100644
--- a/testsuite/tests/typecheck/should_fail/IPFail.stderr
+++ b/testsuite/tests/typecheck/should_fail/IPFail.stderr
@@ -4,7 +4,6 @@ IPFail.hs:6:18:
     from the context (?x::Int)
       bound by the type signature for f0 :: (?x::Int) => () -> Bool
       at IPFail.hs:5:7-31
-    Possible fix: add an instance declaration for (Num Bool)
     In the expression: 5
     In the expression: let ?x = 5 in ?x
     In an equation for `f0': f0 () = let ?x = 5 in ?x
diff --git a/testsuite/tests/typecheck/should_fail/LongWayOverlapping.stderr b/testsuite/tests/typecheck/should_fail/LongWayOverlapping.stderr
index 7cc45560c96c..fbd0b4486895 100644
--- a/testsuite/tests/typecheck/should_fail/LongWayOverlapping.stderr
+++ b/testsuite/tests/typecheck/should_fail/LongWayOverlapping.stderr
@@ -1,9 +1,7 @@
-
-LongWayOverlapping.hs:23:11:
-    No instance for (EmbAsChild [Char] Char)
-      arising from a use of `emb'
-    Possible fix:
-      add an instance declaration for (EmbAsChild [Char] Char)
-    In the expression: emb 'c'
-    In an equation for `emb': emb _ = emb 'c'
-    In the instance declaration for `EmbAsChild [Char] Bool'
+
+LongWayOverlapping.hs:23:11:
+    No instance for (EmbAsChild [Char] Char)
+      arising from a use of `emb'
+    In the expression: emb 'c'
+    In an equation for `emb': emb _ = emb 'c'
+    In the instance declaration for `EmbAsChild [Char] Bool'
diff --git a/testsuite/tests/typecheck/should_fail/SCLoop.stderr b/testsuite/tests/typecheck/should_fail/SCLoop.stderr
index 277b84a7b943..37970cc737ed 100644
--- a/testsuite/tests/typecheck/should_fail/SCLoop.stderr
+++ b/testsuite/tests/typecheck/should_fail/SCLoop.stderr
@@ -1,7 +1,5 @@
 
 SCLoop.hs:22:7:
-    No instance for (SC ())
-      arising from a use of `op'
-    Possible fix: add an instance declaration for (SC ())
+    No instance for (SC ()) arising from a use of `op'
     In the expression: op () ([Just True])
     In an equation for `foo': foo = op () ([Just True])
diff --git a/testsuite/tests/typecheck/should_fail/T1899.stderr b/testsuite/tests/typecheck/should_fail/T1899.stderr
index d7ab2be5ed23..0838984c2f82 100644
--- a/testsuite/tests/typecheck/should_fail/T1899.stderr
+++ b/testsuite/tests/typecheck/should_fail/T1899.stderr
@@ -4,6 +4,9 @@ T1899.hs:12:29:
       `a' is a rigid type variable bound by
           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)
     In the return type of a call of `Auxiliary'
     In the first argument of `Prop', namely `(Auxiliary undefined)'
     In the expression: Prop (Auxiliary undefined)
diff --git a/testsuite/tests/typecheck/should_fail/T2414.stderr b/testsuite/tests/typecheck/should_fail/T2414.stderr
index 5fa8f0060a92..53ea2b11e3a8 100644
--- a/testsuite/tests/typecheck/should_fail/T2414.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2414.stderr
@@ -1,6 +1,6 @@
 
 T2414.hs:9:13:
-    Occurs check: cannot construct the infinite type: b0 = (Bool, b0)
+    Occurs check: cannot construct the infinite type: b0 ~ (Bool, b0)
     Expected type: b0 -> Maybe (Bool, b0)
       Actual type: b0 -> Maybe b0
     In the first argument of `unfoldr', namely `Just'
diff --git a/testsuite/tests/typecheck/should_fail/T2534.stderr b/testsuite/tests/typecheck/should_fail/T2534.stderr
index bf19e68d04ae..8943b979ac4c 100644
--- a/testsuite/tests/typecheck/should_fail/T2534.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2534.stderr
@@ -1,7 +1,8 @@
 
 T2534.hs:3:19:
-    Couldn't match expected type `a0 -> a0 -> b0'
-                with actual type `[a1]'
+    Couldn't match expected type `a -> a -> b' with actual type `[a0]'
+    Relevant bindings include
+      foo :: a -> a -> b (bound at T2534.hs:3:1)
     In the second argument of `foldr', namely `[]'
     In the expression: foldr (>>=) [] []
     In an equation for `foo': foo = foldr (>>=) [] []
diff --git a/testsuite/tests/typecheck/should_fail/T2688.stderr b/testsuite/tests/typecheck/should_fail/T2688.stderr
index aa896569b907..b937de07b17f 100644
--- a/testsuite/tests/typecheck/should_fail/T2688.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2688.stderr
@@ -8,6 +8,10 @@ T2688.hs:8:22:
           the class declaration for `VectorSpace' at T2688.hs:5:19
       `s' is a rigid type variable bound by
           the class declaration for `VectorSpace' at T2688.hs:5:21
+    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)
     In the second argument of `(/)', namely `s'
     In the second argument of `(*^)', namely `(1 / s)'
     In the expression: v *^ (1 / s)
diff --git a/testsuite/tests/typecheck/should_fail/T2714.stderr b/testsuite/tests/typecheck/should_fail/T2714.stderr
index b8d6ae364617..68056509c73b 100644
--- a/testsuite/tests/typecheck/should_fail/T2714.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2714.stderr
@@ -6,6 +6,8 @@ T2714.hs:8:5:
           at T2714.hs:8:1
     Expected type: ((a -> b) -> b) -> c -> a
       Actual type: ((a -> b) -> b) -> f0 (a -> b) -> f0 b
+    Relevant bindings include
+      f :: ((a -> b) -> b) -> forall c. c -> a (bound at T2714.hs:8:1)
     In the expression: ffmap
     In an equation for `f': f = ffmap
 
@@ -16,5 +18,7 @@ T2714.hs:8:5:
           at T2714.hs:7:6
     Expected type: ((a -> b) -> b) -> c -> a
       Actual type: ((a -> b) -> b) -> f0 (a -> b) -> f0 b
+    Relevant bindings include
+      f :: ((a -> b) -> b) -> forall c. c -> a (bound at T2714.hs:8:1)
     In the expression: ffmap
     In an equation for `f': f = ffmap
diff --git a/testsuite/tests/typecheck/should_fail/T2846b.stderr b/testsuite/tests/typecheck/should_fail/T2846b.stderr
index 56b1a13ab04f..b70c4d1a0dbb 100644
--- a/testsuite/tests/typecheck/should_fail/T2846b.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2846b.stderr
@@ -1,6 +1,5 @@
 
 T2846b.hs:5:5:
     No instance for (Show (Num a0 => a0)) arising from a use of `show'
-    Possible fix: add an instance declaration for (Show (Num a0 => a0))
     In the expression: show ([1, 2, 3] :: [Num a => a])
     In an equation for `f': f = show ([1, 2, 3] :: [Num a => a])
diff --git a/testsuite/tests/typecheck/should_fail/T3592.stderr b/testsuite/tests/typecheck/should_fail/T3592.stderr
index 477c3aa67506..08a02ce8a275 100644
--- a/testsuite/tests/typecheck/should_fail/T3592.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3592.stderr
@@ -1,7 +1,6 @@
 
 T3592.hs:8:5:
     No instance for (Show (T a)) arising from a use of `show'
-    Possible fix: add an instance declaration for (Show (T a))
     In the expression: show
     In an equation for `f': f = show
 
diff --git a/testsuite/tests/typecheck/should_fail/T5300.stderr b/testsuite/tests/typecheck/should_fail/T5300.stderr
index 272f8b5762df..728655f88a98 100644
--- a/testsuite/tests/typecheck/should_fail/T5300.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5300.stderr
@@ -8,6 +8,9 @@ T5300.hs:15:9:
       at T5300.hs:14:7-69
     The type variable `c0' is ambiguous
     Possible fix: add a type signature that fixes these type variable(s)
+    Relevant bindings include
+      f2 :: a1 -> StateT (T b2) m a2 (bound at T5300.hs:15:1)
+      fm :: a1 (bound at T5300.hs:15:4)
     In the first argument of `(>>=)', namely `f1 fm'
     In the expression: f1 fm >>= return . undefined
     In an equation for `f2': f2 fm = f1 fm >>= return . undefined
diff --git a/testsuite/tests/typecheck/should_fail/T5570.stderr b/testsuite/tests/typecheck/should_fail/T5570.stderr
index 9daf26816878..e69cbd588aed 100644
--- a/testsuite/tests/typecheck/should_fail/T5570.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5570.stderr
@@ -1,6 +1,6 @@
-
-T5570.hs:7:16:
-    Couldn't match kind `#' against `*'
-    In the second argument of `($)', namely `D# $ 3.0##'
-    In the expression: print $ D# $ 3.0##
-    In an equation for `main': main = print $ D# $ 3.0##
+
+T5570.hs:7:16:
+    Couldn't match expected kind `*' with actual kind `#'
+    In the second argument of `($)', namely `D# $ 3.0##'
+    In the expression: print $ D# $ 3.0##
+    In an equation for `main': main = print $ D# $ 3.0##
diff --git a/testsuite/tests/typecheck/should_fail/T5684.stderr b/testsuite/tests/typecheck/should_fail/T5684.stderr
index 0aa8b179730f..c0575fd5a39c 100644
--- a/testsuite/tests/typecheck/should_fail/T5684.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5684.stderr
@@ -1,10 +1,78 @@
-
-T5684.hs:53:12:
-    No instance for (A Bool)
-      arising from a use of `op'
-    Possible fix: add an instance declaration for (A Bool)
-    In the expression: op False False
-    In the expression:
-      [op True undefined, op False False, op 'c' undefined]
-    In an equation for `flop6':
-        flop6 = [op True undefined, op False False, op 'c' undefined]
+
+T5684.hs:25:12:
+    No instance for (A b6) arising from a use of `op'
+    The type variable `b6' is ambiguous
+    Possible fix: add a type signature that fixes these type variable(s)
+    In the expression: op True undefined
+    In the expression:
+      [op False False, op 'c' undefined, op True undefined]
+    In an equation for `flop1':
+        flop1 = [op False False, op 'c' undefined, op True undefined]
+
+T5684.hs:30:12:
+    No instance for (A b5) arising from a use of `op'
+    The type variable `b5' is ambiguous
+    Possible fix: add a type signature that fixes these type variable(s)
+    In the expression: op True undefined
+    In the expression:
+      [op False False, op True undefined, op 'c' undefined]
+    In an equation for `flop2':
+        flop2 = [op False False, op True undefined, op 'c' undefined]
+
+T5684.hs:36:12:
+    No instance for (A b4) arising from a use of `op'
+    The type variable `b4' is ambiguous
+    Possible fix: add a type signature that fixes these type variable(s)
+    In the expression: op True undefined
+    In the expression:
+      [op 'c' undefined, op True undefined, op False False]
+    In an equation for `flop3':
+        flop3 = [op 'c' undefined, op True undefined, op False False]
+
+T5684.hs:42:12:
+    No instance for (A b3) arising from a use of `op'
+    The type variable `b3' is ambiguous
+    Possible fix: add a type signature that fixes these type variable(s)
+    In the expression: op True undefined
+    In the expression:
+      [op 'c' undefined, op False False, op True undefined]
+    In an equation for `flop4':
+        flop4 = [op 'c' undefined, op False False, op True undefined]
+
+T5684.hs:46:12:
+    No instance for (A b2) arising from a use of `op'
+    The type variable `b2' is ambiguous
+    Possible fix: add a type signature that fixes these type variable(s)
+    In the expression: op True undefined
+    In the expression:
+      [op True undefined, op 'c' undefined, op False False]
+    In an equation for `flop5':
+        flop5 = [op True undefined, op 'c' undefined, op False False]
+
+T5684.hs:52:12:
+    No instance for (A b0) arising from a use of `op'
+    The type variable `b0' is ambiguous
+    Possible fix: add a type signature that fixes these type variable(s)
+    In the expression: op True undefined
+    In the expression:
+      [op True undefined, op False False, op 'c' undefined]
+    In an equation for `flop6':
+        flop6 = [op True undefined, op False False, op 'c' undefined]
+
+T5684.hs:53:12:
+    No instance for (A Bool) arising from a use of `op'
+    In the expression: op False False
+    In the expression:
+      [op True undefined, op False False, op 'c' undefined]
+    In an equation for `flop6':
+        flop6 = [op True undefined, op False False, op 'c' undefined]
+
+T5684.hs:54:12:
+    No instance for (B Char b1) arising from a use of `op'
+    The type variable `b1' is ambiguous
+    Possible fix: add a type signature that fixes these type variable(s)
+    In the expression: op 'c' undefined
+    In the expression:
+      [op True undefined, op False False, op 'c' undefined]
+    In an equation for `flop6':
+        flop6 = [op True undefined, op False False, op 'c' undefined]
diff --git a/testsuite/tests/typecheck/should_fail/T5689.stderr b/testsuite/tests/typecheck/should_fail/T5689.stderr
index 28f9c0194068..48e923bd65c0 100644
--- a/testsuite/tests/typecheck/should_fail/T5689.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5689.stderr
@@ -1,6 +1,9 @@
 
 T5689.hs:10:36:
     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)
     In the expression: v
     In the expression: if v then False else True
     In the second argument of `writeIORef', namely
diff --git a/testsuite/tests/typecheck/should_fail/T5853.stderr b/testsuite/tests/typecheck/should_fail/T5853.stderr
index eeba39fb1d5a..6ee736c0b645 100644
--- a/testsuite/tests/typecheck/should_fail/T5853.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5853.stderr
@@ -1,14 +1,17 @@
 
 T5853.hs:15:52:
-    Could not deduce (fb ~ Subst fa1 (Elem fb))
+    Could not deduce (Subst fa b ~ Subst (Subst fa a) b)
     from the context (F fa,
-                      Subst fa (Elem fb) ~ fb,
-                      Subst fb (Elem fa) ~ fa,
-                      F fa1,
-                      Subst fa1 (Elem fa) ~ fa,
-                      Subst fa (Elem fa1) ~ fa1)
+                      Elem (Subst fa b) ~ b,
+                      Subst (Subst fa b) (Elem fa) ~ fa,
+                      F (Subst fa a),
+                      Elem (Subst fa a) ~ a,
+                      Subst (Subst fa a) (Elem fa) ~ fa)
       bound by the RULE "map/map" at T5853.hs:15:2-57
-      `fb' is a rigid type variable bound by
-           the RULE "map/map" at T5853.hs:15:2
+    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)
     In the expression: (f . g) <$> xs
     When checking the transformation rule "map/map"
diff --git a/testsuite/tests/typecheck/should_fail/T5858.stderr b/testsuite/tests/typecheck/should_fail/T5858.stderr
index 5e0cf1521b2c..0ce0d5df9fc0 100644
--- a/testsuite/tests/typecheck/should_fail/T5858.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5858.stderr
@@ -7,7 +7,5 @@ T5858.hs:11:7:
     Note: there is a potential instance available:
       instance t1 ~ String => InferOverloaded (t1, t1)
         -- Defined at T5858.hs:8:10
-    Possible fix:
-      add an instance declaration for (InferOverloaded ([a0], [a1]))
     In the expression: infer ([], [])
     In an equation for `foo': foo = infer ([], [])
diff --git a/testsuite/tests/typecheck/should_fail/mc20.stderr b/testsuite/tests/typecheck/should_fail/mc20.stderr
index ee9bb4b39f5f..01048c44811b 100644
--- a/testsuite/tests/typecheck/should_fail/mc20.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc20.stderr
@@ -1,8 +1,6 @@
 
 mc20.hs:14:31:
-    No instance for (Ord Unorderable)
-      arising from a use of `groupWith'
-    Possible fix: add an instance declaration for (Ord Unorderable)
+    No instance for (Ord Unorderable) arising from a use of `groupWith'
     In the expression: groupWith
     In a stmt of a monad comprehension: then group by x using groupWith
     In the expression:
diff --git a/testsuite/tests/typecheck/should_fail/mc22.stderr b/testsuite/tests/typecheck/should_fail/mc22.stderr
index 6a3474c64f62..d020bae09441 100644
--- a/testsuite/tests/typecheck/should_fail/mc22.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc22.stderr
@@ -1,10 +1,11 @@
-
-mc22.hs:10:26:
-    Couldn't match type `a' with `t0 a'
-      `a' is a rigid type variable bound by
-          a type expected by the context: [a] -> [t0 a] at mc22.hs:10:9
-    Expected type: [a] -> [t0 a]
-      Actual type: [a] -> [a]
-    In the return type of a call of `take'
-    In the expression: take 5
-    In a stmt of a monad comprehension: then group using take 5
+
+mc22.hs:10:26:
+    Couldn't match type `a' with `t a'
+      `a' is a rigid type variable bound by
+          a type expected by the context: [a] -> [t a] at mc22.hs:10:9
+    Expected type: [a] -> [t a]
+      Actual type: [a] -> [a]
+    Relevant bindings include foo :: [t [Char]] (bound at mc22.hs:8:1)
+    In the return type of a call of `take'
+    In the expression: take 5
+    In a stmt of a monad comprehension: then group using take 5
diff --git a/testsuite/tests/typecheck/should_fail/mc23.stderr b/testsuite/tests/typecheck/should_fail/mc23.stderr
index 632bac92c85e..b8c398728068 100644
--- a/testsuite/tests/typecheck/should_fail/mc23.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc23.stderr
@@ -1,9 +1,10 @@
-
-mc23.hs:9:29:
-    Couldn't match type `[a0]' with `a -> b0'
-    Expected type: (a -> b0) -> [a] -> t0 a
-      Actual type: [a0] -> [a0]
-    In the return type of a call of `take'
-    Probable cause: `take' is applied to too many arguments
-    In the expression: take 5
-    In a stmt of a monad comprehension: then take 5 by x
+
+mc23.hs:9:29:
+    Couldn't match type `[a0]' with `a -> b'
+    Expected type: (a -> b) -> [a] -> t a
+      Actual type: [a0] -> [a0]
+    Relevant bindings include z :: t b (bound at mc23.hs:9:1)
+    In the return type of a call of `take'
+    Probable cause: `take' is applied to too many arguments
+    In the expression: take 5
+    In a stmt of a monad comprehension: then take 5 by x
diff --git a/testsuite/tests/typecheck/should_fail/mc24.stderr b/testsuite/tests/typecheck/should_fail/mc24.stderr
index a2b11e2465c9..1249bc2f398c 100644
--- a/testsuite/tests/typecheck/should_fail/mc24.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc24.stderr
@@ -1,9 +1,9 @@
-
-mc24.hs:10:31:
-    Couldn't match type `[a0]' with `a -> a1'
-    Expected type: (a -> a1) -> [a] -> t0 [a]
-      Actual type: [a0] -> [a0]
-    In the return type of a call of `take'
-    Probable cause: `take' is applied to too many arguments
-    In the expression: take 2
-    In a stmt of a monad comprehension: then group by x using take 2
+
+mc24.hs:10:31:
+    Couldn't match type `[a0]' with `a -> Integer'
+    Expected type: (a -> Integer) -> [a] -> t [a]
+      Actual type: [a0] -> [a0]
+    In the return type of a call of `take'
+    Probable cause: `take' is applied to too many arguments
+    In the expression: take 2
+    In a stmt of a monad comprehension: then group by x using take 2
diff --git a/testsuite/tests/typecheck/should_fail/mc25.stderr b/testsuite/tests/typecheck/should_fail/mc25.stderr
index 643f35278dde..3925f833f0fb 100644
--- a/testsuite/tests/typecheck/should_fail/mc25.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc25.stderr
@@ -1,8 +1,9 @@
-
-mc25.hs:9:46:
-    Couldn't match type `Int' with `a -> t0'
-    Expected type: (a -> t0) -> [a] -> [t1 a]
-      Actual type: Int -> [a] -> [a]
-    In the expression: take
-    In a stmt of a monad comprehension: then group by x using take
-    In the expression: [x | x <- [1 .. 10], then group by x using take]
+
+mc25.hs:9:46:
+    Couldn't match type `Int' with `a -> t'
+    Expected type: (a -> t) -> [a] -> [t1 a]
+      Actual type: Int -> [a] -> [a]
+    Relevant bindings include z :: [t1 t] (bound at mc25.hs:9:1)
+    In the expression: take
+    In a stmt of a monad comprehension: then group by x using take
+    In the expression: [x | x <- [1 .. 10], then group by x using take]
diff --git a/testsuite/tests/typecheck/should_fail/tcfail001.stderr b/testsuite/tests/typecheck/should_fail/tcfail001.stderr
index 7c9b8ba27bd5..85b6788a7f9d 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail001.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail001.stderr
@@ -1,6 +1,7 @@
 
 tcfail001.hs:9:2:
     Couldn't match expected type `[t0] -> [a0]' with actual type `[a]'
+    Relevant bindings include op :: [a] (bound at tcfail001.hs:9:2)
     The equation(s) for `op' have one argument,
     but its type `[a]' has none
     In the instance declaration for `A [a]'
diff --git a/testsuite/tests/typecheck/should_fail/tcfail002.stderr b/testsuite/tests/typecheck/should_fail/tcfail002.stderr
index 12a77d0cc871..3a9c89c13df3 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail002.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail002.stderr
@@ -1,5 +1,8 @@
 
 tcfail002.hs:4:7:
-    Occurs check: cannot construct the infinite type: t0 = [t0]
+    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)
     In the expression: z
     In an equation for `c': c z = z
diff --git a/testsuite/tests/typecheck/should_fail/tcfail003.stderr b/testsuite/tests/typecheck/should_fail/tcfail003.stderr
index 62fb6a981241..42d7c597649f 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail003.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail003.stderr
@@ -1,8 +1,6 @@
 
 tcfail003.hs:3:10:
-    No instance for (Num Char)
-      arising from the literal `1'
-    Possible fix: add an instance declaration for (Num Char)
+    No instance for (Num Char) arising from the literal `1'
     In the expression: 1
     In the expression: [1, 'a']
     In a pattern binding: (d : e) = [1, 'a']
diff --git a/testsuite/tests/typecheck/should_fail/tcfail004.stderr b/testsuite/tests/typecheck/should_fail/tcfail004.stderr
index 5f0408880c54..db24fb2109dd 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail004.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail004.stderr
@@ -1,6 +1,9 @@
 
 tcfail004.hs:3:9:
-    Couldn't match expected type `(t0, t1)'
-                with actual type `(t2, t3, t4)'
+    Couldn't match expected type `(t, t1)'
+                with actual type `(Integer, Integer, Integer)'
+    Relevant bindings include
+      g :: t1 (bound at tcfail004.hs:3:4)
+      f :: t (bound at tcfail004.hs:3:2)
     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 66e6fa9f6952..9cfae02e1f58 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail005.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail005.stderr
@@ -1,5 +1,9 @@
 
 tcfail005.hs:3:9:
-    Couldn't match expected type `[t0]' with actual type `(t1, Char)'
+    Couldn't match expected type `[t]'
+                with actual type `(Integer, Char)'
+    Relevant bindings include
+      i :: [t] (bound at tcfail005.hs:3:4)
+      h :: t (bound at tcfail005.hs:3:2)
     In the expression: (1, 'a')
     In a pattern binding: (h : i) = (1, 'a')
diff --git a/testsuite/tests/typecheck/should_fail/tcfail006.stderr b/testsuite/tests/typecheck/should_fail/tcfail006.stderr
index d9ab68bcda3f..a31f4fdc217a 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail006.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail006.stderr
@@ -1,8 +1,6 @@
-
-tcfail006.hs:4:24:
-    No instance for (Num Bool)
-      arising from the literal `1'
-    Possible fix: add an instance declaration for (Num Bool)
-    In the expression: 1
-    In the expression: (True, 1)
-    In a case alternative: True -> (True, 1)
+
+tcfail006.hs:4:24:
+    No instance for (Num Bool) arising from the literal `1'
+    In the expression: 1
+    In the expression: (True, 1)
+    In a case alternative: True -> (True, 1)
diff --git a/testsuite/tests/typecheck/should_fail/tcfail007.stderr b/testsuite/tests/typecheck/should_fail/tcfail007.stderr
index 6f93a462a204..d375e40eb232 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail007.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail007.stderr
@@ -1,10 +1,8 @@
-
-tcfail007.hs:3:15:
-    No instance for (Num Bool)
-      arising from a use of `+'
-    Possible fix: add an instance declaration for (Num Bool)
-    In the expression: x + 1
-    In an equation for `n':
-        n x
-          | True = x + 1
-          | False = True
+
+tcfail007.hs:3:15:
+    No instance for (Num Bool) arising from a use of `+'
+    In the expression: x + 1
+    In an equation for `n':
+        n x
+          | True = x + 1
+          | False = True
diff --git a/testsuite/tests/typecheck/should_fail/tcfail008.stderr b/testsuite/tests/typecheck/should_fail/tcfail008.stderr
index 978d946970a2..c0791f2b2ee3 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail008.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail008.stderr
@@ -2,10 +2,10 @@
 tcfail008.hs:3:5:
     No instance for (Num a0) arising from the literal `1'
     The type variable `a0' is ambiguous
-    Possible cause: the monomorphism restriction applied to the following:
-      o :: [a0] (bound at tcfail008.hs:3:1)
+    Possible cause: the monomorphism restriction applied to: `o'
     Probable fix: give these definition(s) an explicit type signature
                   or use -XNoMonomorphismRestriction
+    Relevant bindings include o :: [a0] (bound at tcfail008.hs:3:1)
     Note: there are several potential instances:
       instance Num Double -- Defined in `GHC.Float'
       instance Num Float -- Defined in `GHC.Float'
@@ -18,7 +18,6 @@ tcfail008.hs:3:5:
 
 tcfail008.hs:3:7:
     No instance for (Num [a0]) arising from the literal `2'
-    Possible fix: add an instance declaration for (Num [a0])
     In the second argument of `(:)', namely `2'
     In the expression: 1 : 2
     In an equation for `o': o = 1 : 2
diff --git a/testsuite/tests/typecheck/should_fail/tcfail010.stderr b/testsuite/tests/typecheck/should_fail/tcfail010.stderr
index 5f22a3a20ef9..695655c31ef4 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail010.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail010.stderr
@@ -1,7 +1,6 @@
 
 tcfail010.hs:3:17:
     No instance for (Num [t0]) arising from a use of `+'
-    Possible fix: add an instance declaration for (Num [t0])
     In the expression: z + 2
     In the expression: \ (y : z) -> z + 2
     In an equation for `q': q = \ (y : z) -> z + 2
diff --git a/testsuite/tests/typecheck/should_fail/tcfail013.stderr b/testsuite/tests/typecheck/should_fail/tcfail013.stderr
index 439a663c5cd6..a1fd433f6700 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail013.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail013.stderr
@@ -1,5 +1,6 @@
 
 tcfail013.hs:4:3:
-    Couldn't match expected type `[t0]' with actual type `Bool'
+    Couldn't match expected type `[t]' with actual type `Bool'
+    Relevant bindings include f :: [t] -> a (bound at tcfail013.hs:3:1)
     In the pattern: True
     In an equation for `f': f True = 2
diff --git a/testsuite/tests/typecheck/should_fail/tcfail014.stderr b/testsuite/tests/typecheck/should_fail/tcfail014.stderr
index d46bf92db3b0..713ffce5e5b3 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail014.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail014.stderr
@@ -1,6 +1,9 @@
 
 tcfail014.hs:5:33:
-    Occurs check: cannot construct the infinite type: t1 = t1 -> t0
+    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)
     In the first argument of `z', namely `z'
     In the expression: z z
     In an equation for `h': h z = z z
diff --git a/testsuite/tests/typecheck/should_fail/tcfail015.stderr b/testsuite/tests/typecheck/should_fail/tcfail015.stderr
index 24affd76d936..41899dffb4e6 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail015.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail015.stderr
@@ -1,7 +1,5 @@
-
-tcfail015.hs:7:13:
-    No instance for (Num Bool)
-      arising from the literal `2'
-    Possible fix: add an instance declaration for (Num Bool)
-    In the expression: 2
-    In an equation for `g': g (ANull) = 2
+
+tcfail015.hs:7:13:
+    No instance for (Num Bool) arising from the literal `2'
+    In the expression: 2
+    In an equation for `g': g (ANull) = 2
diff --git a/testsuite/tests/typecheck/should_fail/tcfail016.stderr b/testsuite/tests/typecheck/should_fail/tcfail016.stderr
index 6c1fa9ce621c..17f2f16e4c40 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail016.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail016.stderr
@@ -1,16 +1,24 @@
 
 tcfail016.hs:9:20:
-    Couldn't match type `(t0, Expr t0)' with `Expr t0'
-    Expected type: Expr t0
-      Actual type: AnnExpr t0
+    Couldn't match type `(t, Expr t)' with `Expr t'
+    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)
     In the first argument of `g', namely `e1'
     In the first argument of `(++)', namely `(g e1)'
     In the expression: (g e1) ++ (g e2)
 
 tcfail016.hs:9:28:
-    Couldn't match type `(t0, Expr t0)' with `Expr t0'
-    Expected type: Expr t0
-      Actual type: AnnExpr t0
+    Couldn't match type `(t, Expr t)' with `Expr t'
+    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)
     In the first argument of `g', namely `e2'
     In the second argument of `(++)', namely `(g e2)'
     In the expression: (g e1) ++ (g e2)
diff --git a/testsuite/tests/typecheck/should_fail/tcfail017.stderr b/testsuite/tests/typecheck/should_fail/tcfail017.stderr
index 9ac3c7d64f38..006ff73d147b 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail017.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail017.stderr
@@ -4,5 +4,4 @@ tcfail017.hs:10:10:
       arising from the superclasses of an instance declaration
     from the context (B a)
       bound by the instance declaration at tcfail017.hs:10:10-23
-    Possible fix: add an instance declaration for (C [a])
     In the instance declaration for `B [a]'
diff --git a/testsuite/tests/typecheck/should_fail/tcfail018.stderr b/testsuite/tests/typecheck/should_fail/tcfail018.stderr
index 54df69888e89..67b3cbb47ec4 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail018.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail018.stderr
@@ -1,6 +1,5 @@
 
 tcfail018.hs:5:10:
     No instance for (Num [t0]) arising from the literal `1'
-    Possible fix: add an instance declaration for (Num [t0])
     In the expression: 1
     In a pattern binding: (a : []) = 1
diff --git a/testsuite/tests/typecheck/should_fail/tcfail019.stderr b/testsuite/tests/typecheck/should_fail/tcfail019.stderr
index ac2178be976c..79ab411795ed 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail019.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail019.stderr
@@ -2,5 +2,4 @@
 tcfail019.hs:18:10:
     No instance for (B [a])
       arising from the superclasses of an instance declaration
-    Possible fix: add an instance declaration for (B [a])
     In the instance declaration for `D [a]'
diff --git a/testsuite/tests/typecheck/should_fail/tcfail020.stderr b/testsuite/tests/typecheck/should_fail/tcfail020.stderr
index f15fd980840d..13ef851ed69b 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail020.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail020.stderr
@@ -4,5 +4,4 @@ tcfail020.hs:10:10:
       arising from the superclasses of an instance declaration
     from the context (A a)
       bound by the instance declaration at tcfail020.hs:10:10-23
-    Possible fix: add an instance declaration for (A [a])
     In the instance declaration for `B [a]'
diff --git a/testsuite/tests/typecheck/should_fail/tcfail029.stderr b/testsuite/tests/typecheck/should_fail/tcfail029.stderr
index cf83c561b91d..d9cb86238872 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail029.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail029.stderr
@@ -1,7 +1,5 @@
 
 tcfail029.hs:6:9:
-    No instance for (Ord Foo)
-      arising from a use of `>'
-    Possible fix: add an instance declaration for (Ord Foo)
+    No instance for (Ord Foo) arising from a use of `>'
     In the expression: x > Bar
     In an equation for `f': f x = x > Bar
diff --git a/testsuite/tests/typecheck/should_fail/tcfail032.stderr b/testsuite/tests/typecheck/should_fail/tcfail032.stderr
index 8cb4c1b99aa0..09d69ca13a2e 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail032.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail032.stderr
@@ -1,14 +1,12 @@
 
 tcfail032.hs:14:8:
-    Could not deduce (t ~ (a1 -> Int))
-    from the context (Eq a)
-      bound by the inferred type of f :: Eq a => t -> a -> Int
-      at tcfail032.hs:14:1-31
-    or from (Eq a1)
-      bound by an expression type signature: Eq a1 => a1 -> Int
+    Couldn't match expected type `t' with actual type `a1 -> Int'
+      because type variable `a1' would escape its scope
+    This (rigid, skolem) type variable is bound by
+      an expression type signature: Eq a1 => a1 -> Int
       at tcfail032.hs:14:8-30
-      `t' is a rigid type variable bound by
-          the inferred type of f :: Eq a => t -> a -> Int
-          at tcfail032.hs:14:1
+    Relevant bindings include
+      f :: t -> a -> Int (bound at tcfail032.hs:14:1)
+      x :: t (bound at tcfail032.hs:14:3)
     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 826ad4626d13..53822843343d 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail033.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail033.stderr
@@ -1,6 +1,10 @@
 
 tcfail033.hs:4:12:
-    Occurs check: cannot construct the infinite type: t0 = (t0, t1)
+    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)
     In the expression: x
     In the expression: [x | (x, y) <- buglet]
     In an equation for `buglet': buglet = [x | (x, y) <- buglet]
diff --git a/testsuite/tests/typecheck/should_fail/tcfail043.stderr b/testsuite/tests/typecheck/should_fail/tcfail043.stderr
index 3e52e69c564d..606750091be7 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail043.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail043.stderr
@@ -2,10 +2,13 @@
 tcfail043.hs:38:17:
     No instance for (Ord_ a0) arising from a use of `gt'
     The type variable `a0' is ambiguous
-    Possible cause: the monomorphism restriction applied to the following:
-      search :: a0 -> [a0] -> Bool (bound at tcfail043.hs:37:1)
+    Possible cause: the monomorphism restriction applied to: `search'
     Probable fix: give these definition(s) an explicit type signature
                   or use -XNoMonomorphismRestriction
+    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)
     Note: there is a potential instance available:
       instance Ord_ Int -- Defined at tcfail043.hs:34:10
     In the expression: gt (hd bs) a
@@ -24,10 +27,13 @@ tcfail043.hs:38:17:
 tcfail043.hs:40:25:
     No instance for (Eq_ a0) arising from a use of `eq'
     The type variable `a0' is ambiguous
-    Possible cause: the monomorphism restriction applied to the following:
-      search :: a0 -> [a0] -> Bool (bound at tcfail043.hs:37:1)
+    Possible cause: the monomorphism restriction applied to: `search'
     Probable fix: give these definition(s) an explicit type signature
                   or use -XNoMonomorphismRestriction
+    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)
     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/tcfail046.stderr b/testsuite/tests/typecheck/should_fail/tcfail046.stderr
index 1b668d07a6c8..e3a8f169e223 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail046.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail046.stderr
@@ -3,16 +3,14 @@ tcfail046.hs:10:50:
     No instance for (Eq (Process a))
       arising from the 'deriving' clause of a data type declaration
     Possible fix:
-      add an instance declaration for (Eq (Process a))
-      or use a standalone 'deriving instance' declaration,
-           so you can specify the instance context yourself
+      use a standalone 'deriving instance' declaration,
+        so you can specify the instance context yourself
     When deriving the instance for (Eq (Continuation a))
 
 tcfail046.hs:22:25:
     No instance for (Eq (Process a))
       arising from the 'deriving' clause of a data type declaration
     Possible fix:
-      add an instance declaration for (Eq (Process a))
-      or use a standalone 'deriving instance' declaration,
-           so you can specify the instance context yourself
+      use a standalone 'deriving instance' declaration,
+        so you can specify the instance context yourself
     When deriving the instance for (Eq (Message a))
diff --git a/testsuite/tests/typecheck/should_fail/tcfail065.stderr b/testsuite/tests/typecheck/should_fail/tcfail065.stderr
index fbe7e545c139..ae1981653724 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail065.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail065.stderr
@@ -1,11 +1,14 @@
-
-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
+
+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
+    Relevant bindings include
+      setX :: x1 -> X x -> X x (bound at tcfail065.hs:29:3)
+      x :: x1 (bound at tcfail065.hs:29:8)
+    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 bf6e1448bd25..687c8eaca768 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail068.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail068.stderr
@@ -1,97 +1,127 @@
-
-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)
+
+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)
+    Relevant bindings include
+      itgen :: (Int, Int) -> a -> IndTree s a
+        (bound at tcfail068.hs:12:1)
+    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
+    Relevant bindings include
+      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'
+    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)
+    Relevant bindings include
+      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 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)
+    Relevant bindings include
+      itrapstate :: ((Int, Int), (Int, Int))
+                    -> (a -> b -> (a, b))
+                    -> ((Int, Int) -> c -> a)
+                    -> (a -> c)
+                    -> c
+                    -> 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 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/tcfail076.stderr b/testsuite/tests/typecheck/should_fail/tcfail076.stderr
index 4ca4cf403b76..5e8361aa66aa 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail076.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail076.stderr
@@ -9,6 +9,9 @@ tcfail076.hs:18:82:
              at tcfail076.hs:18:64
     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)
     In the return type of a call of `cont'
     In the expression: cont a
     In the first argument of `KContT', namely `(\ cont' -> cont a)'
diff --git a/testsuite/tests/typecheck/should_fail/tcfail083.stderr b/testsuite/tests/typecheck/should_fail/tcfail083.stderr
index 77794ffaa601..589d2c995986 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail083.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail083.stderr
@@ -5,3 +5,17 @@ tcfail083.hs:8:39:
     In the pattern: State {bar = Bar {flag = f, baz = b}}
     In an equation for `display':
         display (State {bar = Bar {flag = f, baz = b}}) = print (f, b)
+
+tcfail083.hs:8:53:
+    No instance for (Show t0) arising from a use of `print'
+    The type variable `t0' is ambiguous
+    Possible fix: add a type signature that fixes these type variable(s)
+    Relevant bindings include b :: t0 (bound at tcfail083.hs:8:45)
+    Note: there are several potential instances:
+      instance Show Bar -- Defined at tcfail083.hs:3:43
+      instance Show Double -- Defined in `GHC.Float'
+      instance Show Float -- Defined in `GHC.Float'
+      ...plus 24 others
+    In the expression: print (f, b)
+    In an equation for `display':
+        display (State {bar = Bar {flag = f, baz = b}}) = print (f, b)
diff --git a/testsuite/tests/typecheck/should_fail/tcfail099.stderr b/testsuite/tests/typecheck/should_fail/tcfail099.stderr
index aa7eb9919755..49132b002f32 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail099.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail099.stderr
@@ -8,6 +8,10 @@ tcfail099.hs:9:20:
           at tcfail099.hs:9:7
       `t' is a rigid type variable bound by
           the inferred type of call :: DS -> t -> Int at tcfail099.hs:9:1
+    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)
     In the first argument of `f', namely `arg'
     In the expression: f arg
     In an equation for `call': call (C f) arg = f arg
diff --git a/testsuite/tests/typecheck/should_fail/tcfail102.stderr b/testsuite/tests/typecheck/should_fail/tcfail102.stderr
index 4c651bf7d457..516734b05d80 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail102.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail102.stderr
@@ -8,7 +8,6 @@ tcfail102.hs:9:15:
       bound by the type signature for
                  f :: Integral a => P (Ratio a) -> P (Ratio a)
       at tcfail102.hs:8:6-45
-    Possible fix: add an instance declaration for (Integral (Ratio a))
     In the `p' field of a record
     In the expression: x {p = p x}
     In an equation for `f': f x = x {p = p x}
diff --git a/testsuite/tests/typecheck/should_fail/tcfail103.stderr b/testsuite/tests/typecheck/should_fail/tcfail103.stderr
index 134f36f193ae..ea873e637feb 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail103.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail103.stderr
@@ -1,12 +1,16 @@
-
-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
+
+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
+    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)
+    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/tcfail106.stderr b/testsuite/tests/typecheck/should_fail/tcfail106.stderr
index 09c09769ba51..b08c7dfe892e 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail106.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail106.stderr
@@ -2,5 +2,4 @@
 tcfail106.hs:14:10:
     No instance for (S Int)
       arising from the superclasses of an instance declaration
-    Possible fix: add an instance declaration for (S Int)
     In the instance declaration for `D Int'
diff --git a/testsuite/tests/typecheck/should_fail/tcfail109.stderr b/testsuite/tests/typecheck/should_fail/tcfail109.stderr
index a72c6238d9bb..54558154090a 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail109.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail109.stderr
@@ -2,5 +2,4 @@
 tcfail109.hs:16:10:
     No instance for (Eq Stupid)
       arising from the superclasses of an instance declaration
-    Possible fix: add an instance declaration for (Eq Stupid)
     In the instance declaration for `Collects Bool Stupid'
diff --git a/testsuite/tests/typecheck/should_fail/tcfail128.stderr b/testsuite/tests/typecheck/should_fail/tcfail128.stderr
index 0834cc2fbd0a..265b783465fc 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail128.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail128.stderr
@@ -7,9 +7,6 @@ tcfail128.hs:18:16:
     Note: there is a potential instance available:
       instance Data.Array.Base.MArray GHC.IOArray.IOArray e IO
         -- Defined in `Data.Array.Base'
-    Possible fix:
-      add an instance declaration for
-      (Data.Array.Base.MArray b0 FlatVector IO)
     In a stmt of a 'do' block: v <- thaw tmp
     In the expression:
       do { let sL = ...
diff --git a/testsuite/tests/typecheck/should_fail/tcfail131.stderr b/testsuite/tests/typecheck/should_fail/tcfail131.stderr
index 785801a9a41a..db2a954d57b0 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail131.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail131.stderr
@@ -1,11 +1,14 @@
-
-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
+
+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
+    Relevant bindings include
+      g :: b -> b (bound at tcfail131.hs:7:3)
+      x :: b (bound at tcfail131.hs:7:5)
+    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/tcfail133.stderr b/testsuite/tests/typecheck/should_fail/tcfail133.stderr
index 08c9b9747db9..48ea0ebae2f7 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail133.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail133.stderr
@@ -20,9 +20,6 @@ tcfail133.hs:68:7:
 tcfail133.hs:68:14:
     No instance for (AddDigit (Zero :@ (One :@ One)) One a0)
       arising from a use of `add'
-    Possible fix:
-      add an instance declaration for
-      (AddDigit (Zero :@ (One :@ One)) One a0)
     In the second argument of `($)', namely
       `add (One :@ Zero) (One :@ One)'
     In the expression: show $ add (One :@ Zero) (One :@ One)
diff --git a/testsuite/tests/typecheck/should_fail/tcfail137.stderr b/testsuite/tests/typecheck/should_fail/tcfail137.stderr
index 9cbe69b98de1..b84fff1dfaa3 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail137.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail137.stderr
@@ -1,10 +1,8 @@
 
-tcfail137.hs:1:14:
-    Warning: -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
+tcfail137.hs:1:14: Warning:
+    -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
 
 tcfail137.hs:8:5:
-    No instance for (Floating Bool)
-      arising from a use of `Test'
-    Possible fix: add an instance declaration for (Floating Bool)
+    No instance for (Floating Bool) arising from a use of `Test'
     In the expression: Test [False, True]
     In an equation for `x': x = Test [False, True]
diff --git a/testsuite/tests/typecheck/should_fail/tcfail140.stderr b/testsuite/tests/typecheck/should_fail/tcfail140.stderr
index f24a2a7f82c8..0d9cd3404e83 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail140.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail140.stderr
@@ -1,20 +1,26 @@
 
 tcfail140.hs:10:7:
-    Couldn't match expected type `a0 -> t0' with actual type `Int'
+    Couldn't match expected type `Integer -> t' with actual type `Int'
+    Relevant bindings include bar :: t (bound at tcfail140.hs:10:1)
     The function `f' is applied to two arguments,
     but its type `Int -> Int' has only one
     In the expression: f 3 9
     In an equation for `bar': bar = f 3 9
 
 tcfail140.hs:12:10:
-    Couldn't match expected type `a0 -> t0' with actual type `Int'
+    Couldn't match expected type `Integer -> t1' with actual type `Int'
+    Relevant bindings include
+      rot :: t -> t1 (bound at tcfail140.hs:12:1)
     The operator `f' takes two arguments,
     but its type `Int -> Int' has only one
     In the expression: 3 `f` 4
     In an equation for `rot': rot xs = 3 `f` 4
 
 tcfail140.hs:14:15:
-    Couldn't match expected type `a0 -> b0' with actual type `Int'
+    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)
     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 200df0b6f680..2647156f8757 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail153.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail153.stderr
@@ -5,6 +5,9 @@ tcfail153.hs:6:7:
           the type signature for f :: a -> [a] at tcfail153.hs:5:6
     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)
     In the return type of a call of `g'
     In the expression: g x
     In an equation for `f':
diff --git a/testsuite/tests/typecheck/should_fail/tcfail169.stderr b/testsuite/tests/typecheck/should_fail/tcfail169.stderr
index cfe63c06eecb..1e0262d414e2 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail169.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail169.stderr
@@ -3,7 +3,6 @@ tcfail169.hs:7:51:
     No instance for (Show (Succ a))
       arising from the 'deriving' clause of a data type declaration
     Possible fix:
-      add an instance declaration for (Show (Succ a))
-      or use a standalone 'deriving instance' declaration,
-           so you can specify the instance context yourself
+      use a standalone 'deriving instance' declaration,
+        so you can specify the instance context yourself
     When deriving the instance for (Show (Seq a))
diff --git a/testsuite/tests/typecheck/should_fail/tcfail174.stderr b/testsuite/tests/typecheck/should_fail/tcfail174.stderr
index c4fb525c5e41..762a87efe024 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail174.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail174.stderr
@@ -1,31 +1,35 @@
-
-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
+
+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'
+      because type variable `a1' would escape its scope
+    This (rigid, skolem) type variable is bound by
+      the type forall a. a -> a
+      at tcfail174.hs:13:14
+    Expected type: Capture (forall x. x -> a)
+      Actual type: Capture (forall a. a -> a)
+    Relevant bindings include
+      h1 :: Capture a (bound at tcfail174.hs:13:1)
+    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)
+    Relevant bindings include
+      h2 :: Capture b (bound at tcfail174.hs:16:1)
+    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 797b701d6dce..d467a1570150 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail175.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail175.stderr
@@ -1,8 +1,10 @@
-
-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
+
+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
+    Relevant bindings include
+      evalRHS :: Int -> a (bound at tcfail175.hs:11:1)
+    The equation(s) for `evalRHS' have three arguments,
+    but its type `Int -> a' has only one
diff --git a/testsuite/tests/typecheck/should_fail/tcfail178.stderr b/testsuite/tests/typecheck/should_fail/tcfail178.stderr
index 66773a2feac4..b0b6360df780 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail178.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail178.stderr
@@ -1,14 +1,16 @@
 
 tcfail178.hs:15:7:
-    Couldn't match type `()' with `[a0]'
-    Expected type: Bool -> [a0]
+    Couldn't match type `()' with `[a]'
+    Expected type: Bool -> [a]
       Actual type: Bool -> ()
+    Relevant bindings include c :: [a] (bound at tcfail178.hs:15:1)
     In the first argument of `a', namely `y'
     In the expression: a y
     In an equation for `c': c = a y
 
 tcfail178.hs:18:7:
-    Couldn't match expected type `Bool -> [a0]' with actual type `()'
+    Couldn't match expected type `Bool -> [a]' with actual type `()'
+    Relevant bindings include d :: [a] (bound at tcfail178.hs:18:1)
     In the first argument of `a', namely `()'
     In the expression: a ()
     In an equation for `d': d = a ()
diff --git a/testsuite/tests/typecheck/should_fail/tcfail179.stderr b/testsuite/tests/typecheck/should_fail/tcfail179.stderr
index 4962c8aae78a..c60c7ac2e7c9 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail179.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail179.stderr
@@ -1,13 +1,18 @@
-
-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
+
+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
+    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)
+    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/tcfail182.stderr b/testsuite/tests/typecheck/should_fail/tcfail182.stderr
index d6b97af2503e..e021987234ec 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail182.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail182.stderr
@@ -2,5 +2,7 @@
 tcfail182.hs:9:3:
     Couldn't match expected type `Prelude.Maybe a'
                 with actual type `Maybe t0'
+    Relevant bindings include
+      f :: Prelude.Maybe a -> Int (bound at tcfail182.hs:9:1)
     In the pattern: Foo
     In an equation for `f': f Foo = 3
diff --git a/testsuite/tests/typecheck/should_fail/tcfail189.stderr b/testsuite/tests/typecheck/should_fail/tcfail189.stderr
index 6364cc2d5bdc..0e953563d4d5 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail189.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail189.stderr
@@ -1,7 +1,7 @@
 
 tcfail189.hs:10:31:
-    Couldn't match type `[a0]' with `a -> a1'
-    Expected type: (a -> a1) -> [a] -> [[a]]
+    Couldn't match type `[a0]' with `a -> Integer'
+    Expected type: (a -> Integer) -> [a] -> [[a]]
       Actual type: [a0] -> [a0]
     In the return type of a call of `take'
     Probable cause: `take' is applied to too many arguments
diff --git a/testsuite/tests/typecheck/should_fail/tcfail190.stderr b/testsuite/tests/typecheck/should_fail/tcfail190.stderr
index a6469e72d74d..db2d842f5834 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail190.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail190.stderr
@@ -1,8 +1,6 @@
 
 tcfail190.hs:14:31:
-    No instance for (Ord Unorderable)
-      arising from a use of `groupWith'
-    Possible fix: add an instance declaration for (Ord Unorderable)
+    No instance for (Ord Unorderable) arising from a use of `groupWith'
     In the expression: groupWith
     In a stmt of a list comprehension: then group by x using groupWith
     In the expression:
diff --git a/testsuite/tests/typecheck/should_fail/tcfail192.stderr b/testsuite/tests/typecheck/should_fail/tcfail192.stderr
index 349121975cab..d4cc8bbbfcdf 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail192.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail192.stderr
@@ -1,8 +1,6 @@
 
 tcfail192.hs:8:11:
-    No instance for (Num [[Char]])
-      arising from a use of `+'
-    Possible fix: add an instance declaration for (Num [[Char]])
+    No instance for (Num [[Char]]) arising from a use of `+'
     In the expression: x + 1
     In the expression:
       [x + 1 | x <- ["Hello", "World"], then group using take 5]
diff --git a/testsuite/tests/typecheck/should_fail/tcfail194.stderr b/testsuite/tests/typecheck/should_fail/tcfail194.stderr
index 620fa75b5283..7190a884ca45 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail194.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail194.stderr
@@ -1,9 +1,10 @@
-
-tcfail194.hs:9:29:
-    Couldn't match type `[a0]' with `a -> t0'
-    Expected type: (a -> t0) -> [a] -> [a]
-      Actual type: [a0] -> [a0]
-    In the return type of a call of `take'
-    Probable cause: `take' is applied to too many arguments
-    In the expression: take 5
-    In a stmt of a list comprehension: then take 5 by x
+
+tcfail194.hs:9:29:
+    Couldn't match type `[a0]' with `a -> t'
+    Expected type: (a -> t) -> [a] -> [a]
+      Actual type: [a0] -> [a0]
+    Relevant bindings include z :: [t] (bound at tcfail194.hs:9:1)
+    In the return type of a call of `take'
+    Probable cause: `take' is applied to too many arguments
+    In the expression: take 5
+    In a stmt of a list comprehension: then take 5 by x
diff --git a/testsuite/tests/typecheck/should_fail/tcfail198.stderr b/testsuite/tests/typecheck/should_fail/tcfail198.stderr
index bba13900dea9..ab040a1e2d49 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail198.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail198.stderr
@@ -5,6 +5,10 @@ tcfail198.hs:6:36:
            an expression type signature: a1 at tcfail198.hs:6:36
       `a' is a rigid type variable bound by
           the inferred type of f3 :: [a] -> [a] at tcfail198.hs:6:1
+    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)
     In the expression: x :: a
     In the second argument of `(++)', namely `[x :: a]'
     In the expression: xs ++ [x :: a]
diff --git a/testsuite/tests/typecheck/should_fail/tcfail201.stderr b/testsuite/tests/typecheck/should_fail/tcfail201.stderr
index 6a60b9fc90ba..4d93f9fadd7f 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail201.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail201.stderr
@@ -6,6 +6,11 @@ tcfail201.hs:17:27:
             gfoldl' :: (forall a1 b. c (a1 -> b) -> a1 -> c b)
                        -> (forall g. g -> c g) -> a -> c a
           at tcfail201.hs:15:12
+    Relevant bindings include
+      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:
diff --git a/testsuite/tests/typecheck/should_fail/tcfail206.stderr b/testsuite/tests/typecheck/should_fail/tcfail206.stderr
index 3283089afc13..2d0f87132f27 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail206.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail206.stderr
@@ -19,6 +19,8 @@ tcfail206.hs:11:5:
           the type signature for c :: a -> (a, Bool) at tcfail206.hs:10:6
     Expected type: a -> (a, Bool)
       Actual type: a -> (a, a)
+    Relevant bindings include
+      c :: a -> (a, Bool) (bound at tcfail206.hs:11:1)
     In the expression: (True || False,)
     In an equation for `c': c = (True || False,)
 
@@ -43,5 +45,7 @@ tcfail206.hs:20:5:
           the type signature for f :: a -> (# a, Bool #) at tcfail206.hs:19:6
     Expected type: a -> (# a, Bool #)
       Actual type: a -> (# a, a #)
+    Relevant bindings include
+      f :: a -> (# a, Bool #) (bound at tcfail206.hs:20:1)
     In the expression: (# True || False, #)
     In an equation for `f': f = (# True || False, #)
diff --git a/testsuite/tests/typecheck/should_fail/tcfail208.stderr b/testsuite/tests/typecheck/should_fail/tcfail208.stderr
index d606115ad1e3..d3172b6a913a 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail208.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail208.stderr
@@ -5,6 +5,5 @@ tcfail208.hs:4:19:
       bound by the type signature for
                  f :: (Monad m, Eq a) => a -> m a -> Bool
       at tcfail208.hs:3:6-40
-    Possible fix: add an instance declaration for (Eq (m a))
     In the expression: (return x == y)
     In an equation for `f': f x y = (return x == y)
-- 
GitLab