Given that `advance_delta_offset` seems to be called in just one place, I'm wondering if it can just go away...