diff --git a/jsonata.js b/jsonata.js
index 00f2a0a7..86673fc5 100644
--- a/jsonata.js
+++ b/jsonata.js
@@ -3980,8 +3980,8 @@ var jsonata = (function() {
         "S0102": "Number out of range: {{token}}",
         "S0103": "Unsupported escape sequence: \\{{token}}",
         "S0104": "The escape sequence \\u must be followed by 4 hex digits",
-        "S0203": "Expected '{{value}}' before end of expression",
-        "S0202": "Expected '{{value}}', got '{{token}}'",
+        "S0203": "Expected {{value}} before end of expression",
+        "S0202": "Expected {{value}}, got {{token}}",
         "S0204": "Unknown operator: {{token}}",
         "S0205": "Unexpected token: {{token}}",
         "S0208": "Parameter {{value}} of function definition must be a variable name (start with $)",
@@ -3994,9 +3994,9 @@ var jsonata = (function() {
         "S0302": "No terminating / in regular expression",
         "S0402": "Choice groups containing parameterized types are not supported",
         "S0401": "Type parameters can only be applied to functions and arrays",
-        "T0410": "Argument {{index}} of function '{{token}}' does not match function signature",
-        "T0411": "Context value is not a compatible type with argument {{index}} of function '{{token}}'",
-        "T0412": "Argument {{index}} of function '{{token}}' must be an array of {{type}}",
+        "T0410": "Argument {{index}} of function {{token}} does not match function signature",
+        "T0411": "Context value is not a compatible type with argument {{index}} of function {{token}}",
+        "T0412": "Argument {{index}} of function {{token}} must be an array of {{type}}",
         "D1001": "Number out of range: {{value}}",
         "D1002": "Cannot negate a non-numeric value: {{value}}",
         "T2001": "The left side of the {{token}} operator must evaluate to a number",
@@ -4011,9 +4011,9 @@ var jsonata = (function() {
         "T2008": "The expressions within an order-by clause must evaluate to numeric or string values",
         "T2009": "The values {{value}} and {{value2}} either side of operator {{token}} must be of the same data type",
         "T2010": "The expressions either side of operator {{token}} must evaluate to numeric or string values",
-        "T1005": "Attempted to invoke a non-function. Did you mean '${{token}}'?",
+        "T1005": "Attempted to invoke a non-function. Did you mean ${{token}}?",
         "T1006": "Attempted to invoke a non-function",
-        "T1007": "Attempted to partially apply a non-function. Did you mean '${{token}}'?",
+        "T1007": "Attempted to partially apply a non-function. Did you mean ${{token}}?",
         "T1008": "Attempted to partially apply a non-function",
         "D3001": "Attempting to invoke string function on Infinity or NaN",
         "D3010": "Second argument of replace function cannot be an empty string",