Merge "Fix three clang complaints about the DNS code."