Better detection of optional parameters
New EBNF engine works
Grubbing out old EBNF engine