diff --git a/index.bs b/index.bs
index 628de3cb..ffe995a5 100644
--- a/index.bs
+++ b/index.bs
@@ -1974,8 +1974,13 @@ The following extended attributes are applicable to operations:
 
 <pre class="grammar" id="prod-Argument">
     Argument :
-        ExtendedAttributeList "optional" TypeWithExtendedAttributes ArgumentName Default
-        ExtendedAttributeList Type Ellipsis ArgumentName
+        ExtendedAttributeList ArgumentRest
+</pre>
+
+<pre class="grammar" id="prod-ArgumentRest">
+    ArgumentRest :
+        "optional" TypeWithExtendedAttributes ArgumentName Default
+        Type Ellipsis ArgumentName
 </pre>
 
 <pre class="grammar" id="prod-ArgumentName">
@@ -4232,8 +4237,13 @@ No [=extended attributes=] are applicable to dictionaries.
 
 <pre class="grammar" id="prod-DictionaryMember">
     DictionaryMember :
-        ExtendedAttributeList "required" TypeWithExtendedAttributes identifier Default ";"
-        ExtendedAttributeList Type identifier Default ";"
+        ExtendedAttributeList DictionaryMemberRest
+</pre>
+
+<pre class="grammar" id="prod-DictionaryMemberRest">
+    DictionaryMemberRest :
+        "required" TypeWithExtendedAttributes identifier Default ";"
+        Type identifier Default ";"
 </pre>
 
 <pre class="grammar" id="prod-PartialDictionary">
@@ -5083,8 +5093,7 @@ type.
 
 <pre class="grammar" id="prod-TypeWithExtendedAttributes">
     TypeWithExtendedAttributes :
-        ExtendedAttributeList SingleType
-        ExtendedAttributeList UnionType Null
+        ExtendedAttributeList Type
 </pre>
 
 <pre class="grammar" id="prod-SingleType">