Slight tweaks to WIP refactoring of Runner.