More IO/Network/InternetAddress cleanups