grammar: refactored out some "OptComma"s