Update Stream to use iterators.