diff --git a/source/classes.tex b/source/classes.tex
index 189eff2b6e..ec36fe6b40 100644
--- a/source/classes.tex
+++ b/source/classes.tex
@@ -492,8 +492,7 @@
 
 \begin{bnf}
 \nontermdef{virt-specifier-seq}\br
-    virt-specifier\br
-    virt-specifier-seq virt-specifier
+    virt-specifier \opt{virt-specifier-seq}
 \end{bnf}
 
 \begin{bnf}
diff --git a/source/declarations.tex b/source/declarations.tex
index bdc56bfa2d..4b14b20eeb 100644
--- a/source/declarations.tex
+++ b/source/declarations.tex
@@ -13,8 +13,7 @@
 the form
 \begin{bnf}
 \nontermdef{declaration-seq}\br
-    declaration\br
-    declaration-seq declaration
+    declaration \opt{declaration-seq}
 \end{bnf}
 
 \begin{bnf}
@@ -8724,7 +8723,7 @@
 
 \begin{bnf}
 \nontermdef{attribute-specifier-seq}\br
-  \opt{attribute-specifier-seq} attribute-specifier
+  attribute-specifier \opt{attribute-specifier-seq}
 \end{bnf}
 
 \begin{bnf}
@@ -8780,8 +8779,7 @@
 
 \begin{bnf}
 \nontermdef{balanced-token-seq}\br
-    balanced-token\br
-    balanced-token-seq balanced-token
+    balanced-token \opt{balanced-token-seq}
 \end{bnf}
 
 \begin{bnf}
diff --git a/source/expressions.tex b/source/expressions.tex
index b8d17f8214..05480e34d9 100644
--- a/source/expressions.tex
+++ b/source/expressions.tex
@@ -1846,8 +1846,7 @@
 
 \begin{bnf}
 \nontermdef{lambda-specifier-seq}\br
-    lambda-specifier\br
-    lambda-specifier lambda-specifier-seq
+    lambda-specifier \opt{lambda-specifier-seq}
 \end{bnf}
 
 \pnum
@@ -2896,8 +2895,7 @@
 
 \begin{bnf}
 \nontermdef{requirement-seq}\br
-    requirement\br
-    requirement requirement-seq
+    requirement \opt{requirement-seq}
 \end{bnf}
 
 \begin{bnf}
diff --git a/source/lex.tex b/source/lex.tex
index dda28c0271..d2fdacd881 100644
--- a/source/lex.tex
+++ b/source/lex.tex
@@ -398,8 +398,7 @@
 
 \begin{bnf}
 \nontermdef{n-char-sequence}\br
-    n-char\br
-    n-char-sequence n-char
+    n-char \opt{n-char-sequence}
 \end{bnf}
 
 \begin{bnf}
@@ -414,8 +413,7 @@
 
 \begin{bnf}
 \nontermdef{simple-hexadecimal-digit-sequence}\br
-    hexadecimal-digit\br
-    simple-hexadecimal-digit-sequence hexadecimal-digit
+    hexadecimal-digit \opt{simple-hexadecimal-digit-sequence}
 \end{bnf}
 
 \begin{bnf}
@@ -642,8 +640,7 @@
 
 \begin{bnf}
 \nontermdef{h-char-sequence}\br
-    h-char\br
-    h-char-sequence h-char
+    h-char \opt{h-char-sequence}
 \end{bnf}
 
 \begin{bnf}
@@ -653,8 +650,7 @@
 
 \begin{bnf}
 \nontermdef{q-char-sequence}\br
-    q-char\br
-    q-char-sequence q-char
+    q-char \opt{q-char-sequence}
 \end{bnf}
 
 \begin{bnf}
@@ -1377,8 +1373,7 @@
 
 \begin{bnf}
 \nontermdef{c-char-sequence}\br
-    c-char\br
-    c-char-sequence c-char
+    c-char \opt{c-char-sequence}
 \end{bnf}
 
 \begin{bnf}
@@ -1419,8 +1414,7 @@
 
 \begin{bnf}
 \nontermdef{simple-octal-digit-sequence}\br
-    octal-digit\br
-    simple-octal-digit-sequence octal-digit
+    octal-digit \opt{simple-octal-digit-sequence}
 \end{bnf}
 
 \begin{bnf}
@@ -1748,8 +1742,7 @@
 
 \begin{bnf}
 \nontermdef{s-char-sequence}\br
-    s-char\br
-    s-char-sequence s-char
+    s-char \opt{s-char-sequence}
 \end{bnf}
 
 \begin{bnf}
@@ -1772,8 +1765,7 @@
 
 \begin{bnf}
 \nontermdef{r-char-sequence}\br
-    r-char\br
-    r-char-sequence r-char
+    r-char \opt{r-char-sequence}
 \end{bnf}
 
 \begin{bnf}
@@ -1784,8 +1776,7 @@
 
 \begin{bnf}
 \nontermdef{d-char-sequence}\br
-    d-char\br
-    d-char-sequence d-char
+    d-char\opt{d-char-sequence}
 \end{bnf}
 
 \begin{bnf}
diff --git a/source/preprocessor.tex b/source/preprocessor.tex
index 9705fd1ca0..81b87b4626 100644
--- a/source/preprocessor.tex
+++ b/source/preprocessor.tex
@@ -75,8 +75,7 @@
 
 \begin{bnf}
 \nontermdef{elif-groups}\br
-    elif-group\br
-    elif-groups elif-group
+    elif-group \opt{elif-groups}
 \end{bnf}
 
 \begin{bnf}\obeyspaces
@@ -124,8 +123,7 @@
 
 \begin{bnf}
 \nontermdef{pp-tokens}\br
-    preprocessing-token\br
-    pp-tokens preprocessing-token
+    preprocessing-token \opt{pp-tokens}
 \end{bnf}
 
 \begin{bnf}
@@ -300,8 +298,7 @@
 
 \begin{bnf}
 \nontermdef{h-pp-tokens}\br
-    h-preprocessing-token\br
-    h-pp-tokens h-preprocessing-token
+    h-preprocessing-token \opt{h-pp-tokens}
 \end{bnf}
 
 \begin{bnf}
diff --git a/source/statements.tex b/source/statements.tex
index 9940ee28de..7fcee85848 100644
--- a/source/statements.tex
+++ b/source/statements.tex
@@ -226,14 +226,12 @@
 
 \begin{bnf}
 \nontermdef{statement-seq}\br
-    statement\br
-    statement-seq statement
+    statement \opt{statement-seq}
 \end{bnf}
 
 \begin{bnf}
 \nontermdef{label-seq}\br
-    label\br
-    label-seq label
+    label \opt{label-seq}
 \end{bnf}
 
 A label at the end of a \grammarterm{compound-statement}