Further work on aligning with EBNF