Some slightly tricky manipulation involved here, but hopefully UriTemplate to the rescue. Fixes gh-682
