diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 48d5dc1a149..d0c51eb05c9 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5404,8 +5404,8 @@ module ts {
             // will be bound to non-arrow function that contain this arrow function. This results in inconsistent behavior.
             // To avoid that we will give an error to users if they use arguments objects in arrow function so that they
             // can explicitly bound arguments objects
-            if (symbol === argumentsSymbol && getContainingFunction(node).kind === SyntaxKind.ArrowFunction) {
-                error(node, Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression);
+            if (symbol === argumentsSymbol && getContainingFunction(node).kind === SyntaxKind.ArrowFunction && languageVersion < ScriptTarget.ES6) {
+                error(node, Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression);
             }
 
             if (symbol.flags & SymbolFlags.Alias && !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveAlias(symbol))) {
diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts
index 570be357326..f3e9c325da6 100644
--- a/src/compiler/diagnosticInformationMap.generated.ts
+++ b/src/compiler/diagnosticInformationMap.generated.ts
@@ -1,5 +1,6 @@
 // <auto-generated />
 /// <reference path="types.ts" />
+/* @internal */
 module ts {
     export var Diagnostics = {
         Unterminated_string_literal: { code: 1002, category: DiagnosticCategory.Error, key: "Unterminated string literal." },
@@ -357,7 +358,7 @@ module ts {
         Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2: { code: 2493, category: DiagnosticCategory.Error, key: "Tuple type '{0}' with length '{1}' cannot be assigned to tuple with length '{2}'." },
         Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher: { code: 2494, category: DiagnosticCategory.Error, key: "Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher." },
         Type_0_is_not_an_array_type_or_a_string_type: { code: 2495, category: DiagnosticCategory.Error, key: "Type '{0}' is not an array type or a string type." },
-        The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression: { code: 2496, category: DiagnosticCategory.Error, key: "The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression." },
+        The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression: { code: 2496, category: DiagnosticCategory.Error, key: "The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression." },
         External_module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct: { code: 2497, category: DiagnosticCategory.Error, key: "External module '{0}' resolves to a non-module entity and cannot be imported using this construct." },
         External_module_0_uses_export_and_cannot_be_used_with_export_Asterisk: { code: 2498, category: DiagnosticCategory.Error, key: "External module '{0}' uses 'export =' and cannot be used with 'export *'." },
         An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2499, category: DiagnosticCategory.Error, key: "An interface can only extend an identifier/qualified-name with optional type arguments." },
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 258f98357b7..61ce23c316b 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1419,7 +1419,7 @@
         "category": "Error",
         "code": 2495
     },
-    "The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.": {
+    "The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.": {
         "category": "Error",
         "code": 2496
     },
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01.errors.txt
index ddae6bca8a4..1137835c2c2 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01.errors.txt
@@ -1,21 +1,21 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01.ts(2,15): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01.ts(7,19): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01.ts(13,13): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01.ts(19,15): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01.ts(2,15): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
+tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01.ts(7,19): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
+tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01.ts(13,13): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
+tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01.ts(19,15): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
 
 
 ==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01.ts (4 errors) ====
     var a = () => {
         var arg = arguments[0];  // error
                   ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
     }
     
     var b = function () {
         var a = () => {
             var arg = arguments[0];  // error
                       ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
         }
     }
     
@@ -23,7 +23,7 @@ tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01.
     	() => {
     		var arg = arguments[0];
     		          ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
     	}
     }
     
@@ -31,7 +31,7 @@ tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01.
     foo(() => {
         var arg = arguments[0];  // error
                   ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
     });
     
     function bar() {
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01_ES6.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01_ES6.errors.txt
deleted file mode 100644
index 3eb07e965ba..00000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01_ES6.errors.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01_ES6.ts(2,15): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01_ES6.ts(7,19): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01_ES6.ts(13,13): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01_ES6.ts(19,15): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-
-
-==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01_ES6.ts (4 errors) ====
-    var a = () => {
-        var arg = arguments[0];  // error
-                  ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-    }
-    
-    var b = function () {
-        var a = () => {
-            var arg = arguments[0];  // error
-                      ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-        }
-    }
-    
-    function baz() {
-    	() => {
-    		var arg = arguments[0];
-    		          ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-    	}
-    }
-    
-    function foo(inputFunc: () => void) { }
-    foo(() => {
-        var arg = arguments[0];  // error
-                  ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-    });
-    
-    function bar() {
-        var arg = arguments[0];  // no error
-    }
-    
-    
-    () => {
-    	function foo() {
-    		var arg = arguments[0];  // no error
-    	}
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01_ES6.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01_ES6.types
new file mode 100644
index 00000000000..669bf411e63
--- /dev/null
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01_ES6.types
@@ -0,0 +1,83 @@
+=== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01_ES6.ts ===
+var a = () => {
+>a : () => void
+>() => {    var arg = arguments[0];  // error} : () => void
+
+    var arg = arguments[0];  // error
+>arg : any
+>arguments[0] : any
+>arguments : IArguments
+>0 : number
+}
+
+var b = function () {
+>b : () => void
+>function () {    var a = () => {        var arg = arguments[0];  // error    }} : () => void
+
+    var a = () => {
+>a : () => void
+>() => {        var arg = arguments[0];  // error    } : () => void
+
+        var arg = arguments[0];  // error
+>arg : any
+>arguments[0] : any
+>arguments : IArguments
+>0 : number
+    }
+}
+
+function baz() {
+>baz : () => void
+
+	() => {
+>() => {		var arg = arguments[0];	} : () => void
+
+		var arg = arguments[0];
+>arg : any
+>arguments[0] : any
+>arguments : IArguments
+>0 : number
+	}
+}
+
+function foo(inputFunc: () => void) { }
+>foo : (inputFunc: () => void) => void
+>inputFunc : () => void
+
+foo(() => {
+>foo(() => {    var arg = arguments[0];  // error}) : void
+>foo : (inputFunc: () => void) => void
+>() => {    var arg = arguments[0];  // error} : () => void
+
+    var arg = arguments[0];  // error
+>arg : any
+>arguments[0] : any
+>arguments : IArguments
+>0 : number
+
+});
+
+function bar() {
+>bar : () => void
+
+    var arg = arguments[0];  // no error
+>arg : any
+>arguments[0] : any
+>arguments : IArguments
+>0 : number
+}
+
+
+() => {
+>() => {	function foo() {		var arg = arguments[0];  // no error	}} : () => void
+
+	function foo() {
+>foo : () => void
+
+		var arg = arguments[0];  // no error
+>arg : any
+>arguments[0] : any
+>arguments : IArguments
+>0 : number
+	}
+}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02.errors.txt
index 47ffcccd216..55f0ce2230a 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments02.ts(2,15): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments02.ts(2,15): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
 
 
 ==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments02.ts (1 errors) ====
     
     var a = () => arguments;
                   ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
\ No newline at end of file
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02_ES6.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02_ES6.errors.txt
deleted file mode 100644
index 860700e0086..00000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02_ES6.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments02_ES6.ts(2,15): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-
-
-==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments02_ES6.ts (1 errors) ====
-    
-    var a = () => arguments;
-                  ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02_ES6.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02_ES6.types
new file mode 100644
index 00000000000..fe5ac353ce6
--- /dev/null
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02_ES6.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments02_ES6.ts ===
+
+var a = () => arguments;
+>a : () => IArguments
+>() => arguments : () => IArguments
+>arguments : IArguments
+
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03.errors.txt
index 153ea8003e0..d914e14d93a 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments03.ts(3,15): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments03.ts(3,15): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
 
 
 ==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments03.ts (1 errors) ====
@@ -6,4 +6,4 @@ tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments03.
     var arguments;
     var a = () => arguments;
                   ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
\ No newline at end of file
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03_ES6.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03_ES6.errors.txt
deleted file mode 100644
index 60b752bc569..00000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments03_ES6.ts(3,15): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-
-
-==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments03_ES6.ts (1 errors) ====
-    
-    var arguments;
-    var a = () => arguments;
-                  ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03_ES6.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03_ES6.types
new file mode 100644
index 00000000000..33a45a39af1
--- /dev/null
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03_ES6.types
@@ -0,0 +1,10 @@
+=== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments03_ES6.ts ===
+
+var arguments;
+>arguments : any
+
+var a = () => arguments;
+>a : () => IArguments
+>() => arguments : () => IArguments
+>arguments : IArguments
+
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04.errors.txt
index 2c7a08d7479..12e416f893f 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments04.ts(4,19): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments04.ts(4,19): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
 
 
 ==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments04.ts (1 errors) ====
@@ -7,5 +7,5 @@ tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments04.
         var arguments;
         var a = () => arguments;
                       ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04_ES6.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04_ES6.errors.txt
deleted file mode 100644
index 8ff3b9bc16e..00000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04_ES6.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments04_ES6.ts(4,19): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-
-
-==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments04_ES6.ts (1 errors) ====
-    
-    function f() {
-        var arguments;
-        var a = () => arguments;
-                      ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04_ES6.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04_ES6.types
new file mode 100644
index 00000000000..495ca1582e6
--- /dev/null
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04_ES6.types
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments04_ES6.ts ===
+
+function f() {
+>f : () => void
+
+    var arguments;
+>arguments : any
+
+    var a = () => arguments;
+>a : () => IArguments
+>() => arguments : () => IArguments
+>arguments : IArguments
+}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05.errors.txt
index 8802a13e539..4256dab30c2 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments05.ts(3,19): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments05.ts(3,19): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
 
 
 ==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments05.ts (1 errors) ====
@@ -6,5 +6,5 @@ tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments05.
     function f(arguments) {
         var a = () => arguments;
                       ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05_ES6.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05_ES6.errors.txt
deleted file mode 100644
index bd13e0a36a7..00000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05_ES6.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments05_ES6.ts(3,19): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-
-
-==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments05_ES6.ts (1 errors) ====
-    
-    function f(arguments) {
-        var a = () => arguments;
-                      ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05_ES6.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05_ES6.types
new file mode 100644
index 00000000000..4e9da2f642b
--- /dev/null
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05_ES6.types
@@ -0,0 +1,11 @@
+=== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments05_ES6.ts ===
+
+function f(arguments) {
+>f : (arguments: any) => void
+>arguments : any
+
+    var a = () => arguments;
+>a : () => IArguments
+>() => arguments : () => IArguments
+>arguments : IArguments
+}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06.errors.txt
index 138f9486d19..5b078f22f44 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments06.ts(3,25): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments06.ts(3,25): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
 
 
 ==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments06.ts (1 errors) ====
@@ -6,5 +6,5 @@ tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments06.
     function f(arguments) {
         var a = () => () => arguments;
                             ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06_ES6.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06_ES6.errors.txt
deleted file mode 100644
index 08b9c64b49b..00000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06_ES6.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments06_ES6.ts(3,25): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-
-
-==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments06_ES6.ts (1 errors) ====
-    
-    function f(arguments) {
-        var a = () => () => arguments;
-                            ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06_ES6.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06_ES6.types
new file mode 100644
index 00000000000..82571174a1e
--- /dev/null
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06_ES6.types
@@ -0,0 +1,12 @@
+=== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments06_ES6.ts ===
+
+function f(arguments) {
+>f : (arguments: any) => void
+>arguments : any
+
+    var a = () => () => arguments;
+>a : () => () => IArguments
+>() => () => arguments : () => () => IArguments
+>() => arguments : () => IArguments
+>arguments : IArguments
+}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07.errors.txt
index a9c9638780e..da1f7dd28f9 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments07.ts(3,34): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments07.ts(3,34): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
 
 
 ==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments07.ts (1 errors) ====
@@ -6,5 +6,5 @@ tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments07.
     function f(arguments) {
         var a = (arguments) => () => arguments;
                                      ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07_ES6.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07_ES6.errors.txt
deleted file mode 100644
index 51cac68f529..00000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07_ES6.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments07_ES6.ts(3,34): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-
-
-==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments07_ES6.ts (1 errors) ====
-    
-    function f(arguments) {
-        var a = (arguments) => () => arguments;
-                                     ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07_ES6.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07_ES6.types
new file mode 100644
index 00000000000..967631cc57b
--- /dev/null
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07_ES6.types
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments07_ES6.ts ===
+
+function f(arguments) {
+>f : (arguments: any) => void
+>arguments : any
+
+    var a = (arguments) => () => arguments;
+>a : (arguments: any) => () => IArguments
+>(arguments) => () => arguments : (arguments: any) => () => IArguments
+>arguments : any
+>() => arguments : () => IArguments
+>arguments : IArguments
+}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments08.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments08.symbols
new file mode 100644
index 00000000000..80f7f507978
--- /dev/null
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments08.symbols
@@ -0,0 +1,11 @@
+=== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments08.ts ===
+
+function f(arguments) {
+>f : Symbol(f, Decl(emitArrowFunctionWhenUsingArguments08.ts, 0, 0))
+>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments08.ts, 1, 11))
+
+    var a = () => (arguments) => arguments;
+>a : Symbol(a, Decl(emitArrowFunctionWhenUsingArguments08.ts, 2, 7))
+>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments08.ts, 2, 19))
+>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments08.ts, 2, 19))
+}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments08_ES6.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments08_ES6.symbols
new file mode 100644
index 00000000000..bfbb055cc32
--- /dev/null
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments08_ES6.symbols
@@ -0,0 +1,11 @@
+=== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments08_ES6.ts ===
+
+function f(arguments) {
+>f : Symbol(f, Decl(emitArrowFunctionWhenUsingArguments08_ES6.ts, 0, 0))
+>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments08_ES6.ts, 1, 11))
+
+    var a = () => (arguments) => arguments;
+>a : Symbol(a, Decl(emitArrowFunctionWhenUsingArguments08_ES6.ts, 2, 7))
+>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments08_ES6.ts, 2, 19))
+>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments08_ES6.ts, 2, 19))
+}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments09.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments09.errors.txt
index c5908cac978..72239150cf3 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments09.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments09.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments09.ts(3,25): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments09.ts(3,25): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
 
 
 ==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments09.ts (1 errors) ====
@@ -6,5 +6,5 @@ tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments09.
     function f(_arguments) {
         var a = () => () => arguments;
                             ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments09_ES6.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments09_ES6.errors.txt
deleted file mode 100644
index 20f316a0a4c..00000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments09_ES6.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments09_ES6.ts(3,25): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-
-
-==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments09_ES6.ts (1 errors) ====
-    
-    function f(_arguments) {
-        var a = () => () => arguments;
-                            ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments09_ES6.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments09_ES6.types
new file mode 100644
index 00000000000..77f44eebfca
--- /dev/null
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments09_ES6.types
@@ -0,0 +1,12 @@
+=== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments09_ES6.ts ===
+
+function f(_arguments) {
+>f : (_arguments: any) => void
+>_arguments : any
+
+    var a = () => () => arguments;
+>a : () => () => IArguments
+>() => () => arguments : () => () => IArguments
+>() => arguments : () => IArguments
+>arguments : IArguments
+}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments10.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments10.errors.txt
index 4267d0d923f..254ad2cbc4d 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments10.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments10.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments10.ts(4,25): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments10.ts(4,25): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
 
 
 ==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments10.ts (1 errors) ====
@@ -7,5 +7,5 @@ tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments10.
         var _arguments = 10;
         var a = () => () => arguments;
                             ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments10_ES6.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments10_ES6.errors.txt
deleted file mode 100644
index 348e1088643..00000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments10_ES6.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments10_ES6.ts(4,25): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-
-
-==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments10_ES6.ts (1 errors) ====
-    
-    function f() {
-        var _arguments = 10;
-        var a = () => () => arguments;
-                            ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments10_ES6.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments10_ES6.types
new file mode 100644
index 00000000000..dd567d3bdca
--- /dev/null
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments10_ES6.types
@@ -0,0 +1,15 @@
+=== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments10_ES6.ts ===
+
+function f() {
+>f : () => void
+
+    var _arguments = 10;
+>_arguments : number
+>10 : number
+
+    var a = () => () => arguments;
+>a : () => () => IArguments
+>() => () => arguments : () => () => IArguments
+>() => arguments : () => IArguments
+>arguments : IArguments
+}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11.errors.txt
index 3b63ccd44a2..0606a7784b3 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments11.ts(4,25): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments11.ts(4,25): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
 
 
 ==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments11.ts (1 errors) ====
@@ -7,5 +7,5 @@ tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments11.
         var _arguments = 10;
         var a = () => () => arguments;
                             ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11_ES6.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11_ES6.errors.txt
deleted file mode 100644
index 1dbeff0c45e..00000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11_ES6.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments11_ES6.ts(4,25): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-
-
-==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments11_ES6.ts (1 errors) ====
-    
-    function f(arguments) {
-        var _arguments = 10;
-        var a = () => () => arguments;
-                            ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11_ES6.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11_ES6.types
new file mode 100644
index 00000000000..b977a77010c
--- /dev/null
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11_ES6.types
@@ -0,0 +1,16 @@
+=== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments11_ES6.ts ===
+
+function f(arguments) {
+>f : (arguments: any) => void
+>arguments : any
+
+    var _arguments = 10;
+>_arguments : number
+>10 : number
+
+    var a = () => () => arguments;
+>a : () => () => IArguments
+>() => () => arguments : () => () => IArguments
+>() => arguments : () => IArguments
+>arguments : IArguments
+}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.errors.txt
index f641faebcca..4b2dd76a5d0 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments12.ts(3,7): error TS1210: Invalid use of 'arguments'. Class definitions are automatically in strict mode.
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments12.ts(4,23): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments12.ts(4,23): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
 
 
 ==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments12.ts (2 errors) ====
@@ -10,6 +10,6 @@ tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments12.
 !!! error TS1210: Invalid use of 'arguments'. Class definitions are automatically in strict mode.
             var a = () => arguments;
                           ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12_ES6.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12_ES6.errors.txt
index bcc926d83eb..8a3018ceb9c 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12_ES6.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12_ES6.errors.txt
@@ -1,15 +1,12 @@
 tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments12_ES6.ts(3,7): error TS1210: Invalid use of 'arguments'. Class definitions are automatically in strict mode.
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments12_ES6.ts(4,23): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
 
 
-==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments12_ES6.ts (2 errors) ====
+==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments12_ES6.ts (1 errors) ====
     
     class C {
         f(arguments) {
           ~~~~~~~~~
 !!! error TS1210: Invalid use of 'arguments'. Class definitions are automatically in strict mode.
             var a = () => arguments;
-                          ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments13.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments13.symbols
new file mode 100644
index 00000000000..b46d8ab1a63
--- /dev/null
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments13.symbols
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments13.ts ===
+
+function f() {
+>f : Symbol(f, Decl(emitArrowFunctionWhenUsingArguments13.ts, 0, 0))
+
+    var _arguments = 10;
+>_arguments : Symbol(_arguments, Decl(emitArrowFunctionWhenUsingArguments13.ts, 2, 7))
+
+    var a = (arguments) => () => _arguments;
+>a : Symbol(a, Decl(emitArrowFunctionWhenUsingArguments13.ts, 3, 7))
+>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments13.ts, 3, 13))
+>_arguments : Symbol(_arguments, Decl(emitArrowFunctionWhenUsingArguments13.ts, 2, 7))
+}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments13_ES6.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments13_ES6.symbols
new file mode 100644
index 00000000000..5c4ec4cb687
--- /dev/null
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments13_ES6.symbols
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments13_ES6.ts ===
+
+function f() {
+>f : Symbol(f, Decl(emitArrowFunctionWhenUsingArguments13_ES6.ts, 0, 0))
+
+    var _arguments = 10;
+>_arguments : Symbol(_arguments, Decl(emitArrowFunctionWhenUsingArguments13_ES6.ts, 2, 7))
+
+    var a = (arguments) => () => _arguments;
+>a : Symbol(a, Decl(emitArrowFunctionWhenUsingArguments13_ES6.ts, 3, 7))
+>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments13_ES6.ts, 3, 13))
+>_arguments : Symbol(_arguments, Decl(emitArrowFunctionWhenUsingArguments13_ES6.ts, 2, 7))
+}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14.errors.txt
index ceb03631830..8e38cb9d4d3 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments14.ts(5,22): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments14.ts(5,22): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
 
 
 ==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments14.ts (1 errors) ====
@@ -8,6 +8,6 @@ tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments14.
             const arguments = 100;
             return () => arguments;
                          ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14_ES6.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14_ES6.errors.txt
deleted file mode 100644
index d71a2518c07..00000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14_ES6.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments14_ES6.ts(5,22): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-
-
-==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments14_ES6.ts (1 errors) ====
-    
-    function f() {
-        if (Math.random()) {
-            let arguments = 100;
-            return () => arguments;
-                         ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14_ES6.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14_ES6.types
new file mode 100644
index 00000000000..29989ea0f9c
--- /dev/null
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14_ES6.types
@@ -0,0 +1,20 @@
+=== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments14_ES6.ts ===
+
+function f() {
+>f : () => () => IArguments
+
+    if (Math.random()) {
+>Math.random() : number
+>Math.random : () => number
+>Math : Math
+>random : () => number
+
+        let arguments = 100;
+>arguments : number
+>100 : number
+
+        return () => arguments;
+>() => arguments : () => IArguments
+>arguments : IArguments
+    }
+}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15.errors.txt
index af684202b2f..02fb22861c5 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments15.ts(6,22): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments15.ts(6,22): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
 
 
 ==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments15.ts (1 errors) ====
@@ -9,6 +9,6 @@ tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments15.
             const arguments = 100;
             return () => arguments;
                          ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15_ES6.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15_ES6.errors.txt
deleted file mode 100644
index d26b919c16d..00000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15_ES6.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments15_ES6.ts(6,22): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-
-
-==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments15_ES6.ts (1 errors) ====
-    
-    function f() {
-        var arguments = "hello";
-        if (Math.random()) {
-            const arguments = 100;
-            return () => arguments;
-                         ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15_ES6.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15_ES6.types
new file mode 100644
index 00000000000..0bb34b22eef
--- /dev/null
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15_ES6.types
@@ -0,0 +1,24 @@
+=== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments15_ES6.ts ===
+
+function f() {
+>f : () => () => IArguments
+
+    var arguments = "hello";
+>arguments : string
+>"hello" : string
+
+    if (Math.random()) {
+>Math.random() : number
+>Math.random : () => number
+>Math : Math
+>random : () => number
+
+        const arguments = 100;
+>arguments : number
+>100 : number
+
+        return () => arguments;
+>() => arguments : () => IArguments
+>arguments : IArguments
+    }
+}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16.errors.txt
index 39ce66e2ce5..4480e0f570a 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments16.ts(5,22): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments16.ts(5,22): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
 
 
 ==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments16.ts (1 errors) ====
@@ -8,7 +8,7 @@ tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments16.
         if (Math.random()) {
             return () => arguments[0];
                          ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
         }
         var arguments = "world";
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16_ES6.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16_ES6.errors.txt
deleted file mode 100644
index f3beb7f21b7..00000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16_ES6.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments16_ES6.ts(5,22): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-
-
-==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments16_ES6.ts (1 errors) ====
-    
-    function f() {
-        var arguments = "hello";
-        if (Math.random()) {
-            return () => arguments[0];
-                         ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-        }
-        var arguments = "world";
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16_ES6.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16_ES6.types
new file mode 100644
index 00000000000..41c6b87fb42
--- /dev/null
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16_ES6.types
@@ -0,0 +1,25 @@
+=== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments16_ES6.ts ===
+
+function f() {
+>f : () => () => any
+
+    var arguments = "hello";
+>arguments : string
+>"hello" : string
+
+    if (Math.random()) {
+>Math.random() : number
+>Math.random : () => number
+>Math : Math
+>random : () => number
+
+        return () => arguments[0];
+>() => arguments[0] : () => any
+>arguments[0] : any
+>arguments : IArguments
+>0 : number
+    }
+    var arguments = "world";
+>arguments : string
+>"world" : string
+}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17.errors.txt
index 3d53f02a286..a54d52e3475 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments17.ts(5,22): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments17.ts(5,22): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
 
 
 ==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments17.ts (1 errors) ====
@@ -8,7 +8,7 @@ tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments17.
         if (Math.random()) {
             return () => arguments[0];
                          ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
         }
         var arguments = "world";
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17_ES6.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17_ES6.errors.txt
deleted file mode 100644
index 2082323f158..00000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17_ES6.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments17_ES6.ts(5,22): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-
-
-==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments17_ES6.ts (1 errors) ====
-    
-    function f() {
-        var { arguments } = { arguments: "hello" };
-        if (Math.random()) {
-            return () => arguments[0];
-                         ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-        }
-        var arguments = "world";
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17_ES6.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17_ES6.types
new file mode 100644
index 00000000000..f62a2dce84c
--- /dev/null
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17_ES6.types
@@ -0,0 +1,27 @@
+=== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments17_ES6.ts ===
+
+function f() {
+>f : () => () => any
+
+    var { arguments } = { arguments: "hello" };
+>arguments : string
+>{ arguments: "hello" } : { arguments: string; }
+>arguments : string
+>"hello" : string
+
+    if (Math.random()) {
+>Math.random() : number
+>Math.random : () => number
+>Math : Math
+>random : () => number
+
+        return () => arguments[0];
+>() => arguments[0] : () => any
+>arguments[0] : any
+>arguments : IArguments
+>0 : number
+    }
+    var arguments = "world";
+>arguments : string
+>"world" : string
+}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18.errors.txt
index 4827559f277..2595b22801f 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments18.ts(5,22): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments18.ts(5,22): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
 
 
 ==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments18.ts (1 errors) ====
@@ -8,6 +8,6 @@ tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments18.
         if (Math.random()) {
             return () => arguments;
                          ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18_ES6.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18_ES6.errors.txt
deleted file mode 100644
index b73e4399587..00000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18_ES6.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments18_ES6.ts(5,22): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-
-
-==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments18_ES6.ts (1 errors) ====
-    
-    function f() {
-        var { arguments: args } = { arguments };
-        if (Math.random()) {
-            return () => arguments;
-                         ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18_ES6.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18_ES6.types
new file mode 100644
index 00000000000..f2fe76e8926
--- /dev/null
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18_ES6.types
@@ -0,0 +1,22 @@
+=== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments18_ES6.ts ===
+
+function f() {
+>f : () => () => IArguments
+
+    var { arguments: args } = { arguments };
+>arguments : any
+>args : IArguments
+>{ arguments } : { arguments: IArguments; }
+>arguments : IArguments
+
+    if (Math.random()) {
+>Math.random() : number
+>Math.random : () => number
+>Math : Math
+>random : () => number
+
+        return () => arguments;
+>() => arguments : () => IArguments
+>arguments : IArguments
+    }
+}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments19.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments19.errors.txt
index 887cc4713c9..e6496443e7e 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments19.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments19.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments19.ts(6,33): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments19.ts(6,33): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
 
 
 ==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments19.ts (1 errors) ====
@@ -9,7 +9,7 @@ tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments19.
             function h() {
                 var capture = () => arguments;  // Should trigger an '_arguments' capture into function 'h'
                                     ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
+!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.
                 foo(_arguments);                // Error as this does not resolve to the user defined '_arguments'
             }
         }
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments19_ES6.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments19_ES6.errors.txt
deleted file mode 100644
index 1750cf065bb..00000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments19_ES6.errors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments19_ES6.ts(6,33): error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-
-
-==== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments19_ES6.ts (1 errors) ====
-    
-    function f() {
-        function g() {
-            var _arguments = 10;                // No capture in 'g', so no conflict.
-            function h() {
-                var capture = () => arguments;  // Should trigger an '_arguments' capture into function 'h'
-                                    ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.
-                foo(_arguments);                // Error as this does not resolve to the user defined '_arguments'
-            }
-        }
-    
-        function foo(x: any) {
-            return 100;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments19_ES6.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments19_ES6.types
new file mode 100644
index 00000000000..a672389720a
--- /dev/null
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments19_ES6.types
@@ -0,0 +1,35 @@
+=== tests/cases/conformance/es6/arrowFunction/emitArrowFunctionWhenUsingArguments19_ES6.ts ===
+
+function f() {
+>f : () => void
+
+    function g() {
+>g : () => void
+
+        var _arguments = 10;                // No capture in 'g', so no conflict.
+>_arguments : number
+>10 : number
+
+        function h() {
+>h : () => void
+
+            var capture = () => arguments;  // Should trigger an '_arguments' capture into function 'h'
+>capture : () => IArguments
+>() => arguments : () => IArguments
+>arguments : IArguments
+
+            foo(_arguments);                // Error as this does not resolve to the user defined '_arguments'
+>foo(_arguments) : number
+>foo : (x: any) => number
+>_arguments : number
+        }
+    }
+
+    function foo(x: any) {
+>foo : (x: any) => number
+>x : any
+
+        return 100;
+>100 : number
+    }
+}