Preliminary changes for neighborhood iterators