Cleanup lexer, adding file path handling.