This move defers adding query params (if any) to the param list until after URL replacement. Since we now disallow this case explicitly, we can skip iterating over them needlessly.