Wibbles to deriving error messages

testsuite/tests/deriving/should_fail/T2604.stderr

-
-T2604.hs:7:35:
-    Can't make a derived instance of ‛Typeable (DList a)’:
-      You need DeriveDataTypeable to derive an instance for this class
-    In the data declaration for ‛DList’
-
-T2604.hs:9:38:
-    Can't make a derived instance of ‛Typeable (NList a)’:
-      You need DeriveDataTypeable to derive an instance for this class
-    In the newtype declaration for ‛NList’
+
+T2604.hs:7:35:
+    Can't make a derived instance of ‛Typeable DList’:
+      You need DeriveDataTypeable to derive an instance for this class
+    In the data declaration for ‛DList’
+
+T2604.hs:9:38:
+    Can't make a derived instance of ‛Typeable NList’:
+      You need DeriveDataTypeable to derive an instance for this class
+    In the newtype declaration for ‛NList’

testsuite/tests/deriving/should_fail/T5863a.stderr

-
-T5863a.hs:9:31:
-    Can't make a derived instance of ‛Typeable (T Int)’:
-      Deriving Typeable is not allowed for family instances;
-      derive Typeable for ‛T’ alone
-    In the data instance declaration for ‛T’
-
-T5863a.hs:12:32:
-    Can't make a derived instance of ‛Typeable (T Bool)’:
-      Deriving Typeable is not allowed for family instances;
-      derive Typeable for ‛T’ alone
-    In the data instance declaration for ‛T’
+
+T5863a.hs:9:31:
+    Cannot eta-reduce to an instance of form
+      instance (...) => Typeable T
+    In the data instance declaration for ‛T’
+
+T5863a.hs:12:32:
+    Cannot eta-reduce to an instance of form
+      instance (...) => Typeable T
+    In the data instance declaration for ‛T’