WINDUP-156: Some simplifications to Iteration variable handling (implicit iteration variable names)