Tweak grammar stripping to emit Expression_[?Yield]_opt correctly.
Tweak grammar regex to recognize nonterminal names like "StatementList_Return", used only in 5.1.5.