diff --git a/src/attributes.rst b/src/attributes.rst
index eea216e7..35fabc0c 100644
--- a/src/attributes.rst
+++ b/src/attributes.rst
@@ -38,7 +38,7 @@ Attributes
      | $$=$$ Expression
 
    AttributeContentList ::=
-       AttributeContent (, AttributeContent)* ,?
+       AttributeContent ($$,$$ AttributeContent)* $$,$$?
 
 .. rubric:: Legality Rules
 
@@ -472,7 +472,7 @@ Attribute ``target_feature``
        $$target_feature$$ $$($$ $$enable$$ $$=$$ $$"$$ FeatureList $$"$$ $$)$$
 
    FeatureList ::=
-       Feature (, Feature)*
+       Feature ($$,$$ Feature)*
 
    Feature ::=
        $$adx$$
@@ -1030,7 +1030,7 @@ Attribute ``link``
        $$name$$ $$=$$ StringLiteral
 
    NativeLibraryNameWithKind ::=
-       NativeLibraryName , NativeLibrayKind
+       NativeLibraryName $$,$$ NativeLibrayKind
 
    WebAssemblyModuleName ::=
        $$wasm_import_module$$ $$=$$ StringLiteral
diff --git a/src/generics.rst b/src/generics.rst
index a1df5c0f..bedd3d1c 100644
--- a/src/generics.rst
+++ b/src/generics.rst
@@ -246,7 +246,7 @@ Where Clauses
        $$where$$ WhereClausePredicateList
 
    WhereClausePredicateList ::=
-       WhereClausePredicate (, WhereClausePredicate)* $$,$$?
+       WhereClausePredicate ($$,$$ WhereClausePredicate)* $$,$$?
 
    WhereClausePredicate ::=
        LifetimeBoundPredicate
diff --git a/src/patterns.rst b/src/patterns.rst
index f482864a..6140e90c 100644
--- a/src/patterns.rst
+++ b/src/patterns.rst
@@ -769,13 +769,13 @@ Record Struct Patterns
 
    RecordStructPatternContent ::=
        RecordStructRestPattern
-     | FieldDeconstructorList (, RecordStructRestPattern | ,?)
+     | FieldDeconstructorList ($$,$$ RecordStructRestPattern | $$,$$?)
 
    RecordStructRestPattern ::=
        OuterAttributeOrDoc* RestPattern
 
    FieldDeconstructorList ::=
-       FieldDeconstructor (, FieldDeconstructor)*
+       FieldDeconstructor ($$,$$ FieldDeconstructor)*
 
    FieldDeconstructor ::=
        OuterAttributeOrDoc* (
diff --git a/src/types-and-traits.rst b/src/types-and-traits.rst
index 3b780f27..1982ef09 100644
--- a/src/types-and-traits.rst
+++ b/src/types-and-traits.rst
@@ -23,7 +23,7 @@ Types
      | TypeSpecificationWithoutBounds
 
    TypeSpecificationList ::=
-       TypeSpecification (, TypeSpecification)* $$,$$?
+       TypeSpecification ($$,$$ TypeSpecification)* $$,$$?
 
    TypeSpecificationWithoutBounds ::=
        ArrayTypeSpecification
@@ -576,7 +576,7 @@ Tuple Types
        $$($$ TupleFieldList? $$)$$
 
    TupleFieldList ::=
-       TupleField (, TupleField)* ,?
+       TupleField ($$,$$ TupleField)* $$,$$?
 
    TupleField ::=
        TypeSpecification