Replaced custom lexer with generic, shared lexer.