Tweaked grammar and lexer