We previously achieved what we wanted anyway: move all callers
to a single file exclusively dealing with unbound.