Minor clean-up for neighborhood iterators