New TODO and undoing some naming decisions for EBNF expansion.