REPL shouldn't try to be too clever...
Fixes first part of issue #150