Removed extra logic from iterator creation.
Separating StorageIterator from StreamIterator.