Updated BNF rules.