Remove unneeded logging from lexer.
Add renaming of expression variables.