simplify BNF usage slightly
Removed all curly braces that have only one item inside, and fixed two instances where curly and square braces were mismatched.
Removed all curly braces that have only one item inside, and fixed two instances where curly and square braces were mismatched.