Convert lex grammar to combined lex+parse grammar

Fixes recursion rules - not allowed in lex tokens, but allowed in parsed sentences.