Refactor, move and retire (some) runners.