Moved 'lexer' into base grammar