Polish our wrap library to support fallback to AF_INET