Removing dependency to SupplierIterator in interfaces.
Removing dependency to SupplierIterator in implementations.