remove mostly unnecessary special-case for counted_iterator, now that advance is optimized