More work on REPL correctness