Remove some superfluous parentheses from the grammar definitions