Small code optimization to match runner