Switched the EBNF plus operator back to its old form.