Followup 2995bdcf: Don't iterate changed geometries twice