restored convertibility to simpler EBNF
strange conflict...