Simplify grammar.

The tokenizer now normalizes the rule-separator token to "=".