Improved repl hygiene