Change parser due to changes in EBNF