Changed the rest of the internal code to conform to the changes to iter.