Cleanup iterator syntax