Please skip adding the _sp names for the single page ones - those are the only used to implement the non postfixed ones anyway. The _mp ones should have bio_iter_segment_* names instead. And while you're at it - I think this code would massively benefit from turning it into inline functions in a prep step before doing these changes, including passing the iter by reference for all these functions instead of the odd by value calling convention.