Minor ProxyUtils.matchNonProxyHost clean up, still very incomplete