manual fixes for \opt{} removal

Author: jensmaurer

source/declarations.tex

@@ -1282,7 +1282,7 @@
 a type to be deduced\iref{dcl.spec.auto}.
 \indextext{deduction!class template arguments}%
 A \grammarterm{type-specifier} of the form
-\tcode{typename}\opt{} \grammarterm{nested-name-specifier}\opt{} \grammarterm{template-name}
+\opt{\tcode{typename}} \opt{\grammarterm{nested-name-specifier}} \grammarterm{template-name}
 is a placeholder for
 a deduced class type\iref{dcl.type.class.deduct}.
 The \grammarterm{template-name} shall name a class template

source/iostreams.tex

@@ -10675,8 +10675,8 @@
 
 \begin{ncbnf}
 \nontermdef{directory-separator}\br
-    preferred-separator directory-separator\opt\br
-    fallback-separator directory-separator\opt
+    preferred-separator \opt{directory-separator}\br
+    fallback-separator \opt{directory-separator}
 \end{ncbnf}
 
 \begin{ncbnf}