A bit of code movement
Slightly better getaddrinfo