Add macro WITH-SOCKADDR-STORAGE, use it in a few places.