EBNF clean up