This makes the dnsprovider usable in more scenarios, and it also solves some TODOs in the federation code.