I know this wasn't changed in this CL, but can we merge this and remote-streamy-location? We should be able to detect when something's a URL or a local path.