This change involves a refactoring of the DNS redirector code, which is now a bit cleaner and has proper tests.