Merge "Cleanup: eliminate pointer in getaddrinfo's main loop"