supporting variables again in REPL #34, cleanup