diff --git a/generator/internal/metadata_decorator_generator.cc b/generator/internal/metadata_decorator_generator.cc
index b57ad8bd7ca62..27027b8180ed0 100644
--- a/generator/internal/metadata_decorator_generator.cc
+++ b/generator/internal/metadata_decorator_generator.cc
@@ -406,10 +406,8 @@ void $metadata_class_name$::SetMetadata(grpc::ClientContext& context,
   }
   auto const& authority = options.get<AuthorityOption>();
   if (!authority.empty()) context.set_authority(authority);
-  if (options.has<google::cloud::CustomHeadersOption>()) {
-    for (auto const& h : options.get<google::cloud::CustomHeadersOption>()) {
-      context.AddMetadata(h.first, h.second);
-    }
+  for (auto const& h : options.get<CustomHeadersOption>()) {
+    context.AddMetadata(h.first, h.second);
   }
 }
 )""");
diff --git a/generator/internal/metadata_decorator_rest_generator.cc b/generator/internal/metadata_decorator_rest_generator.cc
index 92596e8ea19cb..b275e0af7cc8b 100644
--- a/generator/internal/metadata_decorator_rest_generator.cc
+++ b/generator/internal/metadata_decorator_rest_generator.cc
@@ -389,21 +389,19 @@ void $metadata_rest_class_name$::SetMetadata(
     rest_context.AddHeader(
         "x-goog-user-project", options.get<UserProjectOption>());
   }
-  if (options.has<google::cloud::QuotaUserOption>()) {
+  if (options.has<QuotaUserOption>()) {
     rest_context.AddHeader(
-        "x-goog-quota-user", options.get<google::cloud::QuotaUserOption>());
+        "x-goog-quota-user", options.get<QuotaUserOption>());
   }
-  if (options.has<google::cloud::ServerTimeoutOption>()) {
+  if (options.has<ServerTimeoutOption>()) {
     auto ms_rep = absl::StrCat(
-        absl::Dec(options.get<google::cloud::ServerTimeoutOption>().count(),
+        absl::Dec(options.get<ServerTimeoutOption>().count(),
         absl::kZeroPad4));
     rest_context.AddHeader("x-server-timeout",
         ms_rep.insert(ms_rep.size() - 3, "."));
   }
-  if (options.has<google::cloud::CustomHeadersOption>()) {
-    for (auto const& h : options.get<google::cloud::CustomHeadersOption>()) {
-      rest_context.AddHeader(h.first, h.second);
-    }
+  for (auto const& h : options.get<CustomHeadersOption>()) {
+    rest_context.AddHeader(h.first, h.second);
   }
 }
 )""");
diff --git a/google/cloud/common_options.h b/google/cloud/common_options.h
index cfea508a4d1d8..4543f72a1f8a7 100644
--- a/google/cloud/common_options.h
+++ b/google/cloud/common_options.h
@@ -68,6 +68,8 @@ struct UserAgentProductsOption {
  *
  * - rpc
  * - rpc-streams
+ *
+ * @ingroup options
  */
 struct TracingComponentsOption {
   using Type = std::set<std::string>;
@@ -223,6 +225,8 @@ struct ProxyOption {
  *
  * For example, the server may know it is safe to retry a non-idempotent
  * request, or safe to retry a status code that is typically a permanent error.
+ *
+ * @ingroup options
  */
 struct EnableServerRetriesOption {
   using Type = bool;
@@ -233,6 +237,8 @@ struct EnableServerRetriesOption {
  *
  * For REST endpoints, these headers are added to the HTTP headers. For gRPC
  * endpoints, these headers are added to the `grpc::ClientContext` metadata.
+ *
+ * @ingroup options
  */
 struct CustomHeadersOption {
   using Type = std::unordered_multimap<std::string, std::string>;