Though now that I think about it, I think keeping s3_external_url, s3_url, and base_resource_url all URLs instead of host would help keep things consistent. So I'll merge vhost_or_fqdn() with base_uri. It isn't as if we're calling vhost_or_fqdn elsewhere.