diff --git a/src/dmd/declaration.d b/src/dmd/declaration.d
index 1f588ad5e3..24e103866d 100644
--- a/src/dmd/declaration.d
+++ b/src/dmd/declaration.d
@@ -6,12 +6,12 @@
  * Authors:     $(LINK2 http://www.digitalmars.com, Walter Bright)
  * License:     $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
  * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/dmd/declaration.d, _declaration.d)
+ * Documentation:  https://dlang.org/phobos/dmd_declaration.html
+ * Coverage:    https://codecov.io/gh/dlang/dmd/src/master/src/dmd/declaration.d
  */
 
 module dmd.declaration;
 
-// Online documentation: https://dlang.org/phobos/dmd_declaration.html
-
 import dmd.aggregate;
 import dmd.arraytypes;
 import dmd.dclass;
@@ -53,7 +53,7 @@ extern (C++) bool checkFrameAccess(Loc loc, Scope* sc, AggregateDeclaration ad,
         //printf("sparent = %p %s [%s], parent: %s\n", sparent, sparent.toChars(), sparent.loc.toChars(), sparent.parent,toChars());
         if (!ensureStaticLinkTo(s, sparent))
         {
-            error(loc, "cannot access frame pointer of %s", ad.toPrettyChars());
+            error(loc, "cannot access frame pointer of `%s`", ad.toPrettyChars());
             return true;
         }
     }
@@ -120,7 +120,7 @@ private int modifyFieldVar(Loc loc, Scope* sc, VarDeclaration var, Expression e1
                     else
                     {
                         const(char)* modStr = !var.type.isMutable() ? MODtoChars(var.type.mod) : MODtoChars(e1.type.mod);
-                        .error(loc, "%s field '%s' initialized multiple times", modStr, var.toChars());
+                        .error(loc, "%s field `%s` initialized multiple times", modStr, var.toChars());
                     }
                 }
                 else if (sc.noctor || (fi & CSXlabel))
@@ -130,7 +130,7 @@ private int modifyFieldVar(Loc loc, Scope* sc, VarDeclaration var, Expression e1
                     else
                     {
                         const(char)* modStr = !var.type.isMutable() ? MODtoChars(var.type.mod) : MODtoChars(e1.type.mod);
-                        .error(loc, "%s field '%s' initialization is not allowed in loops or after labels", modStr, var.toChars());
+                        .error(loc, "%s field `%s` initialization is not allowed in loops or after labels", modStr, var.toChars());
                     }
                 }
 
@@ -153,13 +153,13 @@ private int modifyFieldVar(Loc loc, Scope* sc, VarDeclaration var, Expression e1
                 else if (sc.func.fes)
                 {
                     const(char)* p = var.isField() ? "field" : var.kind();
-                    .error(loc, "%s %s '%s' initialization is not allowed in foreach loop",
+                    .error(loc, "%s %s `%s` initialization is not allowed in foreach loop",
                         MODtoChars(var.type.mod), p, var.toChars());
                 }
                 else
                 {
                     const(char)* p = var.isField() ? "field" : var.kind();
-                    .error(loc, "%s %s '%s' initialization is not allowed in nested function '%s'",
+                    .error(loc, "%s %s `%s` initialization is not allowed in nested function `%s`",
                         MODtoChars(var.type.mod), p, var.toChars(), sc.func.toChars());
                 }
             }
@@ -182,7 +182,7 @@ private int modifyFieldVar(Loc loc, Scope* sc, VarDeclaration var, Expression e1
  */
 extern (C++) void ObjectNotFound(Identifier id)
 {
-    Type.error(Loc(), "%s not found. object.d may be incorrectly installed or corrupt.", id.toChars());
+    Type.error(Loc(), "`%s` not found. object.d may be incorrectly installed or corrupt.", id.toChars());
     fatal();
 }
 
@@ -309,7 +309,7 @@ extern (C++) abstract class Declaration : Dsymbol
                 {
                     const(char)* s = isParameter() && parent.ident != Id.ensure ? "parameter" : "result";
                     if (!flag)
-                        error(loc, "cannot modify %s '%s' in contract", s, toChars());
+                        error(loc, "cannot modify %s `%s` in contract", s, toChars());
                     return 2; // do not report type related errors
                 }
             }
@@ -1342,7 +1342,7 @@ extern (C++) class VarDeclaration : Declaration
                  * could be set.
                  */
                 //if (cd.isInterfaceDeclaration())
-                //    error("interface %s cannot be scope", cd.toChars());
+                //    error("interface `%s` cannot be scope", cd.toChars());
 
                 // Destroying C++ scope classes crashes currently. Since C++ class dtors are not currently supported, simply do not run dtors for them.
                 // See https://issues.dlang.org/show_bug.cgi?id=13182
@@ -1404,7 +1404,7 @@ extern (C++) class VarDeclaration : Declaration
         auto e = getConstInitializer();
         if (!e)
         {
-            .error(loc, "cannot make expression out of initializer for %s", toChars());
+            .error(loc, "cannot make expression out of initializer for `%s`", toChars());
             return new ErrorExp();
         }
 
@@ -1499,7 +1499,7 @@ extern (C++) class VarDeclaration : Declaration
         // https://issues.dlang.org/show_bug.cgi?id=3326
         if (ident == Id.dollar)
         {
-            .error(loc, "cannnot use $ inside a function literal");
+            .error(loc, "cannnot use `$` inside a function literal");
             return true;
         }
         if (ident == Id.withSym) // https://issues.dlang.org/show_bug.cgi?id=1759
diff --git a/test/fail_compilation/diag12678.d b/test/fail_compilation/diag12678.d
index afe56fb51b..bfbfbd58d6 100644
--- a/test/fail_compilation/diag12678.d
+++ b/test/fail_compilation/diag12678.d
@@ -1,9 +1,9 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/diag12678.d(19): Error: const field 'cf1' initialized multiple times
-fail_compilation/diag12678.d(22): Error: immutable field 'if1' initialized multiple times
-fail_compilation/diag12678.d(25): Error: const field 'cf2' initialization is not allowed in loops or after labels
+fail_compilation/diag12678.d(19): Error: const field `cf1` initialized multiple times
+fail_compilation/diag12678.d(22): Error: immutable field `if1` initialized multiple times
+fail_compilation/diag12678.d(25): Error: const field `cf2` initialization is not allowed in loops or after labels
 ---
 */
 
diff --git a/test/fail_compilation/fail12749.d b/test/fail_compilation/fail12749.d
index 149d120982..231b21e809 100644
--- a/test/fail_compilation/fail12749.d
+++ b/test/fail_compilation/fail12749.d
@@ -1,10 +1,10 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail12749.d(19): Error: immutable field 'inum' initialization is not allowed in foreach loop
-fail_compilation/fail12749.d(20): Error: const field 'cnum' initialization is not allowed in foreach loop
-fail_compilation/fail12749.d(25): Error: immutable field 'inum' initialization is not allowed in nested function 'set'
-fail_compilation/fail12749.d(26): Error: const field 'cnum' initialization is not allowed in nested function 'set'
+fail_compilation/fail12749.d(19): Error: immutable field `inum` initialization is not allowed in foreach loop
+fail_compilation/fail12749.d(20): Error: const field `cnum` initialization is not allowed in foreach loop
+fail_compilation/fail12749.d(25): Error: immutable field `inum` initialization is not allowed in nested function `set`
+fail_compilation/fail12749.d(26): Error: const field `cnum` initialization is not allowed in nested function `set`
 ---
 */
 struct S
@@ -31,10 +31,10 @@ struct S
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail12749.d(48): Error: immutable variable 'inum' initialization is not allowed in foreach loop
-fail_compilation/fail12749.d(49): Error: const variable 'cnum' initialization is not allowed in foreach loop
-fail_compilation/fail12749.d(54): Error: immutable variable 'inum' initialization is not allowed in nested function 'set'
-fail_compilation/fail12749.d(55): Error: const variable 'cnum' initialization is not allowed in nested function 'set'
+fail_compilation/fail12749.d(48): Error: immutable variable `inum` initialization is not allowed in foreach loop
+fail_compilation/fail12749.d(49): Error: const variable `cnum` initialization is not allowed in foreach loop
+fail_compilation/fail12749.d(54): Error: immutable variable `inum` initialization is not allowed in nested function `set`
+fail_compilation/fail12749.d(55): Error: const variable `cnum` initialization is not allowed in nested function `set`
 ---
 */
 immutable int inum;
diff --git a/test/fail_compilation/fail329.d b/test/fail_compilation/fail329.d
index f28304e35d..973deeef49 100644
--- a/test/fail_compilation/fail329.d
+++ b/test/fail_compilation/fail329.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail329.d(28): Error: variable fail329.A.foo.__ensure.result cannot modify result 'result' in contract
+fail_compilation/fail329.d(28): Error: variable fail329.A.foo.__ensure.result cannot modify result `result` in contract
 ---
 */
 
diff --git a/test/fail_compilation/fail330.d b/test/fail_compilation/fail330.d
index a3409db5d1..dd7a59eb08 100644
--- a/test/fail_compilation/fail330.d
+++ b/test/fail_compilation/fail330.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail330.d(9): Error: variable fail330.fun.result cannot modify result 'result' in contract
+fail_compilation/fail330.d(9): Error: variable fail330.fun.result cannot modify result `result` in contract
 ---
 */
 
diff --git a/test/fail_compilation/fail9413.d b/test/fail_compilation/fail9413.d
index 617c995040..c9d83d920f 100644
--- a/test/fail_compilation/fail9413.d
+++ b/test/fail_compilation/fail9413.d
@@ -1,24 +1,24 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail9413.d(45): Error: variable fail9413.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9413.d(32): Error: variable fail9413.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9413.d(33): Error: variable fail9413.foo.bar.y cannot modify parameter 'y' in contract
-fail_compilation/fail9413.d(38): Error: variable fail9413.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9413.d(39): Error: variable fail9413.foo.bar.y cannot modify parameter 'y' in contract
-fail_compilation/fail9413.d(40): Error: variable fail9413.foo.bar.s cannot modify result 's' in contract
-fail_compilation/fail9413.d(50): Error: variable fail9413.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9413.d(73): Error: variable fail9413.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9413.d(74): Error: variable fail9413.foo.r cannot modify result 'r' in contract
-fail_compilation/fail9413.d(58): Error: variable fail9413.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9413.d(59): Error: variable fail9413.foo.r cannot modify result 'r' in contract
-fail_compilation/fail9413.d(60): Error: variable fail9413.foo.baz.y cannot modify parameter 'y' in contract
-fail_compilation/fail9413.d(65): Error: variable fail9413.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9413.d(66): Error: variable fail9413.foo.r cannot modify result 'r' in contract
-fail_compilation/fail9413.d(67): Error: variable fail9413.foo.baz.y cannot modify parameter 'y' in contract
-fail_compilation/fail9413.d(68): Error: variable fail9413.foo.baz.s cannot modify result 's' in contract
-fail_compilation/fail9413.d(79): Error: variable fail9413.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9413.d(80): Error: variable fail9413.foo.r cannot modify result 'r' in contract
+fail_compilation/fail9413.d(45): Error: variable fail9413.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9413.d(32): Error: variable fail9413.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9413.d(33): Error: variable fail9413.foo.bar.y cannot modify parameter `y` in contract
+fail_compilation/fail9413.d(38): Error: variable fail9413.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9413.d(39): Error: variable fail9413.foo.bar.y cannot modify parameter `y` in contract
+fail_compilation/fail9413.d(40): Error: variable fail9413.foo.bar.s cannot modify result `s` in contract
+fail_compilation/fail9413.d(50): Error: variable fail9413.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9413.d(73): Error: variable fail9413.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9413.d(74): Error: variable fail9413.foo.r cannot modify result `r` in contract
+fail_compilation/fail9413.d(58): Error: variable fail9413.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9413.d(59): Error: variable fail9413.foo.r cannot modify result `r` in contract
+fail_compilation/fail9413.d(60): Error: variable fail9413.foo.baz.y cannot modify parameter `y` in contract
+fail_compilation/fail9413.d(65): Error: variable fail9413.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9413.d(66): Error: variable fail9413.foo.r cannot modify result `r` in contract
+fail_compilation/fail9413.d(67): Error: variable fail9413.foo.baz.y cannot modify parameter `y` in contract
+fail_compilation/fail9413.d(68): Error: variable fail9413.foo.baz.s cannot modify result `s` in contract
+fail_compilation/fail9413.d(79): Error: variable fail9413.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9413.d(80): Error: variable fail9413.foo.r cannot modify result `r` in contract
 ---
 */
 
diff --git a/test/fail_compilation/fail9414a.d b/test/fail_compilation/fail9414a.d
index 4fd98d3cc5..a175f43191 100644
--- a/test/fail_compilation/fail9414a.d
+++ b/test/fail_compilation/fail9414a.d
@@ -1,24 +1,24 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail9414a.d(47): Error: variable fail9414a.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414a.d(34): Error: variable fail9414a.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414a.d(35): Error: variable fail9414a.C.foo.__require.bar.y cannot modify parameter 'y' in contract
-fail_compilation/fail9414a.d(40): Error: variable fail9414a.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414a.d(41): Error: variable fail9414a.C.foo.__require.bar.y cannot modify parameter 'y' in contract
-fail_compilation/fail9414a.d(42): Error: variable fail9414a.C.foo.__require.bar.s cannot modify result 's' in contract
-fail_compilation/fail9414a.d(52): Error: variable fail9414a.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414a.d(75): Error: variable fail9414a.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414a.d(76): Error: variable fail9414a.C.foo.__ensure.r cannot modify result 'r' in contract
-fail_compilation/fail9414a.d(60): Error: variable fail9414a.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414a.d(61): Error: variable fail9414a.C.foo.__ensure.r cannot modify result 'r' in contract
-fail_compilation/fail9414a.d(62): Error: variable fail9414a.C.foo.__ensure.baz.y cannot modify parameter 'y' in contract
-fail_compilation/fail9414a.d(67): Error: variable fail9414a.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414a.d(68): Error: variable fail9414a.C.foo.__ensure.r cannot modify result 'r' in contract
-fail_compilation/fail9414a.d(69): Error: variable fail9414a.C.foo.__ensure.baz.y cannot modify parameter 'y' in contract
-fail_compilation/fail9414a.d(70): Error: variable fail9414a.C.foo.__ensure.baz.s cannot modify result 's' in contract
-fail_compilation/fail9414a.d(81): Error: variable fail9414a.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414a.d(82): Error: variable fail9414a.C.foo.__ensure.r cannot modify result 'r' in contract
+fail_compilation/fail9414a.d(47): Error: variable fail9414a.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414a.d(34): Error: variable fail9414a.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414a.d(35): Error: variable fail9414a.C.foo.__require.bar.y cannot modify parameter `y` in contract
+fail_compilation/fail9414a.d(40): Error: variable fail9414a.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414a.d(41): Error: variable fail9414a.C.foo.__require.bar.y cannot modify parameter `y` in contract
+fail_compilation/fail9414a.d(42): Error: variable fail9414a.C.foo.__require.bar.s cannot modify result `s` in contract
+fail_compilation/fail9414a.d(52): Error: variable fail9414a.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414a.d(75): Error: variable fail9414a.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414a.d(76): Error: variable fail9414a.C.foo.__ensure.r cannot modify result `r` in contract
+fail_compilation/fail9414a.d(60): Error: variable fail9414a.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414a.d(61): Error: variable fail9414a.C.foo.__ensure.r cannot modify result `r` in contract
+fail_compilation/fail9414a.d(62): Error: variable fail9414a.C.foo.__ensure.baz.y cannot modify parameter `y` in contract
+fail_compilation/fail9414a.d(67): Error: variable fail9414a.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414a.d(68): Error: variable fail9414a.C.foo.__ensure.r cannot modify result `r` in contract
+fail_compilation/fail9414a.d(69): Error: variable fail9414a.C.foo.__ensure.baz.y cannot modify parameter `y` in contract
+fail_compilation/fail9414a.d(70): Error: variable fail9414a.C.foo.__ensure.baz.s cannot modify result `s` in contract
+fail_compilation/fail9414a.d(81): Error: variable fail9414a.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414a.d(82): Error: variable fail9414a.C.foo.__ensure.r cannot modify result `r` in contract
 ---
 */
 
diff --git a/test/fail_compilation/fail9414b.d b/test/fail_compilation/fail9414b.d
index 37bd12fc42..a23a80445c 100644
--- a/test/fail_compilation/fail9414b.d
+++ b/test/fail_compilation/fail9414b.d
@@ -1,24 +1,24 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail9414b.d(47): Error: variable fail9414b.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414b.d(34): Error: variable fail9414b.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414b.d(35): Error: variable fail9414b.C.foo.__require.bar.y cannot modify parameter 'y' in contract
-fail_compilation/fail9414b.d(40): Error: variable fail9414b.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414b.d(41): Error: variable fail9414b.C.foo.__require.bar.y cannot modify parameter 'y' in contract
-fail_compilation/fail9414b.d(42): Error: variable fail9414b.C.foo.__require.bar.s cannot modify result 's' in contract
-fail_compilation/fail9414b.d(52): Error: variable fail9414b.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414b.d(75): Error: variable fail9414b.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414b.d(76): Error: variable fail9414b.C.foo.__ensure.r cannot modify result 'r' in contract
-fail_compilation/fail9414b.d(60): Error: variable fail9414b.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414b.d(61): Error: variable fail9414b.C.foo.__ensure.r cannot modify result 'r' in contract
-fail_compilation/fail9414b.d(62): Error: variable fail9414b.C.foo.__ensure.baz.y cannot modify parameter 'y' in contract
-fail_compilation/fail9414b.d(67): Error: variable fail9414b.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414b.d(68): Error: variable fail9414b.C.foo.__ensure.r cannot modify result 'r' in contract
-fail_compilation/fail9414b.d(69): Error: variable fail9414b.C.foo.__ensure.baz.y cannot modify parameter 'y' in contract
-fail_compilation/fail9414b.d(70): Error: variable fail9414b.C.foo.__ensure.baz.s cannot modify result 's' in contract
-fail_compilation/fail9414b.d(81): Error: variable fail9414b.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414b.d(82): Error: variable fail9414b.C.foo.__ensure.r cannot modify result 'r' in contract
+fail_compilation/fail9414b.d(47): Error: variable fail9414b.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414b.d(34): Error: variable fail9414b.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414b.d(35): Error: variable fail9414b.C.foo.__require.bar.y cannot modify parameter `y` in contract
+fail_compilation/fail9414b.d(40): Error: variable fail9414b.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414b.d(41): Error: variable fail9414b.C.foo.__require.bar.y cannot modify parameter `y` in contract
+fail_compilation/fail9414b.d(42): Error: variable fail9414b.C.foo.__require.bar.s cannot modify result `s` in contract
+fail_compilation/fail9414b.d(52): Error: variable fail9414b.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414b.d(75): Error: variable fail9414b.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414b.d(76): Error: variable fail9414b.C.foo.__ensure.r cannot modify result `r` in contract
+fail_compilation/fail9414b.d(60): Error: variable fail9414b.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414b.d(61): Error: variable fail9414b.C.foo.__ensure.r cannot modify result `r` in contract
+fail_compilation/fail9414b.d(62): Error: variable fail9414b.C.foo.__ensure.baz.y cannot modify parameter `y` in contract
+fail_compilation/fail9414b.d(67): Error: variable fail9414b.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414b.d(68): Error: variable fail9414b.C.foo.__ensure.r cannot modify result `r` in contract
+fail_compilation/fail9414b.d(69): Error: variable fail9414b.C.foo.__ensure.baz.y cannot modify parameter `y` in contract
+fail_compilation/fail9414b.d(70): Error: variable fail9414b.C.foo.__ensure.baz.s cannot modify result `s` in contract
+fail_compilation/fail9414b.d(81): Error: variable fail9414b.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414b.d(82): Error: variable fail9414b.C.foo.__ensure.r cannot modify result `r` in contract
 ---
 */
 
diff --git a/test/fail_compilation/fail9414c.d b/test/fail_compilation/fail9414c.d
index efbff9c42f..1404052cf5 100644
--- a/test/fail_compilation/fail9414c.d
+++ b/test/fail_compilation/fail9414c.d
@@ -1,24 +1,24 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail9414c.d(47): Error: variable fail9414c.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414c.d(34): Error: variable fail9414c.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414c.d(35): Error: variable fail9414c.C.foo.bar.y cannot modify parameter 'y' in contract
-fail_compilation/fail9414c.d(40): Error: variable fail9414c.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414c.d(41): Error: variable fail9414c.C.foo.bar.y cannot modify parameter 'y' in contract
-fail_compilation/fail9414c.d(42): Error: variable fail9414c.C.foo.bar.s cannot modify result 's' in contract
-fail_compilation/fail9414c.d(52): Error: variable fail9414c.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414c.d(75): Error: variable fail9414c.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414c.d(76): Error: variable fail9414c.C.foo.r cannot modify result 'r' in contract
-fail_compilation/fail9414c.d(60): Error: variable fail9414c.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414c.d(61): Error: variable fail9414c.C.foo.r cannot modify result 'r' in contract
-fail_compilation/fail9414c.d(62): Error: variable fail9414c.C.foo.baz.y cannot modify parameter 'y' in contract
-fail_compilation/fail9414c.d(67): Error: variable fail9414c.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414c.d(68): Error: variable fail9414c.C.foo.r cannot modify result 'r' in contract
-fail_compilation/fail9414c.d(69): Error: variable fail9414c.C.foo.baz.y cannot modify parameter 'y' in contract
-fail_compilation/fail9414c.d(70): Error: variable fail9414c.C.foo.baz.s cannot modify result 's' in contract
-fail_compilation/fail9414c.d(81): Error: variable fail9414c.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414c.d(82): Error: variable fail9414c.C.foo.r cannot modify result 'r' in contract
+fail_compilation/fail9414c.d(47): Error: variable fail9414c.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414c.d(34): Error: variable fail9414c.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414c.d(35): Error: variable fail9414c.C.foo.bar.y cannot modify parameter `y` in contract
+fail_compilation/fail9414c.d(40): Error: variable fail9414c.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414c.d(41): Error: variable fail9414c.C.foo.bar.y cannot modify parameter `y` in contract
+fail_compilation/fail9414c.d(42): Error: variable fail9414c.C.foo.bar.s cannot modify result `s` in contract
+fail_compilation/fail9414c.d(52): Error: variable fail9414c.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414c.d(75): Error: variable fail9414c.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414c.d(76): Error: variable fail9414c.C.foo.r cannot modify result `r` in contract
+fail_compilation/fail9414c.d(60): Error: variable fail9414c.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414c.d(61): Error: variable fail9414c.C.foo.r cannot modify result `r` in contract
+fail_compilation/fail9414c.d(62): Error: variable fail9414c.C.foo.baz.y cannot modify parameter `y` in contract
+fail_compilation/fail9414c.d(67): Error: variable fail9414c.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414c.d(68): Error: variable fail9414c.C.foo.r cannot modify result `r` in contract
+fail_compilation/fail9414c.d(69): Error: variable fail9414c.C.foo.baz.y cannot modify parameter `y` in contract
+fail_compilation/fail9414c.d(70): Error: variable fail9414c.C.foo.baz.s cannot modify result `s` in contract
+fail_compilation/fail9414c.d(81): Error: variable fail9414c.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414c.d(82): Error: variable fail9414c.C.foo.r cannot modify result `r` in contract
 ---
 */
 
diff --git a/test/fail_compilation/fail9414d.d b/test/fail_compilation/fail9414d.d
index 60b588678f..a45d3dbd4e 100644
--- a/test/fail_compilation/fail9414d.d
+++ b/test/fail_compilation/fail9414d.d
@@ -1,24 +1,24 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail9414d.d(47): Error: variable fail9414d.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414d.d(34): Error: variable fail9414d.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414d.d(35): Error: variable fail9414d.C.foo.bar.y cannot modify parameter 'y' in contract
-fail_compilation/fail9414d.d(40): Error: variable fail9414d.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414d.d(41): Error: variable fail9414d.C.foo.bar.y cannot modify parameter 'y' in contract
-fail_compilation/fail9414d.d(42): Error: variable fail9414d.C.foo.bar.s cannot modify result 's' in contract
-fail_compilation/fail9414d.d(52): Error: variable fail9414d.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414d.d(75): Error: variable fail9414d.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414d.d(76): Error: variable fail9414d.C.foo.r cannot modify result 'r' in contract
-fail_compilation/fail9414d.d(60): Error: variable fail9414d.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414d.d(61): Error: variable fail9414d.C.foo.r cannot modify result 'r' in contract
-fail_compilation/fail9414d.d(62): Error: variable fail9414d.C.foo.baz.y cannot modify parameter 'y' in contract
-fail_compilation/fail9414d.d(67): Error: variable fail9414d.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414d.d(68): Error: variable fail9414d.C.foo.r cannot modify result 'r' in contract
-fail_compilation/fail9414d.d(69): Error: variable fail9414d.C.foo.baz.y cannot modify parameter 'y' in contract
-fail_compilation/fail9414d.d(70): Error: variable fail9414d.C.foo.baz.s cannot modify result 's' in contract
-fail_compilation/fail9414d.d(81): Error: variable fail9414d.C.foo.x cannot modify parameter 'x' in contract
-fail_compilation/fail9414d.d(82): Error: variable fail9414d.C.foo.r cannot modify result 'r' in contract
+fail_compilation/fail9414d.d(47): Error: variable fail9414d.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414d.d(34): Error: variable fail9414d.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414d.d(35): Error: variable fail9414d.C.foo.bar.y cannot modify parameter `y` in contract
+fail_compilation/fail9414d.d(40): Error: variable fail9414d.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414d.d(41): Error: variable fail9414d.C.foo.bar.y cannot modify parameter `y` in contract
+fail_compilation/fail9414d.d(42): Error: variable fail9414d.C.foo.bar.s cannot modify result `s` in contract
+fail_compilation/fail9414d.d(52): Error: variable fail9414d.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414d.d(75): Error: variable fail9414d.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414d.d(76): Error: variable fail9414d.C.foo.r cannot modify result `r` in contract
+fail_compilation/fail9414d.d(60): Error: variable fail9414d.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414d.d(61): Error: variable fail9414d.C.foo.r cannot modify result `r` in contract
+fail_compilation/fail9414d.d(62): Error: variable fail9414d.C.foo.baz.y cannot modify parameter `y` in contract
+fail_compilation/fail9414d.d(67): Error: variable fail9414d.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414d.d(68): Error: variable fail9414d.C.foo.r cannot modify result `r` in contract
+fail_compilation/fail9414d.d(69): Error: variable fail9414d.C.foo.baz.y cannot modify parameter `y` in contract
+fail_compilation/fail9414d.d(70): Error: variable fail9414d.C.foo.baz.s cannot modify result `s` in contract
+fail_compilation/fail9414d.d(81): Error: variable fail9414d.C.foo.x cannot modify parameter `x` in contract
+fail_compilation/fail9414d.d(82): Error: variable fail9414d.C.foo.r cannot modify result `r` in contract
 ---
 */
 
diff --git a/test/fail_compilation/fail9665a.d b/test/fail_compilation/fail9665a.d
index 64602f875c..6fbd52abbd 100644
--- a/test/fail_compilation/fail9665a.d
+++ b/test/fail_compilation/fail9665a.d
@@ -7,7 +7,7 @@
 /+
 TEST_OUTPUT:
 ---
-fail_compilation/fail9665a.d(19): Error: immutable field 'v' initialized multiple times
+fail_compilation/fail9665a.d(19): Error: immutable field `v` initialized multiple times
 ---
 +/
 struct S1A
@@ -23,9 +23,9 @@ struct S1A
 /+
 TEST_OUTPUT:
 ---
-fail_compilation/fail9665a.d(37): Error: immutable field 'v' initialized multiple times
-fail_compilation/fail9665a.d(42): Error: immutable field 'v' initialized multiple times
-fail_compilation/fail9665a.d(47): Error: immutable field 'v' initialized multiple times
+fail_compilation/fail9665a.d(37): Error: immutable field `v` initialized multiple times
+fail_compilation/fail9665a.d(42): Error: immutable field `v` initialized multiple times
+fail_compilation/fail9665a.d(47): Error: immutable field `v` initialized multiple times
 ---
 +/
 struct S1B
@@ -51,9 +51,9 @@ struct S1B
 /+
 TEST_OUTPUT:
 ---
-fail_compilation/fail9665a.d(65): Error: immutable field 'v' initialized multiple times
-fail_compilation/fail9665a.d(70): Error: immutable field 'v' initialized multiple times
-fail_compilation/fail9665a.d(75): Error: immutable field 'v' initialized multiple times
+fail_compilation/fail9665a.d(65): Error: immutable field `v` initialized multiple times
+fail_compilation/fail9665a.d(70): Error: immutable field `v` initialized multiple times
+fail_compilation/fail9665a.d(75): Error: immutable field `v` initialized multiple times
 ---
 +/
 struct S1C
@@ -82,11 +82,11 @@ struct S1C
 /+
 TEST_OUTPUT:
 ---
-fail_compilation/fail9665a.d(98): Error: immutable field 'v' initialization is not allowed in loops or after labels
-fail_compilation/fail9665a.d(103): Error: immutable field 'v' initialization is not allowed in loops or after labels
-fail_compilation/fail9665a.d(108): Error: immutable field 'v' initialized multiple times
-fail_compilation/fail9665a.d(113): Error: immutable field 'v' initialized multiple times
-fail_compilation/fail9665a.d(118): Error: immutable field 'v' initialized multiple times
+fail_compilation/fail9665a.d(98): Error: immutable field `v` initialization is not allowed in loops or after labels
+fail_compilation/fail9665a.d(103): Error: immutable field `v` initialization is not allowed in loops or after labels
+fail_compilation/fail9665a.d(108): Error: immutable field `v` initialized multiple times
+fail_compilation/fail9665a.d(113): Error: immutable field `v` initialized multiple times
+fail_compilation/fail9665a.d(118): Error: immutable field `v` initialized multiple times
 ---
 +/
 struct S2
@@ -125,8 +125,8 @@ struct S2
 /+
 TEST_OUTPUT:
 ---
-fail_compilation/fail9665a.d(139): Error: immutable field 'v' initialized multiple times
-fail_compilation/fail9665a.d(143): Error: immutable field 'w' initialized multiple times
+fail_compilation/fail9665a.d(139): Error: immutable field `v` initialized multiple times
+fail_compilation/fail9665a.d(143): Error: immutable field `w` initialized multiple times
 ---
 +/
 struct S3
diff --git a/test/fail_compilation/ice14096.d b/test/fail_compilation/ice14096.d
index 654cfcc798..1df093f253 100644
--- a/test/fail_compilation/ice14096.d
+++ b/test/fail_compilation/ice14096.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice14096.d(29): Error: cannot access frame pointer of ice14096.main.Baz!((i) => i).Baz
+fail_compilation/ice14096.d(29): Error: cannot access frame pointer of `ice14096.main.Baz!((i) => i).Baz`
 fail_compilation/ice14096.d(23): Error: template instance ice14096.foo!(Tuple!(Baz!((i) => i))).foo.bar!(t) error instantiating
 fail_compilation/ice14096.d(40):        instantiated from here: foo!(Tuple!(Baz!((i) => i)))
 ---