Re: [PATCH 08/10] remote_driver: Move URI re-generation into a function