Some tidying up in InterpreterRunner
Refactoring to prepare for match expression against output without line terminator