Enhance Iteration

See ReplaceIndexingWithIteration