Fix escaping of URI strings passed to %{rest:}