Go back to EBNF operator for (almost) everything