Its just that the logic for this one in particular is tricky (since there was a bug in there for a long time). It seems error-prone to have tricky logic duplicated in a number of places.

Since the iterators are now part of the public API and use these inline calls -- it should just be a matter of grabbing them from the right header, no ?