Clean up assignment of sim.iters and how they are indexed