Support for if statements with variables as rvalues, and fix because lookahead was still causing last line to not be read
Cleanup.