diff --git a/progenitor-impl/src/method.rs b/progenitor-impl/src/method.rs
index 8a26beb..c2a5d4b 100644
--- a/progenitor-impl/src/method.rs
+++ b/progenitor-impl/src/method.rs
@@ -1401,18 +1401,26 @@ impl Generator {
                     OperationParameterType::Type(type_id) => {
                         let ty = self.type_space.get_type(type_id)?;
                         let details = ty.details();
-                        let err_msg = format!("conversion to `{}` for {} failed", ty.name(), param.name);
                         match &details {
-                            typify::TypeDetails::Option(ref opt_id) => {
+                            typify::TypeDetails::Option(opt_id) => {
                                 // TODO currently we explicitly turn optional
-                                // parameters into Option types; we could probably
-                                // defer this to the code generation step to avoid the
-                                // special handling here.
-                                let typ = self.type_space.get_type(opt_id)?.ident();
+                                // parameters into Option types; we could
+                                // probably defer this to the code generation
+                                // step to avoid the special handling here.
+                                let inner_type =
+                                    self.type_space.get_type(opt_id)?;
+                                let typ = inner_type.ident();
+                                let err_msg = format!(
+                                    "conversion to `{}` for {} failed",
+                                    inner_type.name(),
+                                    param.name,
+                                );
                                 Ok(quote! {
-                                    pub fn #param_name<V>(mut self, value: V)
-                                    -> Self
-                                        where V: std::convert::TryInto<#typ>
+                                    pub fn #param_name<V>(
+                                        mut self,
+                                        value: V,
+                                    ) -> Self
+                                        where V: std::convert::TryInto<#typ>,
                                     {
                                         self.#param_name = value.try_into()
                                             .map(Some)
@@ -1423,8 +1431,16 @@ impl Generator {
                             }
                             _ => {
                                 let typ = ty.ident();
+                                let err_msg = format!(
+                                    "conversion to `{}` for {} failed",
+                                    ty.name(),
+                                    param.name,
+                                );
                                 Ok(quote! {
-                                    pub fn #param_name<V>(mut self, value: V) -> Self
+                                    pub fn #param_name<V>(
+                                        mut self,
+                                        value: V,
+                                    ) -> Self
                                         where V: std::convert::TryInto<#typ>,
                                     {
                                         self.#param_name = value.try_into()
@@ -1437,8 +1453,10 @@ impl Generator {
                     }
 
                     OperationParameterType::RawBody => {
-                        let err_msg =
-                            format!("conversion to `reqwest::Body` for {} failed", param.name);
+                        let err_msg = format!(
+                            "conversion to `reqwest::Body` for {} failed",
+                            param.name,
+                        );
 
                         Ok(quote! {
                             pub fn #param_name<B>(mut self, value: B) -> Self
diff --git a/progenitor-impl/tests/output/buildomat-builder-tagged.out b/progenitor-impl/tests/output/buildomat-builder-tagged.out
index 204aa4c..7e75267 100644
--- a/progenitor-impl/tests/output/buildomat-builder-tagged.out
+++ b/progenitor-impl/tests/output/buildomat-builder-tagged.out
@@ -1856,7 +1856,7 @@ pub mod builder {
             self.minseq = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < u32 >` for minseq failed".to_string());
+                .map_err(|_| "conversion to `u32` for minseq failed".to_string());
             self
         }
 
diff --git a/progenitor-impl/tests/output/buildomat-builder.out b/progenitor-impl/tests/output/buildomat-builder.out
index 6b7811f..1492562 100644
--- a/progenitor-impl/tests/output/buildomat-builder.out
+++ b/progenitor-impl/tests/output/buildomat-builder.out
@@ -1856,7 +1856,7 @@ pub mod builder {
             self.minseq = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < u32 >` for minseq failed".to_string());
+                .map_err(|_| "conversion to `u32` for minseq failed".to_string());
             self
         }
 
diff --git a/progenitor-impl/tests/output/nexus-builder-tagged.out b/progenitor-impl/tests/output/nexus-builder-tagged.out
index 068cecd..8f9a677 100644
--- a/progenitor-impl/tests/output/nexus-builder-tagged.out
+++ b/progenitor-impl/tests/output/nexus-builder-tagged.out
@@ -20067,7 +20067,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -20079,7 +20079,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -20087,9 +20087,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -20518,7 +20519,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -20530,7 +20531,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -20538,9 +20539,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrIdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrIdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrIdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -21024,7 +21026,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -21036,7 +21038,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -21044,9 +21046,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrIdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrIdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrIdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -21492,7 +21495,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -21504,7 +21507,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -21512,9 +21515,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -21950,7 +21954,7 @@ pub mod builder {
         where
             V: std::convert::TryInto<chrono::DateTime<chrono::offset::Utc>>,
         {
-            self . end_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `Option < chrono :: DateTime < chrono :: offset :: Utc > >` for end_time failed" . to_string ()) ;
+            self . end_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for end_time failed" . to_string ()) ;
             self
         }
 
@@ -21959,7 +21963,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -21971,7 +21975,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -21979,7 +21983,7 @@ pub mod builder {
         where
             V: std::convert::TryInto<chrono::DateTime<chrono::offset::Utc>>,
         {
-            self . start_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `Option < chrono :: DateTime < chrono :: offset :: Utc > >` for start_time failed" . to_string ()) ;
+            self . start_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for start_time failed" . to_string ()) ;
             self
         }
 
@@ -22145,7 +22149,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -22157,7 +22161,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -22165,9 +22169,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -22578,7 +22583,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -22590,7 +22595,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -22598,9 +22603,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -23026,7 +23032,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -23038,7 +23044,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -23046,9 +23052,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -23609,7 +23616,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -23621,7 +23628,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -23629,9 +23636,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -24317,7 +24325,7 @@ pub mod builder {
             self.from_start = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < u64 >` for from_start failed".to_string());
+                .map_err(|_| "conversion to `u64` for from_start failed".to_string());
             self
         }
 
@@ -24328,7 +24336,7 @@ pub mod builder {
             self.max_bytes = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < u64 >` for max_bytes failed".to_string());
+                .map_err(|_| "conversion to `u64` for max_bytes failed".to_string());
             self
         }
 
@@ -24339,7 +24347,7 @@ pub mod builder {
             self.most_recent = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < u64 >` for most_recent failed".to_string());
+                .map_err(|_| "conversion to `u64` for most_recent failed".to_string());
             self
         }
 
@@ -24878,7 +24886,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -24890,7 +24898,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -24898,9 +24906,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -25314,7 +25323,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -25326,7 +25335,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -25334,9 +25343,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -26052,7 +26062,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -26064,7 +26074,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -26072,9 +26082,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -26676,7 +26687,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -26688,7 +26699,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -26696,9 +26707,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -27351,7 +27363,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -27363,7 +27375,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -27371,9 +27383,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -27975,7 +27988,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -27987,7 +28000,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -27995,9 +28008,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -28217,7 +28231,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -28229,7 +28243,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -28425,7 +28439,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -28437,7 +28451,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -28445,9 +28459,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -28564,7 +28579,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -28576,7 +28591,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -28584,9 +28599,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -29017,7 +29033,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -29029,7 +29045,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -29037,9 +29053,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -29314,7 +29331,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -29326,7 +29343,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -29334,9 +29351,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -29453,7 +29471,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -29465,7 +29483,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -29473,9 +29491,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -29644,7 +29663,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -29656,7 +29675,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -29664,9 +29683,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -29847,7 +29867,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -29859,7 +29879,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -29867,9 +29887,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -29992,7 +30013,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -30004,7 +30025,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -30012,9 +30033,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -30283,7 +30305,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -30295,7 +30317,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -30303,9 +30325,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrIdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrIdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrIdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -30653,7 +30676,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -30665,7 +30688,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -30952,7 +30975,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -30964,7 +30987,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -31186,7 +31209,7 @@ pub mod builder {
         where
             V: std::convert::TryInto<chrono::DateTime<chrono::offset::Utc>>,
         {
-            self . end_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `Option < chrono :: DateTime < chrono :: offset :: Utc > >` for end_time failed" . to_string ()) ;
+            self . end_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for end_time failed" . to_string ()) ;
             self
         }
 
@@ -31205,7 +31228,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -31217,7 +31240,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -31225,7 +31248,7 @@ pub mod builder {
         where
             V: std::convert::TryInto<chrono::DateTime<chrono::offset::Utc>>,
         {
-            self . start_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `Option < chrono :: DateTime < chrono :: offset :: Utc > >` for start_time failed" . to_string ()) ;
+            self . start_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for start_time failed" . to_string ()) ;
             self
         }
 
@@ -31394,7 +31417,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -31406,7 +31429,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -31414,9 +31437,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -31585,7 +31609,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -31597,7 +31621,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -31605,9 +31629,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrIdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrIdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrIdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -31888,7 +31913,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -31900,7 +31925,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -31908,9 +31933,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -32545,7 +32571,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -32557,7 +32583,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -32565,9 +32591,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -32761,7 +32788,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -32773,7 +32800,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -32781,9 +32808,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -32950,7 +32978,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -32962,7 +32990,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -33074,7 +33102,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -33086,7 +33114,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -33094,9 +33122,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -33217,7 +33246,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -33226,9 +33255,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -33239,7 +33269,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -33250,7 +33280,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -33258,9 +33288,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrIdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrIdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrIdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -33388,9 +33419,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -33482,9 +33514,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -33495,7 +33528,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -33573,9 +33606,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -33586,7 +33620,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -33659,7 +33693,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -33668,9 +33702,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -33681,7 +33716,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -33692,7 +33727,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -33700,9 +33735,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrIdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrIdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrIdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -33830,9 +33866,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -33924,9 +33961,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -33937,7 +33975,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -34015,9 +34053,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -34028,7 +34067,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -34113,7 +34152,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -34122,9 +34161,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -34135,7 +34175,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -34146,7 +34186,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -34154,9 +34194,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrIdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrIdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrIdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -34302,9 +34343,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -34315,7 +34357,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -34407,9 +34449,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -34420,7 +34463,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -34512,9 +34555,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -34525,7 +34569,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -34615,9 +34659,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -34628,7 +34673,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -34715,7 +34760,7 @@ pub mod builder {
             self.from_start = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < u64 >` for from_start failed".to_string());
+                .map_err(|_| "conversion to `u64` for from_start failed".to_string());
             self
         }
 
@@ -34726,7 +34771,7 @@ pub mod builder {
             self.max_bytes = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < u64 >` for max_bytes failed".to_string());
+                .map_err(|_| "conversion to `u64` for max_bytes failed".to_string());
             self
         }
 
@@ -34737,7 +34782,7 @@ pub mod builder {
             self.most_recent = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < u64 >` for most_recent failed".to_string());
+                .map_err(|_| "conversion to `u64` for most_recent failed".to_string());
             self
         }
 
@@ -34745,9 +34790,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -34758,7 +34804,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -34853,9 +34899,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -34866,7 +34913,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -34956,9 +35003,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -34969,7 +35017,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -35047,9 +35095,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -35060,7 +35109,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -35129,7 +35178,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -35141,7 +35190,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -35149,9 +35198,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrIdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrIdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrIdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -35625,7 +35675,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -35634,9 +35684,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -35647,7 +35698,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -35655,9 +35706,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrIdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrIdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrIdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -35854,9 +35906,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -35929,9 +35982,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -36014,9 +36068,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -36087,9 +36142,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -36164,9 +36220,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -36244,7 +36301,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -36256,7 +36313,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -36264,9 +36321,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -36385,7 +36443,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -36397,7 +36455,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -36405,9 +36463,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -36695,7 +36754,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -36707,7 +36766,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -36715,9 +36774,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
diff --git a/progenitor-impl/tests/output/nexus-builder.out b/progenitor-impl/tests/output/nexus-builder.out
index ce04faf..6e0eed2 100644
--- a/progenitor-impl/tests/output/nexus-builder.out
+++ b/progenitor-impl/tests/output/nexus-builder.out
@@ -19859,7 +19859,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -19871,7 +19871,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -19879,9 +19879,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -20310,7 +20311,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -20322,7 +20323,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -20330,9 +20331,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrIdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrIdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrIdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -20816,7 +20818,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -20828,7 +20830,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -20836,9 +20838,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrIdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrIdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrIdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -21284,7 +21287,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -21296,7 +21299,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -21304,9 +21307,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -21742,7 +21746,7 @@ pub mod builder {
         where
             V: std::convert::TryInto<chrono::DateTime<chrono::offset::Utc>>,
         {
-            self . end_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `Option < chrono :: DateTime < chrono :: offset :: Utc > >` for end_time failed" . to_string ()) ;
+            self . end_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for end_time failed" . to_string ()) ;
             self
         }
 
@@ -21751,7 +21755,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -21763,7 +21767,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -21771,7 +21775,7 @@ pub mod builder {
         where
             V: std::convert::TryInto<chrono::DateTime<chrono::offset::Utc>>,
         {
-            self . start_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `Option < chrono :: DateTime < chrono :: offset :: Utc > >` for start_time failed" . to_string ()) ;
+            self . start_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for start_time failed" . to_string ()) ;
             self
         }
 
@@ -21937,7 +21941,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -21949,7 +21953,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -21957,9 +21961,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -22370,7 +22375,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -22382,7 +22387,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -22390,9 +22395,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -22818,7 +22824,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -22830,7 +22836,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -22838,9 +22844,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -23401,7 +23408,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -23413,7 +23420,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -23421,9 +23428,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -24109,7 +24117,7 @@ pub mod builder {
             self.from_start = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < u64 >` for from_start failed".to_string());
+                .map_err(|_| "conversion to `u64` for from_start failed".to_string());
             self
         }
 
@@ -24120,7 +24128,7 @@ pub mod builder {
             self.max_bytes = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < u64 >` for max_bytes failed".to_string());
+                .map_err(|_| "conversion to `u64` for max_bytes failed".to_string());
             self
         }
 
@@ -24131,7 +24139,7 @@ pub mod builder {
             self.most_recent = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < u64 >` for most_recent failed".to_string());
+                .map_err(|_| "conversion to `u64` for most_recent failed".to_string());
             self
         }
 
@@ -24670,7 +24678,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -24682,7 +24690,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -24690,9 +24698,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -25106,7 +25115,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -25118,7 +25127,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -25126,9 +25135,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -25844,7 +25854,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -25856,7 +25866,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -25864,9 +25874,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -26468,7 +26479,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -26480,7 +26491,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -26488,9 +26499,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -27143,7 +27155,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -27155,7 +27167,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -27163,9 +27175,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -27767,7 +27780,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -27779,7 +27792,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -27787,9 +27800,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -28009,7 +28023,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -28021,7 +28035,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -28217,7 +28231,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -28229,7 +28243,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -28237,9 +28251,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -28356,7 +28371,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -28368,7 +28383,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -28376,9 +28391,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -28809,7 +28825,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -28821,7 +28837,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -28829,9 +28845,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -29106,7 +29123,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -29118,7 +29135,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -29126,9 +29143,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -29245,7 +29263,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -29257,7 +29275,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -29265,9 +29283,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -29436,7 +29455,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -29448,7 +29467,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -29456,9 +29475,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -29639,7 +29659,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -29651,7 +29671,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -29659,9 +29679,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -29784,7 +29805,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -29796,7 +29817,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -29804,9 +29825,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -30075,7 +30097,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -30087,7 +30109,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -30095,9 +30117,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrIdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrIdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrIdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -30445,7 +30468,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -30457,7 +30480,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -30744,7 +30767,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -30756,7 +30779,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -30978,7 +31001,7 @@ pub mod builder {
         where
             V: std::convert::TryInto<chrono::DateTime<chrono::offset::Utc>>,
         {
-            self . end_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `Option < chrono :: DateTime < chrono :: offset :: Utc > >` for end_time failed" . to_string ()) ;
+            self . end_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for end_time failed" . to_string ()) ;
             self
         }
 
@@ -30997,7 +31020,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -31009,7 +31032,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -31017,7 +31040,7 @@ pub mod builder {
         where
             V: std::convert::TryInto<chrono::DateTime<chrono::offset::Utc>>,
         {
-            self . start_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `Option < chrono :: DateTime < chrono :: offset :: Utc > >` for start_time failed" . to_string ()) ;
+            self . start_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for start_time failed" . to_string ()) ;
             self
         }
 
@@ -31186,7 +31209,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -31198,7 +31221,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -31206,9 +31229,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -31377,7 +31401,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -31389,7 +31413,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -31397,9 +31421,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrIdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrIdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrIdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -31680,7 +31705,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -31692,7 +31717,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -31700,9 +31725,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -32337,7 +32363,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -32349,7 +32375,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -32357,9 +32383,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -32553,7 +32580,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -32565,7 +32592,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -32573,9 +32600,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -32742,7 +32770,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -32754,7 +32782,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -32866,7 +32894,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -32878,7 +32906,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -32886,9 +32914,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -33009,7 +33038,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -33018,9 +33047,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -33031,7 +33061,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -33042,7 +33072,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -33050,9 +33080,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrIdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrIdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrIdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -33180,9 +33211,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -33274,9 +33306,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -33287,7 +33320,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -33365,9 +33398,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -33378,7 +33412,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -33451,7 +33485,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -33460,9 +33494,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -33473,7 +33508,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -33484,7 +33519,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -33492,9 +33527,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrIdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrIdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrIdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -33622,9 +33658,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -33716,9 +33753,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -33729,7 +33767,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -33807,9 +33845,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -33820,7 +33859,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -33905,7 +33944,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -33914,9 +33953,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -33927,7 +33967,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -33938,7 +33978,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -33946,9 +33986,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrIdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrIdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrIdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -34094,9 +34135,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -34107,7 +34149,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -34199,9 +34241,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -34212,7 +34255,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -34304,9 +34347,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -34317,7 +34361,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -34407,9 +34451,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -34420,7 +34465,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -34507,7 +34552,7 @@ pub mod builder {
             self.from_start = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < u64 >` for from_start failed".to_string());
+                .map_err(|_| "conversion to `u64` for from_start failed".to_string());
             self
         }
 
@@ -34518,7 +34563,7 @@ pub mod builder {
             self.max_bytes = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < u64 >` for max_bytes failed".to_string());
+                .map_err(|_| "conversion to `u64` for max_bytes failed".to_string());
             self
         }
 
@@ -34529,7 +34574,7 @@ pub mod builder {
             self.most_recent = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < u64 >` for most_recent failed".to_string());
+                .map_err(|_| "conversion to `u64` for most_recent failed".to_string());
             self
         }
 
@@ -34537,9 +34582,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -34550,7 +34596,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -34645,9 +34691,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -34658,7 +34705,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -34748,9 +34795,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -34761,7 +34809,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -34839,9 +34887,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -34852,7 +34901,7 @@ pub mod builder {
             self.project = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < NameOrId >` for project failed".to_string());
+                .map_err(|_| "conversion to `NameOrId` for project failed".to_string());
             self
         }
 
@@ -34921,7 +34970,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -34933,7 +34982,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -34941,9 +34990,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrIdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrIdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrIdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -35417,7 +35467,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -35426,9 +35476,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -35439,7 +35490,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -35447,9 +35498,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrIdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrIdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrIdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -35646,9 +35698,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -35721,9 +35774,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -35806,9 +35860,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -35879,9 +35934,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -35956,9 +36012,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::NameOrId>,
         {
-            self.organization = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < NameOrId >` for organization failed".to_string()
-            });
+            self.organization = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `NameOrId` for organization failed".to_string());
             self
         }
 
@@ -36036,7 +36093,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -36048,7 +36105,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -36056,9 +36113,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -36177,7 +36235,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -36189,7 +36247,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -36197,9 +36255,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
@@ -36487,7 +36546,7 @@ pub mod builder {
             V: std::convert::TryInto<std::num::NonZeroU32>,
         {
             self.limit = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < std :: num :: NonZeroU32 >` for limit failed".to_string()
+                "conversion to `std :: num :: NonZeroU32` for limit failed".to_string()
             });
             self
         }
@@ -36499,7 +36558,7 @@ pub mod builder {
             self.page_token = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for page_token failed".to_string());
+                .map_err(|_| "conversion to `String` for page_token failed".to_string());
             self
         }
 
@@ -36507,9 +36566,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<types::IdSortMode>,
         {
-            self.sort_by = value.try_into().map(Some).map_err(|_| {
-                "conversion to `Option < IdSortMode >` for sort_by failed".to_string()
-            });
+            self.sort_by = value
+                .try_into()
+                .map(Some)
+                .map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
             self
         }
 
diff --git a/progenitor-impl/tests/output/param-overrides-builder-tagged.out b/progenitor-impl/tests/output/param-overrides-builder-tagged.out
index 848b7c9..99feb55 100644
--- a/progenitor-impl/tests/output/param-overrides-builder-tagged.out
+++ b/progenitor-impl/tests/output/param-overrides-builder-tagged.out
@@ -112,7 +112,7 @@ pub mod builder {
             self.key = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < bool >` for key failed".to_string());
+                .map_err(|_| "conversion to `bool` for key failed".to_string());
             self
         }
 
@@ -123,7 +123,7 @@ pub mod builder {
             self.unique_key = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for unique_key failed".to_string());
+                .map_err(|_| "conversion to `String` for unique_key failed".to_string());
             self
         }
 
diff --git a/progenitor-impl/tests/output/param-overrides-builder.out b/progenitor-impl/tests/output/param-overrides-builder.out
index 8a981d5..f7ca2df 100644
--- a/progenitor-impl/tests/output/param-overrides-builder.out
+++ b/progenitor-impl/tests/output/param-overrides-builder.out
@@ -112,7 +112,7 @@ pub mod builder {
             self.key = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < bool >` for key failed".to_string());
+                .map_err(|_| "conversion to `bool` for key failed".to_string());
             self
         }
 
@@ -123,7 +123,7 @@ pub mod builder {
             self.unique_key = value
                 .try_into()
                 .map(Some)
-                .map_err(|_| "conversion to `Option < String >` for unique_key failed".to_string());
+                .map_err(|_| "conversion to `String` for unique_key failed".to_string());
             self
         }