More manual fixes for \opt-as-suffix removal

Author: jensmaurer

source/declarations.tex

@@ -3328,7 +3328,7 @@
 
 \begin{bnf}
 \nontermdef{asm-definition}\br
-    attribute-specifier-seq\opt{} \terminal{asm (} string-literal \terminal{) ;}
+    \opt{attribute-specifier-seq} \terminal{asm (} string-literal \terminal{) ;}
 \end{bnf}
 
 The \tcode{asm} declaration is conditionally-supported; its meaning is

source/expressions.tex

@@ -1664,7 +1664,7 @@
 
 \begin{bnf}
 \nontermdef{type-requirement}\br
-    \terminal{typename} nested-name-specifier\opt type-name \terminal{;}
+    \terminal{typename} \opt{nested-name-specifier} type-name \terminal{;}
 \end{bnf}
 
 \pnum

source/templates.tex

@@ -21,7 +21,7 @@
 
 \begin{bnf}
 \nontermdef{template-head}\br
-  \terminal{template} \terminal{<} template-parameter-list \terminal{>} requires-clause\opt
+  \terminal{template} \terminal{<} template-parameter-list \terminal{>} \opt{requires-clause}
 \end{bnf}
 
 \begin{bnf}
@@ -258,19 +258,19 @@
 
 \begin{bnf}
 \nontermdef{constrained-parameter}\br
-  qualified-concept-name \terminal{...} identifier\opt\br
-  qualified-concept-name identifier\opt{} default-template-argument\opt
+  qualified-concept-name \terminal{...} \opt{identifier}\br
+  qualified-concept-name \opt{identifier} \opt{default-template-argument}
 \end{bnf}
 
 \begin{bnf}
 \nontermdef{qualified-concept-name}\br
-  nested-name-specifier\opt{} concept-name\br
-  nested-name-specifier\opt{} partial-concept-id
+  \opt{nested-name-specifier} concept-name\br
+  \opt{nested-name-specifier} partial-concept-id
 \end{bnf}
 
 \begin{bnf}
 \nontermdef{partial-concept-id}\br
-  concept-name \terminal{<} template-argument-list\opt{} \terminal{>}
+  concept-name \terminal{<} \opt{template-argument-list} \terminal{>}
 \end{bnf}
 
 \begin{bnf}

source/utilities.tex

@@ -14678,7 +14678,7 @@
 \remarks This deduction guide participates in overload resolution only if
 \tcode{\&F::operator()} is well-formed when treated as an unevaluated operand.
 In that case, if \tcode{decltype(\&F::operator())} is of the form
-\tcode{R(G::*)(A...)}~\cv{}~\tcode{\&\opt{}~noexcept\opt}
+\tcode{R(G::*)(A...)}~\cv{}~\tcode{\opt{\&}~\opt{noexcept}}
 for a class type \tcode{G}, then the deduced type is \tcode{function<R(A...)>}.
 
 \pnum