Fix (?) the non-REPL behaviour.