Further work on aligning EBNF with implementation