Pull changes to customize host:port extraction

I'm opening this so that we can leave comments right in the pull request.