WINDUP-199: Iteration simplification (pass iteration variable names to c...

...onditions/operations)