Removed two more references to non-standard Iterator function
Post-crunch commit
Post-crunch commit