258-CR5: Avoid risky double use of loop param