Replace loop with iterate

Removed last instances of loop, replaced with equivalent iterate uses