diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 0edb44dc26a..95f9955733b 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -1487,8 +1487,8 @@ module ts {
             if (isIdentifier) {
                 let node = <Identifier>createNode(SyntaxKind.Identifier);
 
-                // Set strictModeKind property so that we can report appropriate error later in type checker
-                if (inStrictModeContext() && (token > SyntaxKind.Identifier && token <= SyntaxKind.LastFutureReservedWord)) {
+                // Store original token kind so we can report appropriate error later in type checker
+                if (token >= SyntaxKind.FirstReservedWord && token <= SyntaxKind.LastFutureReservedWord) {
                     node.isKeywordInStrictMode = token;
                 }
                 node.text = internIdentifier(scanner.getTokenValue());
@@ -4640,6 +4640,7 @@ module ts {
                     case SyntaxKind.ColonToken:         // Type Annotation for declaration
                     case SyntaxKind.EqualsToken:        // Initializer for declaration
                     case SyntaxKind.QuestionToken:      // Not valid, but permitted so that it gets caught later on.
+                    case SyntaxKind.AtToken:
                         return true;
                     default:
                         // Covers
diff --git a/tests/baselines/reference/decoratorOnClassAccessor3.errors.txt b/tests/baselines/reference/decoratorOnClassAccessor3.errors.txt
index b75b7e0d8b6..98b96b9b1c4 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor3.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassAccessor3.errors.txt
@@ -1,35 +1,11 @@
-tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts(4,5): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
-tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts(4,5): error TS2304: Cannot find name 'public'.
 tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts(4,12): error TS1005: ';' expected.
-tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts(4,16): error TS1146: Declaration expected.
-tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts(4,17): error TS2304: Cannot find name 'get'.
-tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts(4,21): error TS1005: ';' expected.
-tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts(4,21): error TS2304: Cannot find name 'accessor'.
-tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts(4,32): error TS1005: ';' expected.
-tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts(5,1): error TS1128: Declaration or statement expected.
 
 
-==== tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts (9 errors) ====
+==== tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts (1 errors) ====
     declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
     
     class C {
         public @dec get accessor() { return 1; }
-        ~~~~~~
-!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
-        ~~~~~~
-!!! error TS2304: Cannot find name 'public'.
                ~
 !!! error TS1005: ';' expected.
-                   
-!!! error TS1146: Declaration expected.
-                    ~~~
-!!! error TS2304: Cannot find name 'get'.
-                        ~~~~~~~~
-!!! error TS1005: ';' expected.
-                        ~~~~~~~~
-!!! error TS2304: Cannot find name 'accessor'.
-                                   ~
-!!! error TS1005: ';' expected.
-    }
-    ~
-!!! error TS1128: Declaration or statement expected.
\ No newline at end of file
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassAccessor3.js b/tests/baselines/reference/decoratorOnClassAccessor3.js
index f48a755953f..23e689f3114 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor3.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor3.js
@@ -6,14 +6,24 @@ class C {
 }
 
 //// [decoratorOnClassAccessor3.js]
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key, desc) {
+    switch (arguments.length) {
+        case 2: return decorators.reduceRight(function(o, d) { return (d && d(o)) || o; }, target);
+        case 3: return decorators.reduceRight(function(o, d) { return (d && d(target, key)), void 0; }, void 0);
+        case 4: return decorators.reduceRight(function(o, d) { return (d && d(target, key, o)) || o; }, desc);
+    }
+};
 var C = (function () {
     function C() {
     }
+    Object.defineProperty(C.prototype, "accessor", {
+        get: function () { return 1; },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, "accessor",
+        __decorate([
+            dec
+        ], C.prototype, "accessor", Object.getOwnPropertyDescriptor(C.prototype, "accessor")));
     return C;
 })();
-public;
-get;
-accessor();
-{
-    return 1;
-}
diff --git a/tests/baselines/reference/decoratorOnClassAccessor6.errors.txt b/tests/baselines/reference/decoratorOnClassAccessor6.errors.txt
index ec22ae0b3e1..e430b4cf1ee 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor6.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassAccessor6.errors.txt
@@ -1,44 +1,11 @@
-tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,5): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
-tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,5): error TS2304: Cannot find name 'public'.
 tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,12): error TS1005: ';' expected.
-tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,16): error TS1146: Declaration expected.
-tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,17): error TS2304: Cannot find name 'set'.
-tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,21): error TS1005: ';' expected.
-tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,21): error TS2304: Cannot find name 'accessor'.
-tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,30): error TS2304: Cannot find name 'value'.
-tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,35): error TS1005: ',' expected.
-tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,37): error TS2304: Cannot find name 'number'.
-tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,45): error TS1005: ';' expected.
-tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(5,1): error TS1128: Declaration or statement expected.
 
 
-==== tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts (12 errors) ====
+==== tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts (1 errors) ====
     declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
     
     class C {
         public @dec set accessor(value: number) { }
-        ~~~~~~
-!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
-        ~~~~~~
-!!! error TS2304: Cannot find name 'public'.
                ~
 !!! error TS1005: ';' expected.
-                   
-!!! error TS1146: Declaration expected.
-                    ~~~
-!!! error TS2304: Cannot find name 'set'.
-                        ~~~~~~~~
-!!! error TS1005: ';' expected.
-                        ~~~~~~~~
-!!! error TS2304: Cannot find name 'accessor'.
-                                 ~~~~~
-!!! error TS2304: Cannot find name 'value'.
-                                      ~
-!!! error TS1005: ',' expected.
-                                        ~~~~~~
-!!! error TS2304: Cannot find name 'number'.
-                                                ~
-!!! error TS1005: ';' expected.
-    }
-    ~
-!!! error TS1128: Declaration or statement expected.
\ No newline at end of file
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassAccessor6.js b/tests/baselines/reference/decoratorOnClassAccessor6.js
index 771d937634f..465e13ebb1d 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor6.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor6.js
@@ -6,12 +6,24 @@ class C {
 }
 
 //// [decoratorOnClassAccessor6.js]
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key, desc) {
+    switch (arguments.length) {
+        case 2: return decorators.reduceRight(function(o, d) { return (d && d(o)) || o; }, target);
+        case 3: return decorators.reduceRight(function(o, d) { return (d && d(target, key)), void 0; }, void 0);
+        case 4: return decorators.reduceRight(function(o, d) { return (d && d(target, key, o)) || o; }, desc);
+    }
+};
 var C = (function () {
     function C() {
     }
+    Object.defineProperty(C.prototype, "accessor", {
+        set: function (value) { },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, "accessor",
+        __decorate([
+            dec
+        ], C.prototype, "accessor", Object.getOwnPropertyDescriptor(C.prototype, "accessor")));
     return C;
 })();
-public;
-set;
-accessor(value, number);
-{ }
diff --git a/tests/baselines/reference/decoratorOnClassMethod3.errors.txt b/tests/baselines/reference/decoratorOnClassMethod3.errors.txt
index b2173dedf9e..4881502a02e 100644
--- a/tests/baselines/reference/decoratorOnClassMethod3.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassMethod3.errors.txt
@@ -1,29 +1,11 @@
-tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts(4,5): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
-tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts(4,5): error TS2304: Cannot find name 'public'.
 tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts(4,12): error TS1005: ';' expected.
-tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts(4,16): error TS1146: Declaration expected.
-tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts(4,17): error TS2304: Cannot find name 'method'.
-tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts(4,26): error TS1005: ';' expected.
-tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts(5,1): error TS1128: Declaration or statement expected.
 
 
-==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts (7 errors) ====
+==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts (1 errors) ====
     declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
     
     class C {
         public @dec method() {}
-        ~~~~~~
-!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
-        ~~~~~~
-!!! error TS2304: Cannot find name 'public'.
                ~
 !!! error TS1005: ';' expected.
-                   
-!!! error TS1146: Declaration expected.
-                    ~~~~~~
-!!! error TS2304: Cannot find name 'method'.
-                             ~
-!!! error TS1005: ';' expected.
-    }
-    ~
-!!! error TS1128: Declaration or statement expected.
\ No newline at end of file
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassMethod3.js b/tests/baselines/reference/decoratorOnClassMethod3.js
index 3ac97697e80..f93b7d7a6b2 100644
--- a/tests/baselines/reference/decoratorOnClassMethod3.js
+++ b/tests/baselines/reference/decoratorOnClassMethod3.js
@@ -6,11 +6,20 @@ class C {
 }
 
 //// [decoratorOnClassMethod3.js]
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key, desc) {
+    switch (arguments.length) {
+        case 2: return decorators.reduceRight(function(o, d) { return (d && d(o)) || o; }, target);
+        case 3: return decorators.reduceRight(function(o, d) { return (d && d(target, key)), void 0; }, void 0);
+        case 4: return decorators.reduceRight(function(o, d) { return (d && d(target, key, o)) || o; }, desc);
+    }
+};
 var C = (function () {
     function C() {
     }
+    C.prototype.method = function () { };
+    Object.defineProperty(C.prototype, "method",
+        __decorate([
+            dec
+        ], C.prototype, "method", Object.getOwnPropertyDescriptor(C.prototype, "method")));
     return C;
 })();
-public;
-method();
-{ }
diff --git a/tests/baselines/reference/decoratorOnClassProperty3.errors.txt b/tests/baselines/reference/decoratorOnClassProperty3.errors.txt
index 29438bd67a9..12d0efb78d7 100644
--- a/tests/baselines/reference/decoratorOnClassProperty3.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassProperty3.errors.txt
@@ -1,26 +1,11 @@
-tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts(4,5): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
-tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts(4,5): error TS2304: Cannot find name 'public'.
 tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts(4,12): error TS1005: ';' expected.
-tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts(4,16): error TS1146: Declaration expected.
-tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts(4,17): error TS2304: Cannot find name 'prop'.
-tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts(5,1): error TS1128: Declaration or statement expected.
 
 
-==== tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts (6 errors) ====
+==== tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts (1 errors) ====
     declare function dec(target: any, propertyKey: string): void;
     
     class C {
         public @dec prop;
-        ~~~~~~
-!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
-        ~~~~~~
-!!! error TS2304: Cannot find name 'public'.
                ~
 !!! error TS1005: ';' expected.
-                   
-!!! error TS1146: Declaration expected.
-                    ~~~~
-!!! error TS2304: Cannot find name 'prop'.
-    }
-    ~
-!!! error TS1128: Declaration or statement expected.
\ No newline at end of file
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassProperty3.js b/tests/baselines/reference/decoratorOnClassProperty3.js
index 6c9945677ca..05476c66e7d 100644
--- a/tests/baselines/reference/decoratorOnClassProperty3.js
+++ b/tests/baselines/reference/decoratorOnClassProperty3.js
@@ -6,10 +6,18 @@ class C {
 }
 
 //// [decoratorOnClassProperty3.js]
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key, desc) {
+    switch (arguments.length) {
+        case 2: return decorators.reduceRight(function(o, d) { return (d && d(o)) || o; }, target);
+        case 3: return decorators.reduceRight(function(o, d) { return (d && d(target, key)), void 0; }, void 0);
+        case 4: return decorators.reduceRight(function(o, d) { return (d && d(target, key, o)) || o; }, desc);
+    }
+};
 var C = (function () {
     function C() {
     }
+    __decorate([
+        dec
+    ], C.prototype, "prop");
     return C;
 })();
-public;
-prop;