Add whitespace optimisation.
Remove REPL connect for now.