It looks like compare_ofs_delta_bases() could be similarly cleaned up
here? This seems to be the only caller.

[snip]

And same with compare_ref_delta_bases here.

That's true, although I didn't need these cleanups for the rest of my patches,
so I think it's better to defer them to reduce the overall size of the
patch.