Sync with the recent Iterator::count() changes