Fixing up REPL a bit.