diff --git a/tools/spec_parser/Dart.g b/tools/spec_parser/Dart.g
index fe4af2f3b5d..3ced048fa2a 100644
--- a/tools/spec_parser/Dart.g
+++ b/tools/spec_parser/Dart.g
@@ -291,10 +291,10 @@ topLevelDefinition
     |    extensionDeclaration
     |    enumType
     |    typeAlias
-    |    EXTERNAL functionSignature ';'
-    |    EXTERNAL getterSignature ';'
-    |    EXTERNAL setterSignature ';'
-    |    EXTERNAL finalVarOrType identifierList ';'
+    |    AUGMENT? EXTERNAL functionSignature ';'
+    |    AUGMENT? EXTERNAL getterSignature ';'
+    |    AUGMENT? EXTERNAL setterSignature ';'
+    |    AUGMENT? EXTERNAL finalVarOrType identifierList ';'
     |    AUGMENT? getterSignature (functionBody | ';')
     |    AUGMENT? setterSignature (functionBody | ';')
     |    AUGMENT? functionSignature (functionBody | ';')
@@ -449,7 +449,7 @@ interfaces
 
 classMemberDeclaration
     :    AUGMENT? methodSignature functionBody
-    |    declaration ';'
+    |    AUGMENT? declaration ';'
     ;
 
 mixinApplicationClass
@@ -519,15 +519,15 @@ declaration
     |    EXTERNAL (STATIC? finalVarOrType | COVARIANT varOrType) identifierList
     |    EXTERNAL? operatorSignature
     |    ABSTRACT (finalVarOrType | COVARIANT varOrType) identifierList
-    |    AUGMENT? STATIC (FINAL | CONST) type? initializedIdentifierList
-    |    AUGMENT? STATIC LATE FINAL type? initializedIdentifierList
-    |    AUGMENT? STATIC LATE? varOrType initializedIdentifierList
-    |    AUGMENT? COVARIANT LATE FINAL type? identifierList
-    |    AUGMENT? COVARIANT LATE? varOrType initializedIdentifierList
-    |    AUGMENT? LATE? (FINAL type? | varOrType) initializedIdentifierList
-    |    AUGMENT? redirectingFactoryConstructorSignature
-    |    AUGMENT? constantConstructorSignature (redirection | initializers)?
-    |    AUGMENT? constructorSignature (redirection | initializers)?
+    |    STATIC (FINAL | CONST) type? initializedIdentifierList
+    |    STATIC LATE FINAL type? initializedIdentifierList
+    |    STATIC LATE? varOrType initializedIdentifierList
+    |    COVARIANT LATE FINAL type? identifierList
+    |    COVARIANT LATE? varOrType initializedIdentifierList
+    |    LATE? (FINAL type? | varOrType) initializedIdentifierList
+    |    redirectingFactoryConstructorSignature
+    |    constantConstructorSignature (redirection | initializers)?
+    |    constructorSignature (redirection | initializers)?
     ;
 
 operatorSignature
diff --git a/tools/spec_parser/dart_spec_parser/Dart.g4 b/tools/spec_parser/dart_spec_parser/Dart.g4
index 1c8d737d7f3..b2edd1d02f1 100644
--- a/tools/spec_parser/dart_spec_parser/Dart.g4
+++ b/tools/spec_parser/dart_spec_parser/Dart.g4
@@ -297,10 +297,10 @@ topLevelDefinition
     |    extensionDeclaration
     |    enumType
     |    typeAlias
-    |    EXTERNAL functionSignature ';'
-    |    EXTERNAL getterSignature ';'
-    |    EXTERNAL setterSignature ';'
-    |    EXTERNAL finalVarOrType identifierList ';'
+    |    AUGMENT? EXTERNAL functionSignature ';'
+    |    AUGMENT? EXTERNAL getterSignature ';'
+    |    AUGMENT? EXTERNAL setterSignature ';'
+    |    AUGMENT? EXTERNAL finalVarOrType identifierList ';'
     |    AUGMENT? getterSignature (functionBody | ';')
     |    AUGMENT? setterSignature (functionBody | ';')
     |    AUGMENT? functionSignature (functionBody | ';')
@@ -455,7 +455,7 @@ interfaces
 
 classMemberDeclaration
     :    AUGMENT? methodSignature functionBody
-    |    declaration ';'
+    |    AUGMENT? declaration ';'
     ;
 
 mixinApplicationClass
@@ -525,15 +525,15 @@ declaration
     |    EXTERNAL (STATIC? finalVarOrType | COVARIANT varOrType) identifierList
     |    EXTERNAL? operatorSignature
     |    ABSTRACT (finalVarOrType | COVARIANT varOrType) identifierList
-    |    AUGMENT? STATIC (FINAL | CONST) type? initializedIdentifierList
-    |    AUGMENT? STATIC LATE FINAL type? initializedIdentifierList
-    |    AUGMENT? STATIC LATE? varOrType initializedIdentifierList
-    |    AUGMENT? COVARIANT LATE FINAL type? identifierList
-    |    AUGMENT? COVARIANT LATE? varOrType initializedIdentifierList
-    |    AUGMENT? LATE? (FINAL type? | varOrType) initializedIdentifierList
-    |    AUGMENT? redirectingFactoryConstructorSignature
-    |    AUGMENT? constantConstructorSignature (redirection | initializers)?
-    |    AUGMENT? constructorSignature (redirection | initializers)?
+    |    STATIC (FINAL | CONST) type? initializedIdentifierList
+    |    STATIC LATE FINAL type? initializedIdentifierList
+    |    STATIC LATE? varOrType initializedIdentifierList
+    |    COVARIANT LATE FINAL type? identifierList
+    |    COVARIANT LATE? varOrType initializedIdentifierList
+    |    LATE? (FINAL type? | varOrType) initializedIdentifierList
+    |    redirectingFactoryConstructorSignature
+    |    constantConstructorSignature (redirection | initializers)?
+    |    constructorSignature (redirection | initializers)?
     ;
 
 operatorSignature