Add mandatory runner parameter.  Factor out duplicated code.