Merge "Misc cleanups for getaddrinfo.cpp"