HCOLL-22 refactored the way we create modification iterators