Finished refactoring for EBNF