From 9c67282b03ac59ca7f4a930bf53f4e8a18251907 Mon Sep 17 00:00:00 2001
From: Scott Hart <sdhart@google.com>
Date: Fri, 19 Jul 2024 12:51:08 -0400
Subject: [PATCH] impl(generator): support protobuf wrapper types as query
 params (#14493)

---
 .../internal/golden_kitchen_sink_rest_stub.cc |   2 +-
 generator/internal/descriptor_utils_test.cc   |   4 +-
 generator/internal/http_option_utils.cc       |  90 ++++++++++---
 generator/internal/http_option_utils.h        |  18 +++
 generator/internal/http_option_utils_test.cc  | 120 +++++++++++++++++-
 .../v2/internal/dataset_rest_stub.cc          |  10 +-
 .../v2/internal/job_rest_stub.cc              |  25 +++-
 .../v2/internal/model_rest_stub.cc            |   6 +-
 .../v2/internal/routine_rest_stub.cc          |   6 +-
 .../v2/internal/table_rest_stub.cc            |  10 +-
 .../internal/accelerator_types_rest_stub.cc   |   6 +-
 .../v1/internal/addresses_rest_stub.cc        |   6 +-
 .../v1/internal/autoscalers_rest_stub.cc      |   6 +-
 .../v1/internal/backend_buckets_rest_stub.cc  |   2 +-
 .../v1/internal/backend_services_rest_stub.cc |   8 +-
 .../v1/internal/disk_types_rest_stub.cc       |   6 +-
 .../disks/v1/internal/disks_rest_stub.cc      |  10 +-
 .../external_vpn_gateways_rest_stub.cc        |   2 +-
 .../internal/firewall_policies_rest_stub.cc   |   6 +-
 .../v1/internal/firewalls_rest_stub.cc        |   2 +-
 .../v1/internal/forwarding_rules_rest_stub.cc |   6 +-
 .../v1/internal/global_addresses_rest_stub.cc |   2 +-
 .../global_forwarding_rules_rest_stub.cc      |   2 +-
 ...lobal_network_endpoint_groups_rest_stub.cc |   4 +-
 .../internal/global_operations_rest_stub.cc   |   6 +-
 ...lobal_organization_operations_rest_stub.cc |   2 +-
 ...bal_public_delegated_prefixes_rest_stub.cc |   2 +-
 .../v1/internal/health_checks_rest_stub.cc    |   6 +-
 .../internal/http_health_checks_rest_stub.cc  |   2 +-
 .../internal/https_health_checks_rest_stub.cc |   2 +-
 .../images/v1/internal/images_rest_stub.cc    |   6 +-
 ...group_manager_resize_requests_rest_stub.cc |   2 +-
 .../instance_group_managers_rest_stub.cc      |  12 +-
 .../v1/internal/instance_groups_rest_stub.cc  |   8 +-
 .../internal/instance_templates_rest_stub.cc  |   6 +-
 .../v1/internal/instances_rest_stub.cc        |  39 +++---
 .../interconnect_attachments_rest_stub.cc     |  10 +-
 .../interconnect_locations_rest_stub.cc       |   2 +-
 ...interconnect_remote_locations_rest_stub.cc |   2 +-
 .../v1/internal/interconnects_rest_stub.cc    |   2 +-
 .../v1/internal/licenses_rest_stub.cc         |   2 +-
 .../v1/internal/machine_images_rest_stub.cc   |   2 +-
 .../v1/internal/machine_types_rest_stub.cc    |   6 +-
 .../internal/network_attachments_rest_stub.cc |   6 +-
 ...etwork_edge_security_services_rest_stub.cc |   8 +-
 .../network_endpoint_groups_rest_stub.cc      |   8 +-
 .../network_firewall_policies_rest_stub.cc    |   6 +-
 .../v1/internal/networks_rest_stub.cc         |   4 +-
 .../v1/internal/node_groups_rest_stub.cc      |   8 +-
 .../v1/internal/node_templates_rest_stub.cc   |   6 +-
 .../v1/internal/node_types_rest_stub.cc       |   6 +-
 .../internal/packet_mirrorings_rest_stub.cc   |   6 +-
 .../v1/internal/projects_rest_stub.cc         |   4 +-
 .../public_advertised_prefixes_rest_stub.cc   |   2 +-
 .../public_delegated_prefixes_rest_stub.cc    |   6 +-
 .../internal/region_autoscalers_rest_stub.cc  |   2 +-
 .../region_backend_services_rest_stub.cc      |   4 +-
 .../internal/region_commitments_rest_stub.cc  |   6 +-
 .../internal/region_disk_types_rest_stub.cc   |   2 +-
 .../v1/internal/region_disks_rest_stub.cc     |   2 +-
 .../region_health_check_services_rest_stub.cc |   2 +-
 .../region_health_checks_rest_stub.cc         |   2 +-
 ...egion_instance_group_managers_rest_stub.cc |   8 +-
 .../region_instance_groups_rest_stub.cc       |   4 +-
 .../region_instance_templates_rest_stub.cc    |   2 +-
 ...egion_network_endpoint_groups_rest_stub.cc |   4 +-
 ...ion_network_firewall_policies_rest_stub.cc |   6 +-
 ...region_notification_endpoints_rest_stub.cc |   2 +-
 .../internal/region_operations_rest_stub.cc   |   2 +-
 .../region_security_policies_rest_stub.cc     |  14 +-
 .../region_ssl_certificates_rest_stub.cc      |   2 +-
 .../internal/region_ssl_policies_rest_stub.cc |   4 +-
 .../region_target_http_proxies_rest_stub.cc   |   2 +-
 .../region_target_https_proxies_rest_stub.cc  |   2 +-
 .../region_target_tcp_proxies_rest_stub.cc    |   2 +-
 .../v1/internal/region_url_maps_rest_stub.cc  |   2 +-
 .../v1/internal/region_zones_rest_stub.cc     |   2 +-
 .../regions/v1/internal/regions_rest_stub.cc  |   2 +-
 .../v1/internal/reservations_rest_stub.cc     |   6 +-
 .../internal/resource_policies_rest_stub.cc   |   6 +-
 .../routers/v1/internal/routers_rest_stub.cc  |   8 +-
 .../routes/v1/internal/routes_rest_stub.cc    |   2 +-
 .../internal/security_policies_rest_stub.cc   |  20 +--
 .../internal/service_attachments_rest_stub.cc |   6 +-
 .../v1/internal/snapshots_rest_stub.cc        |   2 +-
 .../v1/internal/ssl_certificates_rest_stub.cc |   6 +-
 .../v1/internal/ssl_policies_rest_stub.cc     |   8 +-
 .../internal/storage_pool_types_rest_stub.cc  |   6 +-
 .../v1/internal/storage_pools_rest_stub.cc    |   8 +-
 .../v1/internal/subnetworks_rest_stub.cc      |   8 +-
 .../internal/target_grpc_proxies_rest_stub.cc |   2 +-
 .../internal/target_http_proxies_rest_stub.cc |   6 +-
 .../target_https_proxies_rest_stub.cc         |   6 +-
 .../v1/internal/target_instances_rest_stub.cc |   6 +-
 .../v1/internal/target_pools_rest_stub.cc     |   6 +-
 .../internal/target_ssl_proxies_rest_stub.cc  |   2 +-
 .../internal/target_tcp_proxies_rest_stub.cc  |   6 +-
 .../internal/target_vpn_gateways_rest_stub.cc |   6 +-
 .../v1/internal/url_maps_rest_stub.cc         |   6 +-
 .../v1/internal/vpn_gateways_rest_stub.cc     |   6 +-
 .../v1/internal/vpn_tunnels_rest_stub.cc      |   6 +-
 .../v1/internal/zone_operations_rest_stub.cc  |   2 +-
 .../zones/v1/internal/zones_rest_stub.cc      |   2 +-
 .../internal/instance_admin_rest_stub.cc      |  10 +-
 .../v1/internal/sql_instances_rest_stub.cc    |   8 +-
 105 files changed, 509 insertions(+), 285 deletions(-)

diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.cc
index cb42d321e0287..a4e1d1a5d8640 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.cc
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.cc
@@ -61,7 +61,7 @@ DefaultGoldenKitchenSinkRestStub::GenerateIdToken(
       absl::StrCat("/", rest_internal::DetermineApiVersion("v1", options), "/token:generate"),
       rest_internal::TrimEmptyQueryParameters({std::make_pair("name", request.name()),
         std::make_pair("audience", request.audience()),
-        std::make_pair("include_email", request.include_email() ? "1" : "0")}));
+        std::make_pair("include_email", (request.include_email() ? "1" : "0"))}));
 }
 
 StatusOr<google::test::admin::database::v1::WriteLogEntriesResponse>
diff --git a/generator/internal/descriptor_utils_test.cc b/generator/internal/descriptor_utils_test.cc
index 8cf9147d7f748..ecd2b6fc4f070 100644
--- a/generator/internal/descriptor_utils_test.cc
+++ b/generator/internal/descriptor_utils_test.cc
@@ -1281,7 +1281,7 @@ INSTANTIATE_TEST_SUITE_P(
         MethodVarsTestValues("my.service.v1.Service.Method1",
                              "method_http_query_parameters", R"""(,
       rest_internal::TrimEmptyQueryParameters({std::make_pair("number", std::to_string(request.number())),
-        std::make_pair("toggle", request.toggle() ? "1" : "0"),
+        std::make_pair("toggle", (request.toggle() ? "1" : "0")),
         std::make_pair("title", request.title()),
         std::make_pair("parent", request.parent())}))"""),
         // Method2
@@ -1310,7 +1310,7 @@ INSTANTIATE_TEST_SUITE_P(
                              "method_http_query_parameters", R"""(,
       rest_internal::TrimEmptyQueryParameters({std::make_pair("number", std::to_string(request.number())),
         std::make_pair("name", request.name()),
-        std::make_pair("toggle", request.toggle() ? "1" : "0"),
+        std::make_pair("toggle", (request.toggle() ? "1" : "0")),
         std::make_pair("title", request.title())}))"""),
         // Method3
         MethodVarsTestValues("my.service.v1.Service.Method3",
diff --git a/generator/internal/http_option_utils.cc b/generator/internal/http_option_utils.cc
index 38acc073b9163..fce38e0c8b675 100644
--- a/generator/internal/http_option_utils.cc
+++ b/generator/internal/http_option_utils.cc
@@ -195,7 +195,52 @@ void SetHttpDerivedMethodVars(
   absl::visit(HttpInfoVisitor(method, method_vars), parsed_http_info);
 }
 
-// Request fields not appering in the path may not wind up as part of the json
+absl::optional<QueryParameterInfo> DetermineQueryParameterInfo(
+    google::protobuf::FieldDescriptor const& field) {
+  static auto* const kSupportedWellKnownValueTypes = [] {
+    auto foo = std::make_unique<
+        std::unordered_map<std::string, protobuf::FieldDescriptor::CppType>>();
+    foo->emplace("google.protobuf.BoolValue",
+                 protobuf::FieldDescriptor::CPPTYPE_BOOL);
+    foo->emplace("google.protobuf.DoubleValue",
+                 protobuf::FieldDescriptor::CPPTYPE_DOUBLE);
+    foo->emplace("google.protobuf.FloatValue",
+                 protobuf::FieldDescriptor::CPPTYPE_FLOAT);
+    foo->emplace("google.protobuf.Int32Value",
+                 protobuf::FieldDescriptor::CPPTYPE_INT32);
+    foo->emplace("google.protobuf.Int64Value",
+                 protobuf::FieldDescriptor::CPPTYPE_INT64);
+    foo->emplace("google.protobuf.StringValue",
+                 protobuf::FieldDescriptor::CPPTYPE_STRING);
+    foo->emplace("google.protobuf.UInt32Value",
+                 protobuf::FieldDescriptor::CPPTYPE_UINT32);
+    foo->emplace("google.protobuf.UInt64Value",
+                 protobuf::FieldDescriptor::CPPTYPE_UINT64);
+    return foo.release();
+  }();
+
+  absl::optional<QueryParameterInfo> param_info;
+  // Only attempt to make non-repeated, simple fields query parameters.
+  if (!field.is_repeated() && !field.options().deprecated()) {
+    if (field.cpp_type() != protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
+      param_info = QueryParameterInfo{
+          field.cpp_type(), absl::StrCat("request.", field.name(), "()"),
+          false};
+    } else {
+      // But also consider protobuf well known types that wrap simple types.
+      auto iter = kSupportedWellKnownValueTypes->find(
+          field.message_type()->full_name());
+      if (iter != kSupportedWellKnownValueTypes->end()) {
+        param_info = QueryParameterInfo{
+            iter->second, absl::StrCat("request.", field.name(), "().value()"),
+            true};
+      }
+    }
+  }
+  return param_info;
+}
+
+// Request fields not appearing in the path may not wind up as part of the json
 // request body, so per https://cloud.google.com/apis/design/standard_methods,
 // for HTTP transcoding we need to turn the request fields into query
 // parameters.
@@ -211,36 +256,41 @@ void SetHttpQueryParameters(
         : method(method), method_vars(method_vars) {}
     void FormatQueryParameterCode(
         std::vector<std::string> const& param_field_names) {
-      std::vector<std::pair<std::string, protobuf::FieldDescriptor::CppType>>
+      std::vector<std::pair<std::string, QueryParameterInfo>>
           remaining_request_fields;
       auto const* request = method.input_type();
       for (int i = 0; i < request->field_count(); ++i) {
         auto const* field = request->field(i);
-        // Only attempt to make non-repeated, simple fields query parameters.
-        if (!field->is_repeated() && !field->options().deprecated() &&
-            field->cpp_type() != protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
-          if (!internal::Contains(param_field_names, field->name())) {
-            remaining_request_fields.emplace_back(field->name(),
-                                                  field->cpp_type());
-          }
+        auto param_info = DetermineQueryParameterInfo(*field);
+        if (param_info &&
+            !internal::Contains(param_field_names, field->name())) {
+          remaining_request_fields.emplace_back(field->name(), *param_info);
         }
       }
+
       auto format = [](auto* out, auto const& i) {
-        if (i.second == protobuf::FieldDescriptor::CPPTYPE_STRING) {
-          out->append(absl::StrFormat("std::make_pair(\"%s\", request.%s())",
-                                      i.first, i.first));
-          return;
+        std::string field_access;
+        if (i.second.cpp_type == protobuf::FieldDescriptor::CPPTYPE_STRING) {
+          field_access = i.second.request_field_accessor;
+        } else if (i.second.cpp_type ==
+                   protobuf::FieldDescriptor::CPPTYPE_BOOL) {
+          field_access = absl::StrCat("(", i.second.request_field_accessor,
+                                      R"""( ? "1" : "0"))""");
+        } else {
+          field_access = absl::StrCat("std::to_string(",
+                                      i.second.request_field_accessor, ")");
         }
-        if (i.second == protobuf::FieldDescriptor::CPPTYPE_BOOL) {
+
+        if (i.second.check_presence) {
           out->append(absl::StrFormat(
-              R"""(std::make_pair("%s", request.%s() ? "1" : "0"))""", i.first,
-              i.first));
-          return;
+              R"""(std::make_pair("%s", (request.has_%s() ? %s : "")))""",
+              i.first, i.first, field_access));
+        } else {
+          out->append(absl::StrFormat(R"""(std::make_pair("%s", %s))""",
+                                      i.first, field_access));
         }
-        out->append(absl::StrFormat(
-            "std::make_pair(\"%s\", std::to_string(request.%s()))", i.first,
-            i.first));
       };
+
       if (remaining_request_fields.empty()) {
         method_vars["method_http_query_parameters"] = "";
       } else {
diff --git a/generator/internal/http_option_utils.h b/generator/internal/http_option_utils.h
index 7b5474fefb8cb..40972cbe2541c 100644
--- a/generator/internal/http_option_utils.h
+++ b/generator/internal/http_option_utils.h
@@ -69,6 +69,24 @@ void SetHttpDerivedMethodVars(
     google::protobuf::MethodDescriptor const& method,
     VarsDictionary& method_vars);
 
+struct QueryParameterInfo {
+  protobuf::FieldDescriptor::CppType cpp_type;
+  // A code fragment the generator emits to access the value of the field.
+  std::string request_field_accessor;
+  // Check presence for MESSAGE types as their default values may result in
+  // undesired behavior.
+  bool check_presence;
+};
+
+/**
+ * Determine if a field is a query parameter candidate, such that it's a
+ * non-repeated field that is also not an aggregate type. This includes numeric,
+ * bool, and string native protobuf data types, as well as, protobuf "Well Known
+ * Types" that wrap those data types.
+ */
+absl::optional<QueryParameterInfo> DetermineQueryParameterInfo(
+    google::protobuf::FieldDescriptor const& field);
+
 /**
  * Sets the "method_http_query_parameters" value in method_vars based on the
  * parsed_http_info.
diff --git a/generator/internal/http_option_utils_test.cc b/generator/internal/http_option_utils_test.cc
index 2f7f408d58a5c..0e0ffdc7a9c6b 100644
--- a/generator/internal/http_option_utils_test.cc
+++ b/generator/internal/http_option_utils_test.cc
@@ -106,6 +106,42 @@ syntax = "proto3";
 package google.protobuf;
 // Leading comments about message Empty.
 message Empty {}
+message DoubleValue {
+  // The double value.
+  double value = 1;
+}
+message FloatValue {
+  // The float value.
+  float value = 1;
+}
+message Int64Value {
+  // The int64 value.
+  int64 value = 1;
+}
+message UInt64Value {
+  // The uint64 value.
+  uint64 value = 1;
+}
+message Int32Value {
+  // The int32 value.
+  int32 value = 1;
+}
+message UInt32Value {
+  // The uint32 value.
+  uint32 value = 1;
+}
+message BoolValue {
+  // The bool value.
+  bool value = 1;
+}
+message StringValue {
+  // The string value.
+  string value = 1;
+}
+message BytesValue {
+  // The bytes value.
+  bytes value = 1;
+}
 )""";
 
 char const* const kServiceProto =
@@ -275,6 +311,65 @@ char const* const kServiceProtoWithoutVersion =
     "  }\n"
     "}\n";
 
+char const* const kBigQueryServiceProto = R"""(
+syntax = "proto3";
+package my.package.v1;
+import "google/api/annotations.proto";
+import "google/api/client.proto";
+import "google/api/http.proto";
+import "google/protobuf/well_known.proto";
+
+service BigQueryLikeService {
+  // RPC to get the results of a query job.
+  rpc GetQueryResults(GetQueryResultsRequest)
+      returns (GetQueryResultsResponse) {
+    option (google.api.http) = {
+      get: "/bigquery/v2/projects/{project_id=*}/queries/{job_id=*}"
+    };
+  }
+}
+
+// Request object of GetQueryResults.
+message GetQueryResultsRequest {
+  // Required. Project ID of the query job.
+  string project_id = 1;
+
+  // Required. Job ID of the query job.
+  string job_id = 2;
+
+  // Zero-based index of the starting row.
+  google.protobuf.UInt64Value start_index = 3;
+
+  // Page token, returned by a previous call, to request the next page of
+  // results.
+  google.protobuf.StringValue page_token = 4;
+
+  // Maximum number of results to read.
+  google.protobuf.UInt32Value max_results = 5;
+
+  // The geographic location of the job.
+  google.protobuf.BoolValue include_location = 7;
+
+  // Double field.
+  google.protobuf.DoubleValue double_value = 8;
+
+  // Float field.
+  google.protobuf.FloatValue float_value = 9;
+
+  // Int32 field.
+  google.protobuf.Int32Value int32_value = 10;
+
+  // Int64 field.
+  google.protobuf.Int64Value int64_value = 11;
+
+  // Non supported message type that is not a query param.
+  google.protobuf.Empty non_supported_type = 12;
+}
+
+// Response object of GetQueryResults.
+message GetQueryResultsResponse {}
+)""";
+
 struct MethodVarsTestValues {
   MethodVarsTestValues(std::string m, std::string k, std::string v)
       : method(std::move(m)),
@@ -298,7 +393,9 @@ class HttpOptionUtilsTest
             {std::string("google/protobuf/well_known.proto"), kWellKnownProto},
             {std::string("google/foo/v1/service.proto"), kServiceProto},
             {std::string("google/foo/v1/service_without_version.proto"),
-             kServiceProtoWithoutVersion}}),
+             kServiceProtoWithoutVersion},
+            {std::string("google/foo/v1/big_query_service.proto"),
+             kBigQueryServiceProto}}),
         source_tree_db_(&source_tree_),
         merged_db_(&simple_db_, &source_tree_db_),
         pool_(&merged_db_, &collector_) {
@@ -550,7 +647,26 @@ TEST_F(HttpOptionUtilsTest, SetHttpGetQueryParametersGetPaginated) {
       rest_internal::TrimEmptyQueryParameters({std::make_pair("page_size", std::to_string(request.page_size())),
         std::make_pair("page_token", request.page_token()),
         std::make_pair("name", request.name()),
-        std::make_pair("include_foo", request.include_foo() ? "1" : "0")}))"""));
+        std::make_pair("include_foo", (request.include_foo() ? "1" : "0"))}))"""));
+}
+
+TEST_F(HttpOptionUtilsTest,
+       SetHttpGetQueryParametersGetWellKnownTypesPaginated) {
+  FileDescriptor const* service_file_descriptor =
+      pool_.FindFileByName("google/foo/v1/big_query_service.proto");
+  MethodDescriptor const* method =
+      service_file_descriptor->service(0)->method(0);
+  VarsDictionary vars;
+  SetHttpQueryParameters(ParseHttpExtension(*method), *method, vars);
+  EXPECT_THAT(vars.at("method_http_query_parameters"), Eq(R"""(,
+      rest_internal::TrimEmptyQueryParameters({std::make_pair("start_index", (request.has_start_index() ? std::to_string(request.start_index().value()) : "")),
+        std::make_pair("page_token", (request.has_page_token() ? request.page_token().value() : "")),
+        std::make_pair("max_results", (request.has_max_results() ? std::to_string(request.max_results().value()) : "")),
+        std::make_pair("include_location", (request.has_include_location() ? (request.include_location().value() ? "1" : "0") : "")),
+        std::make_pair("double_value", (request.has_double_value() ? std::to_string(request.double_value().value()) : "")),
+        std::make_pair("float_value", (request.has_float_value() ? std::to_string(request.float_value().value()) : "")),
+        std::make_pair("int32_value", (request.has_int32_value() ? std::to_string(request.int32_value().value()) : "")),
+        std::make_pair("int64_value", (request.has_int64_value() ? std::to_string(request.int64_value().value()) : ""))}))"""));
 }
 
 TEST_F(HttpOptionUtilsTest, HasHttpAnnotationRoutingHeaderSuccess) {
diff --git a/google/cloud/bigquerycontrol/v2/internal/dataset_rest_stub.cc b/google/cloud/bigquerycontrol/v2/internal/dataset_rest_stub.cc
index 35ac527a64dde..bbb55afd53c0a 100644
--- a/google/cloud/bigquerycontrol/v2/internal/dataset_rest_stub.cc
+++ b/google/cloud/bigquerycontrol/v2/internal/dataset_rest_stub.cc
@@ -103,7 +103,7 @@ Status DefaultDatasetServiceRestStub::DeleteDataset(
                    "projects", "/", request.project_id(), "/", "datasets", "/",
                    request.dataset_id()),
       rest_internal::TrimEmptyQueryParameters({std::make_pair(
-          "delete_contents", request.delete_contents() ? "1" : "0")}));
+          "delete_contents", (request.delete_contents() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::bigquery::v2::DatasetList>
@@ -117,8 +117,12 @@ DefaultDatasetServiceRestStub::ListDatasets(
                    rest_internal::DetermineApiVersion("v2", options), "/",
                    "projects", "/", request.project_id(), "/", "datasets"),
       rest_internal::TrimEmptyQueryParameters(
-          {std::make_pair("page_token", request.page_token()),
-           std::make_pair("all", request.all() ? "1" : "0"),
+          {std::make_pair("max_results",
+                          (request.has_max_results()
+                               ? std::to_string(request.max_results().value())
+                               : "")),
+           std::make_pair("page_token", request.page_token()),
+           std::make_pair("all", (request.all() ? "1" : "0")),
            std::make_pair("filter", request.filter())}));
 }
 
diff --git a/google/cloud/bigquerycontrol/v2/internal/job_rest_stub.cc b/google/cloud/bigquerycontrol/v2/internal/job_rest_stub.cc
index e3fbf2d5a0398..e1561079cd9b7 100644
--- a/google/cloud/bigquerycontrol/v2/internal/job_rest_stub.cc
+++ b/google/cloud/bigquerycontrol/v2/internal/job_rest_stub.cc
@@ -104,9 +104,18 @@ DefaultJobServiceRestStub::ListJobs(
                    rest_internal::DetermineApiVersion("v2", options), "/",
                    "projects", "/", request.project_id(), "/", "jobs"),
       rest_internal::TrimEmptyQueryParameters(
-          {std::make_pair("all_users", request.all_users() ? "1" : "0"),
+          {std::make_pair("all_users", (request.all_users() ? "1" : "0")),
+           std::make_pair("max_results",
+                          (request.has_max_results()
+                               ? std::to_string(request.max_results().value())
+                               : "")),
            std::make_pair("min_creation_time",
                           std::to_string(request.min_creation_time())),
+           std::make_pair(
+               "max_creation_time",
+               (request.has_max_creation_time()
+                    ? std::to_string(request.max_creation_time().value())
+                    : "")),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("projection", std::to_string(request.projection())),
            std::make_pair("parent_job_id", request.parent_job_id())}));
@@ -125,7 +134,19 @@ DefaultJobServiceRestStub::GetQueryResults(
                    "projects", "/", request.project_id(), "/", "queries", "/",
                    request.job_id()),
       rest_internal::TrimEmptyQueryParameters(
-          {std::make_pair("page_token", request.page_token()),
+          {std::make_pair("start_index",
+                          (request.has_start_index()
+                               ? std::to_string(request.start_index().value())
+                               : "")),
+           std::make_pair("page_token", request.page_token()),
+           std::make_pair("max_results",
+                          (request.has_max_results()
+                               ? std::to_string(request.max_results().value())
+                               : "")),
+           std::make_pair("timeout_ms",
+                          (request.has_timeout_ms()
+                               ? std::to_string(request.timeout_ms().value())
+                               : "")),
            std::make_pair("location", request.location())}));
 }
 
diff --git a/google/cloud/bigquerycontrol/v2/internal/model_rest_stub.cc b/google/cloud/bigquerycontrol/v2/internal/model_rest_stub.cc
index 82205550d2aeb..c559fe3ab7fa3 100644
--- a/google/cloud/bigquerycontrol/v2/internal/model_rest_stub.cc
+++ b/google/cloud/bigquerycontrol/v2/internal/model_rest_stub.cc
@@ -65,7 +65,11 @@ DefaultModelServiceRestStub::ListModels(
                    "projects", "/", request.project_id(), "/", "datasets", "/",
                    request.dataset_id(), "/", "models"),
       rest_internal::TrimEmptyQueryParameters(
-          {std::make_pair("page_token", request.page_token())}));
+          {std::make_pair("max_results",
+                          (request.has_max_results()
+                               ? std::to_string(request.max_results().value())
+                               : "")),
+           std::make_pair("page_token", request.page_token())}));
 }
 
 StatusOr<google::cloud::bigquery::v2::Model>
diff --git a/google/cloud/bigquerycontrol/v2/internal/routine_rest_stub.cc b/google/cloud/bigquerycontrol/v2/internal/routine_rest_stub.cc
index f1e6b53f7d593..1b15857e03dae 100644
--- a/google/cloud/bigquerycontrol/v2/internal/routine_rest_stub.cc
+++ b/google/cloud/bigquerycontrol/v2/internal/routine_rest_stub.cc
@@ -105,7 +105,11 @@ DefaultRoutineServiceRestStub::ListRoutines(
                    "projects", "/", request.project_id(), "/", "datasets", "/",
                    request.dataset_id(), "/", "routines"),
       rest_internal::TrimEmptyQueryParameters(
-          {std::make_pair("page_token", request.page_token()),
+          {std::make_pair("max_results",
+                          (request.has_max_results()
+                               ? std::to_string(request.max_results().value())
+                               : "")),
+           std::make_pair("page_token", request.page_token()),
            std::make_pair("filter", request.filter())}));
 }
 
diff --git a/google/cloud/bigquerycontrol/v2/internal/table_rest_stub.cc b/google/cloud/bigquerycontrol/v2/internal/table_rest_stub.cc
index 19569d98bfce2..cf7fcebeab0cd 100644
--- a/google/cloud/bigquerycontrol/v2/internal/table_rest_stub.cc
+++ b/google/cloud/bigquerycontrol/v2/internal/table_rest_stub.cc
@@ -82,7 +82,7 @@ DefaultTableServiceRestStub::PatchTable(
                    request.dataset_id(), "/", "tables", "/",
                    request.table_id()),
       rest_internal::TrimEmptyQueryParameters({std::make_pair(
-          "autodetect_schema", request.autodetect_schema() ? "1" : "0")}));
+          "autodetect_schema", (request.autodetect_schema() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::bigquery::v2::Table>
@@ -98,7 +98,7 @@ DefaultTableServiceRestStub::UpdateTable(
                    request.dataset_id(), "/", "tables", "/",
                    request.table_id()),
       rest_internal::TrimEmptyQueryParameters({std::make_pair(
-          "autodetect_schema", request.autodetect_schema() ? "1" : "0")}));
+          "autodetect_schema", (request.autodetect_schema() ? "1" : "0"))}));
 }
 
 Status DefaultTableServiceRestStub::DeleteTable(
@@ -126,7 +126,11 @@ DefaultTableServiceRestStub::ListTables(
                    "projects", "/", request.project_id(), "/", "datasets", "/",
                    request.dataset_id(), "/", "tables"),
       rest_internal::TrimEmptyQueryParameters(
-          {std::make_pair("page_token", request.page_token())}));
+          {std::make_pair("max_results",
+                          (request.has_max_results()
+                               ? std::to_string(request.max_results().value())
+                               : "")),
+           std::make_pair("page_token", request.page_token())}));
 }
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
diff --git a/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_stub.cc b/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_stub.cc
index f2a80dcbb3c9a..9297dd9691332 100644
--- a/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_stub.cc
+++ b/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_rest_stub.cc
@@ -56,12 +56,12 @@ DefaultAcceleratorTypesRestStub::AggregatedListAcceleratorTypes(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -100,7 +100,7 @@ DefaultAcceleratorTypesRestStub::ListAcceleratorTypes(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
diff --git a/google/cloud/compute/addresses/v1/internal/addresses_rest_stub.cc b/google/cloud/compute/addresses/v1/internal/addresses_rest_stub.cc
index 7112e73e56023..06220ff8720ac 100644
--- a/google/cloud/compute/addresses/v1/internal/addresses_rest_stub.cc
+++ b/google/cloud/compute/addresses/v1/internal/addresses_rest_stub.cc
@@ -61,12 +61,12 @@ DefaultAddressesRestStub::AggregatedListAddresses(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -203,7 +203,7 @@ DefaultAddressesRestStub::ListAddresses(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_stub.cc b/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_stub.cc
index efbdbc1cf7281..979a1c902c312 100644
--- a/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_stub.cc
+++ b/google/cloud/compute/autoscalers/v1/internal/autoscalers_rest_stub.cc
@@ -61,12 +61,12 @@ DefaultAutoscalersRestStub::AggregatedListAutoscalers(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -204,7 +204,7 @@ DefaultAutoscalersRestStub::ListAutoscalers(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_stub.cc b/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_stub.cc
index dbb9080c1e914..df8946975d786 100644
--- a/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_stub.cc
+++ b/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_rest_stub.cc
@@ -301,7 +301,7 @@ DefaultBackendBucketsRestStub::ListBackendBuckets(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/backend_services/v1/internal/backend_services_rest_stub.cc b/google/cloud/compute/backend_services/v1/internal/backend_services_rest_stub.cc
index b196f4603a01a..21f50ba239980 100644
--- a/google/cloud/compute/backend_services/v1/internal/backend_services_rest_stub.cc
+++ b/google/cloud/compute/backend_services/v1/internal/backend_services_rest_stub.cc
@@ -113,12 +113,12 @@ DefaultBackendServicesRestStub::AggregatedListBackendServices(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -345,7 +345,7 @@ DefaultBackendServicesRestStub::ListBackendServices(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::BackendServiceListUsable>
@@ -367,7 +367,7 @@ DefaultBackendServicesRestStub::ListUsable(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/disk_types/v1/internal/disk_types_rest_stub.cc b/google/cloud/compute/disk_types/v1/internal/disk_types_rest_stub.cc
index 6814e9164ff01..4852484b7ea75 100644
--- a/google/cloud/compute/disk_types/v1/internal/disk_types_rest_stub.cc
+++ b/google/cloud/compute/disk_types/v1/internal/disk_types_rest_stub.cc
@@ -55,12 +55,12 @@ DefaultDiskTypesRestStub::AggregatedListDiskTypes(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -97,7 +97,7 @@ DefaultDiskTypesRestStub::ListDiskTypes(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
diff --git a/google/cloud/compute/disks/v1/internal/disks_rest_stub.cc b/google/cloud/compute/disks/v1/internal/disks_rest_stub.cc
index 5c23a2b1ba5c3..725cd64c81da2 100644
--- a/google/cloud/compute/disks/v1/internal/disks_rest_stub.cc
+++ b/google/cloud/compute/disks/v1/internal/disks_rest_stub.cc
@@ -114,12 +114,12 @@ DefaultDisksRestStub::AggregatedListDisks(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -195,7 +195,7 @@ DefaultDisksRestStub::AsyncCreateSnapshot(
                              request.disk(), "/", "createSnapshot"),
                 rest_internal::TrimEmptyQueryParameters(
                     {std::make_pair("guest_flush",
-                                    request.guest_flush() ? "1" : "0"),
+                                    (request.guest_flush() ? "1" : "0")),
                      std::make_pair("request_id", request.request_id())})));
       },
       std::move(p),
@@ -223,7 +223,7 @@ DefaultDisksRestStub::CreateSnapshot(
                    request.zone(), "/", "disks", "/", request.disk(), "/",
                    "createSnapshot"),
       rest_internal::TrimEmptyQueryParameters(
-          {std::make_pair("guest_flush", request.guest_flush() ? "1" : "0"),
+          {std::make_pair("guest_flush", (request.guest_flush() ? "1" : "0")),
            std::make_pair("request_id", request.request_id())}));
 }
 
@@ -371,7 +371,7 @@ DefaultDisksRestStub::ListDisks(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_stub.cc b/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_stub.cc
index 7777543e0d7dc..fb91a3541b016 100644
--- a/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_stub.cc
+++ b/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_rest_stub.cc
@@ -181,7 +181,7 @@ DefaultExternalVpnGatewaysRestStub::ListExternalVpnGateways(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_stub.cc b/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_stub.cc
index 4d809c8f99618..834ef80f5c1ce 100644
--- a/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_stub.cc
+++ b/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_rest_stub.cc
@@ -70,7 +70,7 @@ DefaultFirewallPoliciesRestStub::AsyncAddAssociation(
                 rest_internal::TrimEmptyQueryParameters(
                     {std::make_pair(
                          "replace_existing_association",
-                         request.replace_existing_association() ? "1" : "0"),
+                         (request.replace_existing_association() ? "1" : "0")),
                      std::make_pair("request_id", request.request_id())})));
       },
       std::move(p),
@@ -99,7 +99,7 @@ DefaultFirewallPoliciesRestStub::AddAssociation(
                    request.firewall_policy(), "/", "addAssociation"),
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("replace_existing_association",
-                          request.replace_existing_association() ? "1" : "0"),
+                          (request.replace_existing_association() ? "1" : "0")),
            std::make_pair("request_id", request.request_id())}));
 }
 
@@ -392,7 +392,7 @@ DefaultFirewallPoliciesRestStub::ListFirewallPolicies(
            std::make_pair("page_token", request.page_token()),
            std::make_pair("parent_id", request.parent_id()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<
diff --git a/google/cloud/compute/firewalls/v1/internal/firewalls_rest_stub.cc b/google/cloud/compute/firewalls/v1/internal/firewalls_rest_stub.cc
index 6234205f7a53f..7ccfb9501fa06 100644
--- a/google/cloud/compute/firewalls/v1/internal/firewalls_rest_stub.cc
+++ b/google/cloud/compute/firewalls/v1/internal/firewalls_rest_stub.cc
@@ -176,7 +176,7 @@ DefaultFirewallsRestStub::ListFirewalls(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_stub.cc b/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_stub.cc
index 8930db2f27899..96f7d0fee17bd 100644
--- a/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_stub.cc
+++ b/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_rest_stub.cc
@@ -61,12 +61,12 @@ DefaultForwardingRulesRestStub::AggregatedListForwardingRules(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -207,7 +207,7 @@ DefaultForwardingRulesRestStub::ListForwardingRules(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_stub.cc b/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_stub.cc
index 6129f240f5349..91f38ec68fd49 100644
--- a/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_stub.cc
+++ b/google/cloud/compute/global_addresses/v1/internal/global_addresses_rest_stub.cc
@@ -176,7 +176,7 @@ DefaultGlobalAddressesRestStub::ListGlobalAddresses(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_stub.cc b/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_stub.cc
index 1ed6f502c7c26..1e2b40c4709f2 100644
--- a/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_stub.cc
+++ b/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_rest_stub.cc
@@ -180,7 +180,7 @@ DefaultGlobalForwardingRulesRestStub::ListGlobalForwardingRules(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_stub.cc b/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_stub.cc
index 173c2053b5e10..dca91a67ae64a 100644
--- a/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_stub.cc
+++ b/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_rest_stub.cc
@@ -300,7 +300,7 @@ DefaultGlobalNetworkEndpointGroupsRestStub::ListGlobalNetworkEndpointGroups(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<
@@ -324,7 +324,7 @@ DefaultGlobalNetworkEndpointGroupsRestStub::ListNetworkEndpoints(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/global_operations/v1/internal/global_operations_rest_stub.cc b/google/cloud/compute/global_operations/v1/internal/global_operations_rest_stub.cc
index c2dfb5f48c357..eb086992a3d82 100644
--- a/google/cloud/compute/global_operations/v1/internal/global_operations_rest_stub.cc
+++ b/google/cloud/compute/global_operations/v1/internal/global_operations_rest_stub.cc
@@ -56,12 +56,12 @@ DefaultGlobalOperationsRestStub::AggregatedListGlobalOperations(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -111,7 +111,7 @@ DefaultGlobalOperationsRestStub::ListGlobalOperations(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::Operation>
diff --git a/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_stub.cc b/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_stub.cc
index 4dd0a9e17e2eb..8d0de7cf0e013 100644
--- a/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_stub.cc
+++ b/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_rest_stub.cc
@@ -91,7 +91,7 @@ DefaultGlobalOrganizationOperationsRestStub::ListGlobalOrganizationOperations(
            std::make_pair("page_token", request.page_token()),
            std::make_pair("parent_id", request.parent_id()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
diff --git a/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_stub.cc b/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_stub.cc
index ece172f2fa378..0b66e51ed77bb 100644
--- a/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_stub.cc
+++ b/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_rest_stub.cc
@@ -185,7 +185,7 @@ DefaultGlobalPublicDelegatedPrefixesRestStub::ListGlobalPublicDelegatedPrefixes(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/health_checks/v1/internal/health_checks_rest_stub.cc b/google/cloud/compute/health_checks/v1/internal/health_checks_rest_stub.cc
index cddc52e8c56e1..2996f8d5e9f70 100644
--- a/google/cloud/compute/health_checks/v1/internal/health_checks_rest_stub.cc
+++ b/google/cloud/compute/health_checks/v1/internal/health_checks_rest_stub.cc
@@ -61,12 +61,12 @@ DefaultHealthChecksRestStub::AggregatedListHealthChecks(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -202,7 +202,7 @@ DefaultHealthChecksRestStub::ListHealthChecks(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_stub.cc b/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_stub.cc
index 9faf821836eee..c93d191d8cd83 100644
--- a/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_stub.cc
+++ b/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_rest_stub.cc
@@ -179,7 +179,7 @@ DefaultHttpHealthChecksRestStub::ListHttpHealthChecks(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_stub.cc b/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_stub.cc
index f0e0f053ffc14..b1c09231f81cf 100644
--- a/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_stub.cc
+++ b/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_rest_stub.cc
@@ -179,7 +179,7 @@ DefaultHttpsHealthChecksRestStub::ListHttpsHealthChecks(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/images/v1/internal/images_rest_stub.cc b/google/cloud/compute/images/v1/internal/images_rest_stub.cc
index ac1757c4a068d..135ba4b2d3bde 100644
--- a/google/cloud/compute/images/v1/internal/images_rest_stub.cc
+++ b/google/cloud/compute/images/v1/internal/images_rest_stub.cc
@@ -208,7 +208,7 @@ DefaultImagesRestStub::AsyncInsertImage(
                              "global", "/", "images"),
                 rest_internal::TrimEmptyQueryParameters(
                     {std::make_pair("force_create",
-                                    request.force_create() ? "1" : "0"),
+                                    (request.force_create() ? "1" : "0")),
                      std::make_pair("request_id", request.request_id())})));
       },
       std::move(p),
@@ -235,7 +235,7 @@ DefaultImagesRestStub::InsertImage(
                    "projects", "/", request.project(), "/", "global", "/",
                    "images"),
       rest_internal::TrimEmptyQueryParameters(
-          {std::make_pair("force_create", request.force_create() ? "1" : "0"),
+          {std::make_pair("force_create", (request.force_create() ? "1" : "0")),
            std::make_pair("request_id", request.request_id())}));
 }
 
@@ -256,7 +256,7 @@ DefaultImagesRestStub::ListImages(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_stub.cc b/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_stub.cc
index d698da8ffb7e6..3902d64ddce9c 100644
--- a/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_stub.cc
+++ b/google/cloud/compute/instance_group_manager_resize_requests/v1/internal/instance_group_manager_resize_requests_rest_stub.cc
@@ -254,7 +254,7 @@ DefaultInstanceGroupManagerResizeRequestsRestStub::
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_stub.cc b/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_stub.cc
index 3dc30381a0982..1f89d5bc91780 100644
--- a/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_stub.cc
+++ b/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_rest_stub.cc
@@ -120,12 +120,12 @@ DefaultInstanceGroupManagersRestStub::AggregatedListInstanceGroupManagers(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -489,7 +489,7 @@ DefaultInstanceGroupManagersRestStub::ListInstanceGroupManagers(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<
@@ -513,7 +513,7 @@ DefaultInstanceGroupManagersRestStub::ListErrors(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::
@@ -539,7 +539,7 @@ DefaultInstanceGroupManagersRestStub::ListManagedInstances(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::
@@ -565,7 +565,7 @@ DefaultInstanceGroupManagersRestStub::ListPerInstanceConfigs(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_stub.cc b/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_stub.cc
index b072ed3d96085..e380e30af91e0 100644
--- a/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_stub.cc
+++ b/google/cloud/compute/instance_groups/v1/internal/instance_groups_rest_stub.cc
@@ -115,12 +115,12 @@ DefaultInstanceGroupsRestStub::AggregatedListInstanceGroups(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -260,7 +260,7 @@ DefaultInstanceGroupsRestStub::ListInstanceGroups(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::InstanceGroupsListInstances>
@@ -284,7 +284,7 @@ DefaultInstanceGroupsRestStub::ListInstances(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_stub.cc b/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_stub.cc
index 9087c24c41a80..20b287bb7077c 100644
--- a/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_stub.cc
+++ b/google/cloud/compute/instance_templates/v1/internal/instance_templates_rest_stub.cc
@@ -62,12 +62,12 @@ DefaultInstanceTemplatesRestStub::AggregatedListInstanceTemplates(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -223,7 +223,7 @@ DefaultInstanceTemplatesRestStub::ListInstanceTemplates(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::Policy>
diff --git a/google/cloud/compute/instances/v1/internal/instances_rest_stub.cc b/google/cloud/compute/instances/v1/internal/instances_rest_stub.cc
index fc43ccc508ac4..480e40c76fbd9 100644
--- a/google/cloud/compute/instances/v1/internal/instances_rest_stub.cc
+++ b/google/cloud/compute/instances/v1/internal/instances_rest_stub.cc
@@ -171,12 +171,12 @@ DefaultInstancesRestStub::AggregatedListInstances(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -204,7 +204,7 @@ DefaultInstancesRestStub::AsyncAttachDisk(
                              "/", request.instance(), "/", "attachDisk"),
                 rest_internal::TrimEmptyQueryParameters(
                     {std::make_pair("force_attach",
-                                    request.force_attach() ? "1" : "0"),
+                                    (request.force_attach() ? "1" : "0")),
                      std::make_pair("request_id", request.request_id())})));
       },
       std::move(p),
@@ -232,7 +232,7 @@ DefaultInstancesRestStub::AttachDisk(
                    request.zone(), "/", "instances", "/", request.instance(),
                    "/", "attachDisk"),
       rest_internal::TrimEmptyQueryParameters(
-          {std::make_pair("force_attach", request.force_attach() ? "1" : "0"),
+          {std::make_pair("force_attach", (request.force_attach() ? "1" : "0")),
            std::make_pair("request_id", request.request_id())}));
 }
 
@@ -640,7 +640,7 @@ DefaultInstancesRestStub::ListInstances(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::InstanceListReferrers>
@@ -663,7 +663,7 @@ DefaultInstancesRestStub::ListReferrers(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
@@ -907,8 +907,9 @@ DefaultInstancesRestStub::AsyncSetDeletionProtection(
                              "/", request.resource(), "/",
                              "setDeletionProtection"),
                 rest_internal::TrimEmptyQueryParameters(
-                    {std::make_pair("deletion_protection",
-                                    request.deletion_protection() ? "1" : "0"),
+                    {std::make_pair(
+                         "deletion_protection",
+                         (request.deletion_protection() ? "1" : "0")),
                      std::make_pair("request_id", request.request_id())})));
       },
       std::move(p),
@@ -937,7 +938,7 @@ DefaultInstancesRestStub::SetDeletionProtection(
                    "/", "setDeletionProtection"),
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("deletion_protection",
-                          request.deletion_protection() ? "1" : "0"),
+                          (request.deletion_protection() ? "1" : "0")),
            std::make_pair("request_id", request.request_id())}));
 }
 
@@ -963,7 +964,7 @@ DefaultInstancesRestStub::AsyncSetDiskAutoDelete(
                              "/", request.instance(), "/", "setDiskAutoDelete"),
                 rest_internal::TrimEmptyQueryParameters(
                     {std::make_pair("auto_delete",
-                                    request.auto_delete() ? "1" : "0"),
+                                    (request.auto_delete() ? "1" : "0")),
                      std::make_pair("device_name", request.device_name()),
                      std::make_pair("request_id", request.request_id())})));
       },
@@ -992,7 +993,7 @@ DefaultInstancesRestStub::SetDiskAutoDelete(
                    request.zone(), "/", "instances", "/", request.instance(),
                    "/", "setDiskAutoDelete"),
       rest_internal::TrimEmptyQueryParameters(
-          {std::make_pair("auto_delete", request.auto_delete() ? "1" : "0"),
+          {std::make_pair("auto_delete", (request.auto_delete() ? "1" : "0")),
            std::make_pair("device_name", request.device_name()),
            std::make_pair("request_id", request.request_id())}));
 }
@@ -1615,7 +1616,8 @@ DefaultInstancesRestStub::AsyncSimulateMaintenanceEvent(
                     {std::make_pair("request_id", request.request_id()),
                      std::make_pair(
                          "with_extended_notifications",
-                         request.with_extended_notifications() ? "1" : "0")})));
+                         (request.with_extended_notifications() ? "1"
+                                                                : "0"))})));
       },
       std::move(p),
       service_,
@@ -1643,8 +1645,9 @@ DefaultInstancesRestStub::SimulateMaintenanceEvent(
                    "/", "simulateMaintenanceEvent"),
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("request_id", request.request_id()),
-           std::make_pair("with_extended_notifications",
-                          request.with_extended_notifications() ? "1" : "0")}));
+           std::make_pair(
+               "with_extended_notifications",
+               (request.with_extended_notifications() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
@@ -1772,7 +1775,7 @@ DefaultInstancesRestStub::AsyncStop(
                              "/", request.instance(), "/", "stop"),
                 rest_internal::TrimEmptyQueryParameters(
                     {std::make_pair("discard_local_ssd",
-                                    request.discard_local_ssd() ? "1" : "0"),
+                                    (request.discard_local_ssd() ? "1" : "0")),
                      std::make_pair("request_id", request.request_id())})));
       },
       std::move(p),
@@ -1800,7 +1803,7 @@ DefaultInstancesRestStub::Stop(
                    "/", "stop"),
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("discard_local_ssd",
-                          request.discard_local_ssd() ? "1" : "0"),
+                          (request.discard_local_ssd() ? "1" : "0")),
            std::make_pair("request_id", request.request_id())}));
 }
 
@@ -1825,7 +1828,7 @@ DefaultInstancesRestStub::AsyncSuspend(
                              "/", request.instance(), "/", "suspend"),
                 rest_internal::TrimEmptyQueryParameters(
                     {std::make_pair("discard_local_ssd",
-                                    request.discard_local_ssd() ? "1" : "0"),
+                                    (request.discard_local_ssd() ? "1" : "0")),
                      std::make_pair("request_id", request.request_id())})));
       },
       std::move(p),
@@ -1853,7 +1856,7 @@ DefaultInstancesRestStub::Suspend(
                    "/", "suspend"),
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("discard_local_ssd",
-                          request.discard_local_ssd() ? "1" : "0"),
+                          (request.discard_local_ssd() ? "1" : "0")),
            std::make_pair("request_id", request.request_id())}));
 }
 
diff --git a/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_stub.cc b/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_stub.cc
index 8d13c9855677e..5f8242f529963 100644
--- a/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_stub.cc
+++ b/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_rest_stub.cc
@@ -63,12 +63,12 @@ DefaultInterconnectAttachmentsRestStub::AggregatedListInterconnectAttachments(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -165,7 +165,7 @@ DefaultInterconnectAttachmentsRestStub::AsyncInsertInterconnectAttachment(
                 rest_internal::TrimEmptyQueryParameters(
                     {std::make_pair("request_id", request.request_id()),
                      std::make_pair("validate_only",
-                                    request.validate_only() ? "1" : "0")})));
+                                    (request.validate_only() ? "1" : "0"))})));
       },
       std::move(p),
       service_,
@@ -194,7 +194,7 @@ DefaultInterconnectAttachmentsRestStub::InsertInterconnectAttachment(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("request_id", request.request_id()),
            std::make_pair("validate_only",
-                          request.validate_only() ? "1" : "0")}));
+                          (request.validate_only() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::InterconnectAttachmentList>
@@ -216,7 +216,7 @@ DefaultInterconnectAttachmentsRestStub::ListInterconnectAttachments(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_stub.cc b/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_stub.cc
index ffd0e196ce2a6..0252ad80347c2 100644
--- a/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_stub.cc
+++ b/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_rest_stub.cc
@@ -76,7 +76,7 @@ DefaultInterconnectLocationsRestStub::ListInterconnectLocations(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
diff --git a/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_stub.cc b/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_stub.cc
index 793dba25ed9da..a58e2c4c2dda6 100644
--- a/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_stub.cc
+++ b/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_rest_stub.cc
@@ -77,7 +77,7 @@ DefaultInterconnectRemoteLocationsRestStub::ListInterconnectRemoteLocations(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
diff --git a/google/cloud/compute/interconnects/v1/internal/interconnects_rest_stub.cc b/google/cloud/compute/interconnects/v1/internal/interconnects_rest_stub.cc
index d3f06890b26ef..0c25963625cd8 100644
--- a/google/cloud/compute/interconnects/v1/internal/interconnects_rest_stub.cc
+++ b/google/cloud/compute/interconnects/v1/internal/interconnects_rest_stub.cc
@@ -208,7 +208,7 @@ DefaultInterconnectsRestStub::ListInterconnects(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/licenses/v1/internal/licenses_rest_stub.cc b/google/cloud/compute/licenses/v1/internal/licenses_rest_stub.cc
index 3ae05bddcf9c9..584207c675b8f 100644
--- a/google/cloud/compute/licenses/v1/internal/licenses_rest_stub.cc
+++ b/google/cloud/compute/licenses/v1/internal/licenses_rest_stub.cc
@@ -193,7 +193,7 @@ DefaultLicensesRestStub::ListLicenses(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::Policy>
diff --git a/google/cloud/compute/machine_images/v1/internal/machine_images_rest_stub.cc b/google/cloud/compute/machine_images/v1/internal/machine_images_rest_stub.cc
index f018bb6533815..99217d67ae9cf 100644
--- a/google/cloud/compute/machine_images/v1/internal/machine_images_rest_stub.cc
+++ b/google/cloud/compute/machine_images/v1/internal/machine_images_rest_stub.cc
@@ -198,7 +198,7 @@ DefaultMachineImagesRestStub::ListMachineImages(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::Policy>
diff --git a/google/cloud/compute/machine_types/v1/internal/machine_types_rest_stub.cc b/google/cloud/compute/machine_types/v1/internal/machine_types_rest_stub.cc
index 1d7f5ff5c442c..a48a979dd8989 100644
--- a/google/cloud/compute/machine_types/v1/internal/machine_types_rest_stub.cc
+++ b/google/cloud/compute/machine_types/v1/internal/machine_types_rest_stub.cc
@@ -55,12 +55,12 @@ DefaultMachineTypesRestStub::AggregatedListMachineTypes(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -98,7 +98,7 @@ DefaultMachineTypesRestStub::ListMachineTypes(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
diff --git a/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_stub.cc b/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_stub.cc
index 985133d9f008a..98902a818554b 100644
--- a/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_stub.cc
+++ b/google/cloud/compute/network_attachments/v1/internal/network_attachments_rest_stub.cc
@@ -62,12 +62,12 @@ DefaultNetworkAttachmentsRestStub::AggregatedListNetworkAttachments(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -227,7 +227,7 @@ DefaultNetworkAttachmentsRestStub::ListNetworkAttachments(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_stub.cc b/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_stub.cc
index e343d786ce24a..fcaaf26491fa4 100644
--- a/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_stub.cc
+++ b/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_rest_stub.cc
@@ -66,12 +66,12 @@ DefaultNetworkEdgeSecurityServicesRestStub::
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -170,7 +170,7 @@ DefaultNetworkEdgeSecurityServicesRestStub::
                 rest_internal::TrimEmptyQueryParameters(
                     {std::make_pair("request_id", request.request_id()),
                      std::make_pair("validate_only",
-                                    request.validate_only() ? "1" : "0")})));
+                                    (request.validate_only() ? "1" : "0"))})));
       },
       std::move(p),
       service_,
@@ -199,7 +199,7 @@ DefaultNetworkEdgeSecurityServicesRestStub::InsertNetworkEdgeSecurityService(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("request_id", request.request_id()),
            std::make_pair("validate_only",
-                          request.validate_only() ? "1" : "0")}));
+                          (request.validate_only() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_stub.cc b/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_stub.cc
index 7ee03d7754a69..c561ec5bf24bf 100644
--- a/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_stub.cc
+++ b/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_rest_stub.cc
@@ -63,12 +63,12 @@ DefaultNetworkEndpointGroupsRestStub::AggregatedListNetworkEndpointGroups(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -325,7 +325,7 @@ DefaultNetworkEndpointGroupsRestStub::ListNetworkEndpointGroups(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<
@@ -351,7 +351,7 @@ DefaultNetworkEndpointGroupsRestStub::ListNetworkEndpoints(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::TestPermissionsResponse>
diff --git a/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_stub.cc b/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_stub.cc
index 3764830e3cb78..418d06a9814fb 100644
--- a/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_stub.cc
+++ b/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_rest_stub.cc
@@ -71,7 +71,7 @@ DefaultNetworkFirewallPoliciesRestStub::AsyncAddAssociation(
                 rest_internal::TrimEmptyQueryParameters(
                     {std::make_pair(
                          "replace_existing_association",
-                         request.replace_existing_association() ? "1" : "0"),
+                         (request.replace_existing_association() ? "1" : "0")),
                      std::make_pair("request_id", request.request_id())})));
       },
       std::move(p),
@@ -101,7 +101,7 @@ DefaultNetworkFirewallPoliciesRestStub::AddAssociation(
                    "addAssociation"),
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("replace_existing_association",
-                          request.replace_existing_association() ? "1" : "0"),
+                          (request.replace_existing_association() ? "1" : "0")),
            std::make_pair("request_id", request.request_id())}));
 }
 
@@ -407,7 +407,7 @@ DefaultNetworkFirewallPoliciesRestStub::ListNetworkFirewallPolicies(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/networks/v1/internal/networks_rest_stub.cc b/google/cloud/compute/networks/v1/internal/networks_rest_stub.cc
index 03a4e76f7ca5d..fcb2057d8f3c9 100644
--- a/google/cloud/compute/networks/v1/internal/networks_rest_stub.cc
+++ b/google/cloud/compute/networks/v1/internal/networks_rest_stub.cc
@@ -243,7 +243,7 @@ DefaultNetworksRestStub::ListNetworks(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::ExchangedPeeringRoutesList>
@@ -269,7 +269,7 @@ DefaultNetworksRestStub::ListPeeringRoutes(
            std::make_pair("peering_name", request.peering_name()),
            std::make_pair("region", request.region()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/node_groups/v1/internal/node_groups_rest_stub.cc b/google/cloud/compute/node_groups/v1/internal/node_groups_rest_stub.cc
index 69045b5d7df3b..cc488a7b24a7b 100644
--- a/google/cloud/compute/node_groups/v1/internal/node_groups_rest_stub.cc
+++ b/google/cloud/compute/node_groups/v1/internal/node_groups_rest_stub.cc
@@ -114,12 +114,12 @@ DefaultNodeGroupsRestStub::AggregatedListNodeGroups(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -333,7 +333,7 @@ DefaultNodeGroupsRestStub::ListNodeGroups(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::NodeGroupsListNodes>
@@ -356,7 +356,7 @@ DefaultNodeGroupsRestStub::ListNodes(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/node_templates/v1/internal/node_templates_rest_stub.cc b/google/cloud/compute/node_templates/v1/internal/node_templates_rest_stub.cc
index bc29341d7befb..69cf1476c7748 100644
--- a/google/cloud/compute/node_templates/v1/internal/node_templates_rest_stub.cc
+++ b/google/cloud/compute/node_templates/v1/internal/node_templates_rest_stub.cc
@@ -61,12 +61,12 @@ DefaultNodeTemplatesRestStub::AggregatedListNodeTemplates(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -224,7 +224,7 @@ DefaultNodeTemplatesRestStub::ListNodeTemplates(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::Policy>
diff --git a/google/cloud/compute/node_types/v1/internal/node_types_rest_stub.cc b/google/cloud/compute/node_types/v1/internal/node_types_rest_stub.cc
index 5fb5081d8dc1f..74b407fc990f1 100644
--- a/google/cloud/compute/node_types/v1/internal/node_types_rest_stub.cc
+++ b/google/cloud/compute/node_types/v1/internal/node_types_rest_stub.cc
@@ -55,12 +55,12 @@ DefaultNodeTypesRestStub::AggregatedListNodeTypes(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -97,7 +97,7 @@ DefaultNodeTypesRestStub::ListNodeTypes(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
diff --git a/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_stub.cc b/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_stub.cc
index edfee4b202c11..7766e6e8229a8 100644
--- a/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_stub.cc
+++ b/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_rest_stub.cc
@@ -62,12 +62,12 @@ DefaultPacketMirroringsRestStub::AggregatedListPacketMirrorings(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -209,7 +209,7 @@ DefaultPacketMirroringsRestStub::ListPacketMirrorings(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/projects/v1/internal/projects_rest_stub.cc b/google/cloud/compute/projects/v1/internal/projects_rest_stub.cc
index e5336fa09d3d0..d388e89abf6d8 100644
--- a/google/cloud/compute/projects/v1/internal/projects_rest_stub.cc
+++ b/google/cloud/compute/projects/v1/internal/projects_rest_stub.cc
@@ -287,7 +287,7 @@ DefaultProjectsRestStub::GetXpnResources(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::XpnHostList>
@@ -308,7 +308,7 @@ DefaultProjectsRestStub::ListXpnHosts(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_stub.cc b/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_stub.cc
index b51e8d567ebde..043add0a7aaf0 100644
--- a/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_stub.cc
+++ b/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_rest_stub.cc
@@ -237,7 +237,7 @@ DefaultPublicAdvertisedPrefixesRestStub::ListPublicAdvertisedPrefixes(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_stub.cc b/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_stub.cc
index 0a9a02ad4f20c..5764609e5c024 100644
--- a/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_stub.cc
+++ b/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_rest_stub.cc
@@ -63,12 +63,12 @@ DefaultPublicDelegatedPrefixesRestStub::AggregatedListPublicDelegatedPrefixes(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -264,7 +264,7 @@ DefaultPublicDelegatedPrefixesRestStub::ListPublicDelegatedPrefixes(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_stub.cc b/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_stub.cc
index d0a2d6ba91df4..e3519b94a22e4 100644
--- a/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_stub.cc
+++ b/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_rest_stub.cc
@@ -181,7 +181,7 @@ DefaultRegionAutoscalersRestStub::ListRegionAutoscalers(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_stub.cc b/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_stub.cc
index 1fc062337915b..5d244e255a815 100644
--- a/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_stub.cc
+++ b/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_rest_stub.cc
@@ -218,7 +218,7 @@ DefaultRegionBackendServicesRestStub::ListRegionBackendServices(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::BackendServiceListUsable>
@@ -240,7 +240,7 @@ DefaultRegionBackendServicesRestStub::ListUsable(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_stub.cc b/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_stub.cc
index 7d42f3e5f2b57..2a9095173a0fe 100644
--- a/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_stub.cc
+++ b/google/cloud/compute/region_commitments/v1/internal/region_commitments_rest_stub.cc
@@ -62,12 +62,12 @@ DefaultRegionCommitmentsRestStub::AggregatedListRegionCommitments(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -155,7 +155,7 @@ DefaultRegionCommitmentsRestStub::ListRegionCommitments(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_stub.cc b/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_stub.cc
index e4c870b7be6e0..a8c956c1fd68a 100644
--- a/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_stub.cc
+++ b/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_rest_stub.cc
@@ -73,7 +73,7 @@ DefaultRegionDiskTypesRestStub::ListRegionDiskTypes(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
diff --git a/google/cloud/compute/region_disks/v1/internal/region_disks_rest_stub.cc b/google/cloud/compute/region_disks/v1/internal/region_disks_rest_stub.cc
index 246af907bc08b..33951beb71fcb 100644
--- a/google/cloud/compute/region_disks/v1/internal/region_disks_rest_stub.cc
+++ b/google/cloud/compute/region_disks/v1/internal/region_disks_rest_stub.cc
@@ -352,7 +352,7 @@ DefaultRegionDisksRestStub::ListRegionDisks(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_stub.cc b/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_stub.cc
index 38556bdc87b5e..22dcbc2b7bf14 100644
--- a/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_stub.cc
+++ b/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_rest_stub.cc
@@ -186,7 +186,7 @@ DefaultRegionHealthCheckServicesRestStub::ListRegionHealthCheckServices(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_stub.cc b/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_stub.cc
index b86dafeb89045..df9c5a53fb5a5 100644
--- a/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_stub.cc
+++ b/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_rest_stub.cc
@@ -181,7 +181,7 @@ DefaultRegionHealthChecksRestStub::ListRegionHealthChecks(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_stub.cc b/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_stub.cc
index 5f22c9a5084f9..5ad86095ac827 100644
--- a/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_stub.cc
+++ b/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_rest_stub.cc
@@ -471,7 +471,7 @@ DefaultRegionInstanceGroupManagersRestStub::ListRegionInstanceGroupManagers(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::
@@ -495,7 +495,7 @@ DefaultRegionInstanceGroupManagersRestStub::ListErrors(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::
@@ -521,7 +521,7 @@ DefaultRegionInstanceGroupManagersRestStub::ListManagedInstances(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::
@@ -547,7 +547,7 @@ DefaultRegionInstanceGroupManagersRestStub::ListPerInstanceConfigs(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_stub.cc b/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_stub.cc
index e9a027d993004..a636511c831f8 100644
--- a/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_stub.cc
+++ b/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_rest_stub.cc
@@ -81,7 +81,7 @@ DefaultRegionInstanceGroupsRestStub::ListRegionInstanceGroups(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::RegionInstanceGroupsListInstances>
@@ -105,7 +105,7 @@ DefaultRegionInstanceGroupsRestStub::ListInstances(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_stub.cc b/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_stub.cc
index 17f2794280bf8..ce7beee39aa78 100644
--- a/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_stub.cc
+++ b/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_rest_stub.cc
@@ -184,7 +184,7 @@ DefaultRegionInstanceTemplatesRestStub::ListRegionInstanceTemplates(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_stub.cc b/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_stub.cc
index 605b49c4f7860..a13d5e623fdef 100644
--- a/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_stub.cc
+++ b/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_rest_stub.cc
@@ -306,7 +306,7 @@ DefaultRegionNetworkEndpointGroupsRestStub::ListRegionNetworkEndpointGroups(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<
@@ -331,7 +331,7 @@ DefaultRegionNetworkEndpointGroupsRestStub::ListNetworkEndpoints(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_stub.cc b/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_stub.cc
index 35548a6f0abb2..01111e8b51929 100644
--- a/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_stub.cc
+++ b/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_rest_stub.cc
@@ -73,7 +73,7 @@ DefaultRegionNetworkFirewallPoliciesRestStub::AsyncAddAssociation(
                 rest_internal::TrimEmptyQueryParameters(
                     {std::make_pair(
                          "replace_existing_association",
-                         request.replace_existing_association() ? "1" : "0"),
+                         (request.replace_existing_association() ? "1" : "0")),
                      std::make_pair("request_id", request.request_id())})));
       },
       std::move(p),
@@ -103,7 +103,7 @@ DefaultRegionNetworkFirewallPoliciesRestStub::AddAssociation(
                    request.firewall_policy(), "/", "addAssociation"),
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("replace_existing_association",
-                          request.replace_existing_association() ? "1" : "0"),
+                          (request.replace_existing_association() ? "1" : "0")),
            std::make_pair("request_id", request.request_id())}));
 }
 
@@ -435,7 +435,7 @@ DefaultRegionNetworkFirewallPoliciesRestStub::ListRegionNetworkFirewallPolicies(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_stub.cc b/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_stub.cc
index 800f01d6f3718..e249f853a67e6 100644
--- a/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_stub.cc
+++ b/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_rest_stub.cc
@@ -186,7 +186,7 @@ DefaultRegionNotificationEndpointsRestStub::ListRegionNotificationEndpoints(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/region_operations/v1/internal/region_operations_rest_stub.cc b/google/cloud/compute/region_operations/v1/internal/region_operations_rest_stub.cc
index 50b25486eec92..cbc655f3e3a40 100644
--- a/google/cloud/compute/region_operations/v1/internal/region_operations_rest_stub.cc
+++ b/google/cloud/compute/region_operations/v1/internal/region_operations_rest_stub.cc
@@ -87,7 +87,7 @@ DefaultRegionOperationsRestStub::ListRegionOperations(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::Operation>
diff --git a/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_stub.cc b/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_stub.cc
index 059c8020e1a3d..33560c6cb2b19 100644
--- a/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_stub.cc
+++ b/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_rest_stub.cc
@@ -70,7 +70,7 @@ DefaultRegionSecurityPoliciesRestStub::AsyncAddRule(
                              "securityPolicies", "/", request.security_policy(),
                              "/", "addRule"),
                 rest_internal::TrimEmptyQueryParameters({std::make_pair(
-                    "validate_only", request.validate_only() ? "1" : "0")})));
+                    "validate_only", (request.validate_only() ? "1" : "0"))})));
       },
       std::move(p),
       service_,
@@ -97,7 +97,7 @@ DefaultRegionSecurityPoliciesRestStub::AddRule(
                    request.region(), "/", "securityPolicies", "/",
                    request.security_policy(), "/", "addRule"),
       rest_internal::TrimEmptyQueryParameters({std::make_pair(
-          "validate_only", request.validate_only() ? "1" : "0")}));
+          "validate_only", (request.validate_only() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
@@ -209,7 +209,7 @@ DefaultRegionSecurityPoliciesRestStub::AsyncInsertSecurityPolicy(
                 rest_internal::TrimEmptyQueryParameters(
                     {std::make_pair("request_id", request.request_id()),
                      std::make_pair("validate_only",
-                                    request.validate_only() ? "1" : "0")})));
+                                    (request.validate_only() ? "1" : "0"))})));
       },
       std::move(p),
       service_,
@@ -237,7 +237,7 @@ DefaultRegionSecurityPoliciesRestStub::InsertSecurityPolicy(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("request_id", request.request_id()),
            std::make_pair("validate_only",
-                          request.validate_only() ? "1" : "0")}));
+                          (request.validate_only() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::SecurityPolicyList>
@@ -259,7 +259,7 @@ DefaultRegionSecurityPoliciesRestStub::ListRegionSecurityPolicies(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
@@ -344,7 +344,7 @@ DefaultRegionSecurityPoliciesRestStub::AsyncPatchRule(
                                     std::to_string(request.priority())),
                      std::make_pair("update_mask", request.update_mask()),
                      std::make_pair("validate_only",
-                                    request.validate_only() ? "1" : "0")})));
+                                    (request.validate_only() ? "1" : "0"))})));
       },
       std::move(p),
       service_,
@@ -374,7 +374,7 @@ DefaultRegionSecurityPoliciesRestStub::PatchRule(
           {std::make_pair("priority", std::to_string(request.priority())),
            std::make_pair("update_mask", request.update_mask()),
            std::make_pair("validate_only",
-                          request.validate_only() ? "1" : "0")}));
+                          (request.validate_only() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_stub.cc b/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_stub.cc
index 742ec6e9004aa..15adab06e7a46 100644
--- a/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_stub.cc
+++ b/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_rest_stub.cc
@@ -183,7 +183,7 @@ DefaultRegionSslCertificatesRestStub::ListRegionSslCertificates(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_stub.cc b/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_stub.cc
index 461d7243c015e..771eeffa33410 100644
--- a/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_stub.cc
+++ b/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_rest_stub.cc
@@ -180,7 +180,7 @@ DefaultRegionSslPoliciesRestStub::ListRegionSslPolicies(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<
@@ -204,7 +204,7 @@ DefaultRegionSslPoliciesRestStub::ListAvailableFeatures(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_stub.cc b/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_stub.cc
index 38153820ce164..c668554838ee3 100644
--- a/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_stub.cc
+++ b/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_rest_stub.cc
@@ -184,7 +184,7 @@ DefaultRegionTargetHttpProxiesRestStub::ListRegionTargetHttpProxies(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_stub.cc b/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_stub.cc
index ff29145339837..12cc5fdb37e27 100644
--- a/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_stub.cc
+++ b/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_rest_stub.cc
@@ -185,7 +185,7 @@ DefaultRegionTargetHttpsProxiesRestStub::ListRegionTargetHttpsProxies(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_stub.cc b/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_stub.cc
index 1709ace7d1604..8186f7caf214d 100644
--- a/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_stub.cc
+++ b/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_rest_stub.cc
@@ -184,7 +184,7 @@ DefaultRegionTargetTcpProxiesRestStub::ListRegionTargetTcpProxies(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_stub.cc b/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_stub.cc
index 28d92d0b3145a..02a7b7b434198 100644
--- a/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_stub.cc
+++ b/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_rest_stub.cc
@@ -176,7 +176,7 @@ DefaultRegionUrlMapsRestStub::ListRegionUrlMaps(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/region_zones/v1/internal/region_zones_rest_stub.cc b/google/cloud/compute/region_zones/v1/internal/region_zones_rest_stub.cc
index f342d379727fe..9a1e705b7bdbc 100644
--- a/google/cloud/compute/region_zones/v1/internal/region_zones_rest_stub.cc
+++ b/google/cloud/compute/region_zones/v1/internal/region_zones_rest_stub.cc
@@ -57,7 +57,7 @@ DefaultRegionZonesRestStub::ListRegionZones(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
diff --git a/google/cloud/compute/regions/v1/internal/regions_rest_stub.cc b/google/cloud/compute/regions/v1/internal/regions_rest_stub.cc
index d4b17de2e6d6c..0aa972fac3728 100644
--- a/google/cloud/compute/regions/v1/internal/regions_rest_stub.cc
+++ b/google/cloud/compute/regions/v1/internal/regions_rest_stub.cc
@@ -69,7 +69,7 @@ DefaultRegionsRestStub::ListRegions(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
diff --git a/google/cloud/compute/reservations/v1/internal/reservations_rest_stub.cc b/google/cloud/compute/reservations/v1/internal/reservations_rest_stub.cc
index 94a475810853c..a85014817840c 100644
--- a/google/cloud/compute/reservations/v1/internal/reservations_rest_stub.cc
+++ b/google/cloud/compute/reservations/v1/internal/reservations_rest_stub.cc
@@ -61,12 +61,12 @@ DefaultReservationsRestStub::AggregatedListReservations(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -222,7 +222,7 @@ DefaultReservationsRestStub::ListReservations(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_stub.cc b/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_stub.cc
index c443ffd11ce4c..adf6a8b547e54 100644
--- a/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_stub.cc
+++ b/google/cloud/compute/resource_policies/v1/internal/resource_policies_rest_stub.cc
@@ -62,12 +62,12 @@ DefaultResourcePoliciesRestStub::AggregatedListResourcePolicies(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -227,7 +227,7 @@ DefaultResourcePoliciesRestStub::ListResourcePolicies(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/routers/v1/internal/routers_rest_stub.cc b/google/cloud/compute/routers/v1/internal/routers_rest_stub.cc
index 9ff13c5b47135..850a49ab558fc 100644
--- a/google/cloud/compute/routers/v1/internal/routers_rest_stub.cc
+++ b/google/cloud/compute/routers/v1/internal/routers_rest_stub.cc
@@ -61,12 +61,12 @@ DefaultRoutersRestStub::AggregatedListRouters(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -172,7 +172,7 @@ DefaultRoutersRestStub::GetNatMappingInfo(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::RouterStatusResponse>
@@ -258,7 +258,7 @@ DefaultRoutersRestStub::ListRouters(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/routes/v1/internal/routes_rest_stub.cc b/google/cloud/compute/routes/v1/internal/routes_rest_stub.cc
index 3325cc7c65989..e4377e0ee8f59 100644
--- a/google/cloud/compute/routes/v1/internal/routes_rest_stub.cc
+++ b/google/cloud/compute/routes/v1/internal/routes_rest_stub.cc
@@ -173,7 +173,7 @@ DefaultRoutesRestStub::ListRoutes(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/security_policies/v1/internal/security_policies_rest_stub.cc b/google/cloud/compute/security_policies/v1/internal/security_policies_rest_stub.cc
index 6573a26670160..960329d9bed72 100644
--- a/google/cloud/compute/security_policies/v1/internal/security_policies_rest_stub.cc
+++ b/google/cloud/compute/security_policies/v1/internal/security_policies_rest_stub.cc
@@ -68,7 +68,7 @@ DefaultSecurityPoliciesRestStub::AsyncAddRule(
                              "global", "/", "securityPolicies", "/",
                              request.security_policy(), "/", "addRule"),
                 rest_internal::TrimEmptyQueryParameters({std::make_pair(
-                    "validate_only", request.validate_only() ? "1" : "0")})));
+                    "validate_only", (request.validate_only() ? "1" : "0"))})));
       },
       std::move(p),
       service_,
@@ -95,7 +95,7 @@ DefaultSecurityPoliciesRestStub::AddRule(
                    "securityPolicies", "/", request.security_policy(), "/",
                    "addRule"),
       rest_internal::TrimEmptyQueryParameters({std::make_pair(
-          "validate_only", request.validate_only() ? "1" : "0")}));
+          "validate_only", (request.validate_only() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::SecurityPoliciesAggregatedList>
@@ -114,12 +114,12 @@ DefaultSecurityPoliciesRestStub::AggregatedListSecurityPolicies(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -229,7 +229,7 @@ DefaultSecurityPoliciesRestStub::AsyncInsertSecurityPolicy(
                 rest_internal::TrimEmptyQueryParameters(
                     {std::make_pair("request_id", request.request_id()),
                      std::make_pair("validate_only",
-                                    request.validate_only() ? "1" : "0")})));
+                                    (request.validate_only() ? "1" : "0"))})));
       },
       std::move(p),
       service_,
@@ -257,7 +257,7 @@ DefaultSecurityPoliciesRestStub::InsertSecurityPolicy(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("request_id", request.request_id()),
            std::make_pair("validate_only",
-                          request.validate_only() ? "1" : "0")}));
+                          (request.validate_only() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::SecurityPolicyList>
@@ -279,7 +279,7 @@ DefaultSecurityPoliciesRestStub::ListSecurityPolicies(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::
@@ -303,7 +303,7 @@ DefaultSecurityPoliciesRestStub::ListPreconfiguredExpressionSets(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
@@ -385,7 +385,7 @@ DefaultSecurityPoliciesRestStub::AsyncPatchRule(
                                     std::to_string(request.priority())),
                      std::make_pair("update_mask", request.update_mask()),
                      std::make_pair("validate_only",
-                                    request.validate_only() ? "1" : "0")})));
+                                    (request.validate_only() ? "1" : "0"))})));
       },
       std::move(p),
       service_,
@@ -415,7 +415,7 @@ DefaultSecurityPoliciesRestStub::PatchRule(
           {std::make_pair("priority", std::to_string(request.priority())),
            std::make_pair("update_mask", request.update_mask()),
            std::make_pair("validate_only",
-                          request.validate_only() ? "1" : "0")}));
+                          (request.validate_only() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_stub.cc b/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_stub.cc
index 42712c77565c1..db9a7bd8f0f66 100644
--- a/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_stub.cc
+++ b/google/cloud/compute/service_attachments/v1/internal/service_attachments_rest_stub.cc
@@ -62,12 +62,12 @@ DefaultServiceAttachmentsRestStub::AggregatedListServiceAttachments(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -227,7 +227,7 @@ DefaultServiceAttachmentsRestStub::ListServiceAttachments(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/snapshots/v1/internal/snapshots_rest_stub.cc b/google/cloud/compute/snapshots/v1/internal/snapshots_rest_stub.cc
index e9bd72aeb1790..9249ca8a9213e 100644
--- a/google/cloud/compute/snapshots/v1/internal/snapshots_rest_stub.cc
+++ b/google/cloud/compute/snapshots/v1/internal/snapshots_rest_stub.cc
@@ -193,7 +193,7 @@ DefaultSnapshotsRestStub::ListSnapshots(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::Policy>
diff --git a/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_stub.cc b/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_stub.cc
index e33db5a2cb4c9..3d08d1a9a3f50 100644
--- a/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_stub.cc
+++ b/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_rest_stub.cc
@@ -61,12 +61,12 @@ DefaultSslCertificatesRestStub::AggregatedListSslCertificates(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -204,7 +204,7 @@ DefaultSslCertificatesRestStub::ListSslCertificates(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_stub.cc b/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_stub.cc
index 718dc5694d1ec..73890481ebcec 100644
--- a/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_stub.cc
+++ b/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_rest_stub.cc
@@ -61,12 +61,12 @@ DefaultSslPoliciesRestStub::AggregatedListSslPolicies(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -202,7 +202,7 @@ DefaultSslPoliciesRestStub::ListSslPolicies(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<
@@ -225,7 +225,7 @@ DefaultSslPoliciesRestStub::ListAvailableFeatures(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_stub.cc b/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_stub.cc
index 5f1e0b6c45a81..f0afdec6fbe06 100644
--- a/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_stub.cc
+++ b/google/cloud/compute/storage_pool_types/v1/internal/storage_pool_types_rest_stub.cc
@@ -56,12 +56,12 @@ DefaultStoragePoolTypesRestStub::AggregatedListStoragePoolTypes(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -100,7 +100,7 @@ DefaultStoragePoolTypesRestStub::ListStoragePoolTypes(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
diff --git a/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_stub.cc b/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_stub.cc
index c712814cd3ee6..ecde366f52e06 100644
--- a/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_stub.cc
+++ b/google/cloud/compute/storage_pools/v1/internal/storage_pools_rest_stub.cc
@@ -61,12 +61,12 @@ DefaultStoragePoolsRestStub::AggregatedListStoragePools(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -222,7 +222,7 @@ DefaultStoragePoolsRestStub::ListStoragePools(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::StoragePoolListDisks>
@@ -245,7 +245,7 @@ DefaultStoragePoolsRestStub::ListDisks(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::Policy>
diff --git a/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_stub.cc b/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_stub.cc
index 12b75e3637662..a01dc1393162a 100644
--- a/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_stub.cc
+++ b/google/cloud/compute/subnetworks/v1/internal/subnetworks_rest_stub.cc
@@ -61,12 +61,12 @@ DefaultSubnetworksRestStub::AggregatedListSubnetworks(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -278,7 +278,7 @@ DefaultSubnetworksRestStub::ListSubnetworks(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::UsableSubnetworksAggregatedList>
@@ -300,7 +300,7 @@ DefaultSubnetworksRestStub::ListUsable(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_stub.cc b/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_stub.cc
index 7dbf43cee726b..30af1d6975ed5 100644
--- a/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_stub.cc
+++ b/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_rest_stub.cc
@@ -179,7 +179,7 @@ DefaultTargetGrpcProxiesRestStub::ListTargetGrpcProxies(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_stub.cc b/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_stub.cc
index 2ef2abcd046db..6138af104d2f5 100644
--- a/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_stub.cc
+++ b/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_rest_stub.cc
@@ -62,12 +62,12 @@ DefaultTargetHttpProxiesRestStub::AggregatedListTargetHttpProxies(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -205,7 +205,7 @@ DefaultTargetHttpProxiesRestStub::ListTargetHttpProxies(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_stub.cc b/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_stub.cc
index 11663d865c2ce..4a5a747f943fe 100644
--- a/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_stub.cc
+++ b/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_rest_stub.cc
@@ -63,12 +63,12 @@ DefaultTargetHttpsProxiesRestStub::AggregatedListTargetHttpsProxies(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -206,7 +206,7 @@ DefaultTargetHttpsProxiesRestStub::ListTargetHttpsProxies(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/target_instances/v1/internal/target_instances_rest_stub.cc b/google/cloud/compute/target_instances/v1/internal/target_instances_rest_stub.cc
index 759f2377c1754..4d48ed04634d3 100644
--- a/google/cloud/compute/target_instances/v1/internal/target_instances_rest_stub.cc
+++ b/google/cloud/compute/target_instances/v1/internal/target_instances_rest_stub.cc
@@ -61,12 +61,12 @@ DefaultTargetInstancesRestStub::AggregatedListTargetInstances(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -207,7 +207,7 @@ DefaultTargetInstancesRestStub::ListTargetInstances(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/target_pools/v1/internal/target_pools_rest_stub.cc b/google/cloud/compute/target_pools/v1/internal/target_pools_rest_stub.cc
index acb04c584ce63..7ab17d54ad495 100644
--- a/google/cloud/compute/target_pools/v1/internal/target_pools_rest_stub.cc
+++ b/google/cloud/compute/target_pools/v1/internal/target_pools_rest_stub.cc
@@ -169,12 +169,12 @@ DefaultTargetPoolsRestStub::AggregatedListTargetPools(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -329,7 +329,7 @@ DefaultTargetPoolsRestStub::ListTargetPools(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_stub.cc b/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_stub.cc
index d87c3adad8abe..ad02e55c77431 100644
--- a/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_stub.cc
+++ b/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_rest_stub.cc
@@ -179,7 +179,7 @@ DefaultTargetSslProxiesRestStub::ListTargetSslProxies(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_stub.cc b/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_stub.cc
index be4f63e4eada7..204d76b3dd472 100644
--- a/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_stub.cc
+++ b/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_rest_stub.cc
@@ -62,12 +62,12 @@ DefaultTargetTcpProxiesRestStub::AggregatedListTargetTcpProxies(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -205,7 +205,7 @@ DefaultTargetTcpProxiesRestStub::ListTargetTcpProxies(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_stub.cc b/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_stub.cc
index eaf81ed42eae5..78f25951ea01c 100644
--- a/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_stub.cc
+++ b/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_rest_stub.cc
@@ -62,12 +62,12 @@ DefaultTargetVpnGatewaysRestStub::AggregatedListTargetVpnGateways(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -209,7 +209,7 @@ DefaultTargetVpnGatewaysRestStub::ListTargetVpnGateways(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/url_maps/v1/internal/url_maps_rest_stub.cc b/google/cloud/compute/url_maps/v1/internal/url_maps_rest_stub.cc
index 64c3adac8e944..c39efbad4a1d2 100644
--- a/google/cloud/compute/url_maps/v1/internal/url_maps_rest_stub.cc
+++ b/google/cloud/compute/url_maps/v1/internal/url_maps_rest_stub.cc
@@ -61,12 +61,12 @@ DefaultUrlMapsRestStub::AggregatedListUrlMaps(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -253,7 +253,7 @@ DefaultUrlMapsRestStub::ListUrlMaps(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_stub.cc b/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_stub.cc
index e239a6fbe1713..9151385149676 100644
--- a/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_stub.cc
+++ b/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_rest_stub.cc
@@ -61,12 +61,12 @@ DefaultVpnGatewaysRestStub::AggregatedListVpnGateways(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -221,7 +221,7 @@ DefaultVpnGatewaysRestStub::ListVpnGateways(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_stub.cc b/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_stub.cc
index be2b16be0cda2..fe8b44f36bea3 100644
--- a/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_stub.cc
+++ b/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_rest_stub.cc
@@ -61,12 +61,12 @@ DefaultVpnTunnelsRestStub::AggregatedListVpnTunnels(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("filter", request.filter()),
            std::make_pair("include_all_scopes",
-                          request.include_all_scopes() ? "1" : "0"),
+                          (request.include_all_scopes() ? "1" : "0")),
            std::make_pair("max_results", std::to_string(request.max_results())),
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0"),
+                          (request.return_partial_success() ? "1" : "0")),
            std::make_pair("service_project_number",
                           request.service_project_number())}));
 }
@@ -205,7 +205,7 @@ DefaultVpnTunnelsRestStub::ListVpnTunnels(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::cloud::cpp::compute::v1::Operation>>
diff --git a/google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_stub.cc b/google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_stub.cc
index c5c67c639b4fc..202876cc61514 100644
--- a/google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_stub.cc
+++ b/google/cloud/compute/zone_operations/v1/internal/zone_operations_rest_stub.cc
@@ -86,7 +86,7 @@ DefaultZoneOperationsRestStub::ListZoneOperations(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::cpp::compute::v1::Operation>
diff --git a/google/cloud/compute/zones/v1/internal/zones_rest_stub.cc b/google/cloud/compute/zones/v1/internal/zones_rest_stub.cc
index aa5ab79210921..3d8425c634558 100644
--- a/google/cloud/compute/zones/v1/internal/zones_rest_stub.cc
+++ b/google/cloud/compute/zones/v1/internal/zones_rest_stub.cc
@@ -67,7 +67,7 @@ DefaultZonesRestStub::ListZones(
            std::make_pair("order_by", request.order_by()),
            std::make_pair("page_token", request.page_token()),
            std::make_pair("return_partial_success",
-                          request.return_partial_success() ? "1" : "0")}));
+                          (request.return_partial_success() ? "1" : "0"))}));
 }
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
diff --git a/google/cloud/spanner/admin/internal/instance_admin_rest_stub.cc b/google/cloud/spanner/admin/internal/instance_admin_rest_stub.cc
index 49fbe86549e67..c913ec96b90d8 100644
--- a/google/cloud/spanner/admin/internal/instance_admin_rest_stub.cc
+++ b/google/cloud/spanner/admin/internal/instance_admin_rest_stub.cc
@@ -94,7 +94,7 @@ DefaultInstanceAdminRestStub::AsyncCreateInstanceConfig(
                 {std::make_pair("instance_config_id",
                                 request.instance_config_id()),
                  std::make_pair("validate_only",
-                                request.validate_only() ? "1" : "0")})));
+                                (request.validate_only() ? "1" : "0"))})));
       },
       std::move(p),
       service_,
@@ -120,7 +120,7 @@ DefaultInstanceAdminRestStub::CreateInstanceConfig(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("instance_config_id", request.instance_config_id()),
            std::make_pair("validate_only",
-                          request.validate_only() ? "1" : "0")}));
+                          (request.validate_only() ? "1" : "0"))}));
 }
 
 future<StatusOr<google::longrunning::Operation>>
@@ -140,7 +140,7 @@ DefaultInstanceAdminRestStub::AsyncUpdateInstanceConfig(
                          rest_internal::DetermineApiVersion("v1", *options),
                          "/", request.instance_config().name()),
             rest_internal::TrimEmptyQueryParameters({std::make_pair(
-                "validate_only", request.validate_only() ? "1" : "0")})));
+                "validate_only", (request.validate_only() ? "1" : "0"))})));
       },
       std::move(p),
       service_,
@@ -164,7 +164,7 @@ DefaultInstanceAdminRestStub::UpdateInstanceConfig(
       absl::StrCat("/", rest_internal::DetermineApiVersion("v1", options), "/",
                    request.instance_config().name()),
       rest_internal::TrimEmptyQueryParameters({std::make_pair(
-          "validate_only", request.validate_only() ? "1" : "0")}));
+          "validate_only", (request.validate_only() ? "1" : "0"))}));
 }
 
 Status DefaultInstanceAdminRestStub::DeleteInstanceConfig(
@@ -179,7 +179,7 @@ Status DefaultInstanceAdminRestStub::DeleteInstanceConfig(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("etag", request.etag()),
            std::make_pair("validate_only",
-                          request.validate_only() ? "1" : "0")}));
+                          (request.validate_only() ? "1" : "0"))}));
 }
 
 StatusOr<
diff --git a/google/cloud/sql/v1/internal/sql_instances_rest_stub.cc b/google/cloud/sql/v1/internal/sql_instances_rest_stub.cc
index d784404eb3dce..846f3dcf023c9 100644
--- a/google/cloud/sql/v1/internal/sql_instances_rest_stub.cc
+++ b/google/cloud/sql/v1/internal/sql_instances_rest_stub.cc
@@ -222,7 +222,7 @@ DefaultSqlInstancesServiceRestStub::PromoteReplica(
                    "projects", "/", request.project(), "/", "instances", "/",
                    request.instance(), "/", "promoteReplica"),
       rest_internal::TrimEmptyQueryParameters(
-          {std::make_pair("failover", request.failover() ? "1" : "0")}));
+          {std::make_pair("failover", (request.failover() ? "1" : "0"))}));
 }
 
 StatusOr<google::cloud::sql::v1::Operation>
@@ -373,10 +373,10 @@ DefaultSqlInstancesServiceRestStub::VerifyExternalSyncSettings(
                    request.instance(), "/", "verifyExternalSyncSettings"),
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("verify_connection_only",
-                          request.verify_connection_only() ? "1" : "0"),
+                          (request.verify_connection_only() ? "1" : "0")),
            std::make_pair("sync_mode", std::to_string(request.sync_mode())),
            std::make_pair("verify_replication_only",
-                          request.verify_replication_only() ? "1" : "0"),
+                          (request.verify_replication_only() ? "1" : "0")),
            std::make_pair("migration_type",
                           std::to_string(request.migration_type())),
            std::make_pair("sync_parallel_level",
@@ -397,7 +397,7 @@ DefaultSqlInstancesServiceRestStub::StartExternalSync(
       rest_internal::TrimEmptyQueryParameters(
           {std::make_pair("sync_mode", std::to_string(request.sync_mode())),
            std::make_pair("skip_verification",
-                          request.skip_verification() ? "1" : "0"),
+                          (request.skip_verification() ? "1" : "0")),
            std::make_pair("sync_parallel_level",
                           std::to_string(request.sync_parallel_level())),
            std::make_pair("migration_type",