Lots of cleanup to the EBNF