Rework internals of ControllerRunners.