diff --git a/crates/jacquard-codegen-tests/src/generated/macro_mode/app_bsky/embed/external.rs b/crates/jacquard-codegen-tests/src/generated/macro_mode/app_bsky/embed/external.rs
index 152ae829..74237514 100644
--- a/crates/jacquard-codegen-tests/src/generated/macro_mode/app_bsky/embed/external.rs
+++ b/crates/jacquard-codegen-tests/src/generated/macro_mode/app_bsky/embed/external.rs
@@ -232,49 +232,49 @@ pub mod external_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Uri;
         type Description;
+        type Uri;
         type Title;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Uri = Unset;
         type Description = Unset;
+        type Uri = Unset;
         type Title = Unset;
     }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<St: State = Empty>(PhantomData<fn() -> St>);
-    impl<St: State> sealed::Sealed for SetUri<St> {}
-    impl<St: State> State for SetUri<St> {
-        type Uri = Set<members::uri>;
-        type Description = St::Description;
-        type Title = St::Title;
-    }
     ///State transition - sets the `description` field to Set
     pub struct SetDescription<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetDescription<St> {}
     impl<St: State> State for SetDescription<St> {
-        type Uri = St::Uri;
         type Description = Set<members::description>;
+        type Uri = St::Uri;
+        type Title = St::Title;
+    }
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<St: State = Empty>(PhantomData<fn() -> St>);
+    impl<St: State> sealed::Sealed for SetUri<St> {}
+    impl<St: State> State for SetUri<St> {
+        type Description = St::Description;
+        type Uri = Set<members::uri>;
         type Title = St::Title;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetTitle<St> {}
     impl<St: State> State for SetTitle<St> {
-        type Uri = St::Uri;
         type Description = St::Description;
+        type Uri = St::Uri;
         type Title = Set<members::title>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `description` field
         pub struct description(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
         ///Marker type for the `title` field
         pub struct title(());
     }
@@ -295,7 +295,7 @@ pub struct ExternalBuilder<
     _type: ::core::marker::PhantomData<fn() -> S>,
 }
 
-impl External<DefaultStr> {
+impl External<jacquard_common::DefaultStr> {
     /// Create a new builder for this type, using the default string type (DefaultStr = SmolStr) if needed
     pub fn new() -> ExternalBuilder<external_state::Empty, jacquard_common::DefaultStr> {
         ExternalBuilder::new()
@@ -410,8 +410,8 @@ where
 impl<St, S: jacquard_common::BosStr> ExternalBuilder<St, S>
 where
     St: external_state::State,
-    St::Uri: external_state::IsSet,
     St::Description: external_state::IsSet,
+    St::Uri: external_state::IsSet,
     St::Title: external_state::IsSet,
 {
     /// Build the final struct.
@@ -666,7 +666,7 @@ pub struct ExternalRecordBuilder<
     _type: ::core::marker::PhantomData<fn() -> S>,
 }
 
-impl ExternalRecord<DefaultStr> {
+impl ExternalRecord<jacquard_common::DefaultStr> {
     /// Create a new builder for this type, using the default string type (DefaultStr = SmolStr) if needed
     pub fn new() -> ExternalRecordBuilder<
         external_record_state::Empty,
@@ -797,7 +797,7 @@ pub struct ViewBuilder<
     _type: ::core::marker::PhantomData<fn() -> S>,
 }
 
-impl View<DefaultStr> {
+impl View<jacquard_common::DefaultStr> {
     /// Create a new builder for this type, using the default string type (DefaultStr = SmolStr) if needed
     pub fn new() -> ViewBuilder<view_state::Empty, jacquard_common::DefaultStr> {
         ViewBuilder::new()
@@ -952,7 +952,7 @@ pub struct ViewExternalBuilder<
     _type: ::core::marker::PhantomData<fn() -> S>,
 }
 
-impl ViewExternal<DefaultStr> {
+impl ViewExternal<jacquard_common::DefaultStr> {
     /// Create a new builder for this type, using the default string type (DefaultStr = SmolStr) if needed
     pub fn new() -> ViewExternalBuilder<
         view_external_state::Empty,
diff --git a/crates/jacquard-codegen-tests/src/generated/macro_mode/app_bsky/richtext/facet.rs b/crates/jacquard-codegen-tests/src/generated/macro_mode/app_bsky/richtext/facet.rs
index f28e7455..f66294cd 100644
--- a/crates/jacquard-codegen-tests/src/generated/macro_mode/app_bsky/richtext/facet.rs
+++ b/crates/jacquard-codegen-tests/src/generated/macro_mode/app_bsky/richtext/facet.rs
@@ -310,37 +310,37 @@ pub mod byte_slice_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ByteStart;
         type ByteEnd;
+        type ByteStart;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ByteStart = Unset;
         type ByteEnd = Unset;
-    }
-    ///State transition - sets the `byte_start` field to Set
-    pub struct SetByteStart<St: State = Empty>(PhantomData<fn() -> St>);
-    impl<St: State> sealed::Sealed for SetByteStart<St> {}
-    impl<St: State> State for SetByteStart<St> {
-        type ByteStart = Set<members::byte_start>;
-        type ByteEnd = St::ByteEnd;
+        type ByteStart = Unset;
     }
     ///State transition - sets the `byte_end` field to Set
     pub struct SetByteEnd<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetByteEnd<St> {}
     impl<St: State> State for SetByteEnd<St> {
-        type ByteStart = St::ByteStart;
         type ByteEnd = Set<members::byte_end>;
+        type ByteStart = St::ByteStart;
+    }
+    ///State transition - sets the `byte_start` field to Set
+    pub struct SetByteStart<St: State = Empty>(PhantomData<fn() -> St>);
+    impl<St: State> sealed::Sealed for SetByteStart<St> {}
+    impl<St: State> State for SetByteStart<St> {
+        type ByteEnd = St::ByteEnd;
+        type ByteStart = Set<members::byte_start>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `byte_start` field
-        pub struct byte_start(());
         ///Marker type for the `byte_end` field
         pub struct byte_end(());
+        ///Marker type for the `byte_start` field
+        pub struct byte_start(());
     }
 }
 
@@ -354,7 +354,7 @@ pub struct ByteSliceBuilder<
     _type: ::core::marker::PhantomData<fn() -> S>,
 }
 
-impl ByteSlice<DefaultStr> {
+impl ByteSlice<jacquard_common::DefaultStr> {
     /// Create a new builder for this type, using the default string type (DefaultStr = SmolStr) if needed
     pub fn new() -> ByteSliceBuilder<
         byte_slice_state::Empty,
@@ -434,8 +434,8 @@ where
 impl<St, S: jacquard_common::BosStr> ByteSliceBuilder<St, S>
 where
     St: byte_slice_state::State,
-    St::ByteStart: byte_slice_state::IsSet,
     St::ByteEnd: byte_slice_state::IsSet,
+    St::ByteStart: byte_slice_state::IsSet,
 {
     /// Build the final struct.
     pub fn build(self) -> ByteSlice<S> {
@@ -699,7 +699,7 @@ pub struct LinkBuilder<
     _type: ::core::marker::PhantomData<fn() -> S>,
 }
 
-impl Link<DefaultStr> {
+impl Link<jacquard_common::DefaultStr> {
     /// Create a new builder for this type, using the default string type (DefaultStr = SmolStr) if needed
     pub fn new() -> LinkBuilder<link_state::Empty, jacquard_common::DefaultStr> {
         LinkBuilder::new()
@@ -838,7 +838,7 @@ pub struct FacetBuilder<
     _type: ::core::marker::PhantomData<fn() -> S>,
 }
 
-impl Facet<DefaultStr> {
+impl Facet<jacquard_common::DefaultStr> {
     /// Create a new builder for this type, using the default string type (DefaultStr = SmolStr) if needed
     pub fn new() -> FacetBuilder<facet_state::Empty, jacquard_common::DefaultStr> {
         FacetBuilder::new()
@@ -984,7 +984,7 @@ pub struct MentionBuilder<
     _type: ::core::marker::PhantomData<fn() -> S>,
 }
 
-impl Mention<DefaultStr> {
+impl Mention<jacquard_common::DefaultStr> {
     /// Create a new builder for this type, using the default string type (DefaultStr = SmolStr) if needed
     pub fn new() -> MentionBuilder<mention_state::Empty, jacquard_common::DefaultStr> {
         MentionBuilder::new()
diff --git a/crates/jacquard-codegen-tests/src/generated/macro_mode/com_atproto/label.rs b/crates/jacquard-codegen-tests/src/generated/macro_mode/com_atproto/label.rs
index 28d17e9d..ec48bb62 100644
--- a/crates/jacquard-codegen-tests/src/generated/macro_mode/com_atproto/label.rs
+++ b/crates/jacquard-codegen-tests/src/generated/macro_mode/com_atproto/label.rs
@@ -798,66 +798,66 @@ pub mod label_state {
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
         type Uri;
-        type Val;
         type Src;
         type Cts;
+        type Val;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
         type Uri = Unset;
-        type Val = Unset;
         type Src = Unset;
         type Cts = Unset;
+        type Val = Unset;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetUri<St> {}
     impl<St: State> State for SetUri<St> {
         type Uri = Set<members::uri>;
-        type Val = St::Val;
-        type Src = St::Src;
-        type Cts = St::Cts;
-    }
-    ///State transition - sets the `val` field to Set
-    pub struct SetVal<St: State = Empty>(PhantomData<fn() -> St>);
-    impl<St: State> sealed::Sealed for SetVal<St> {}
-    impl<St: State> State for SetVal<St> {
-        type Uri = St::Uri;
-        type Val = Set<members::val>;
         type Src = St::Src;
         type Cts = St::Cts;
+        type Val = St::Val;
     }
     ///State transition - sets the `src` field to Set
     pub struct SetSrc<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetSrc<St> {}
     impl<St: State> State for SetSrc<St> {
         type Uri = St::Uri;
-        type Val = St::Val;
         type Src = Set<members::src>;
         type Cts = St::Cts;
+        type Val = St::Val;
     }
     ///State transition - sets the `cts` field to Set
     pub struct SetCts<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetCts<St> {}
     impl<St: State> State for SetCts<St> {
         type Uri = St::Uri;
-        type Val = St::Val;
         type Src = St::Src;
         type Cts = Set<members::cts>;
+        type Val = St::Val;
+    }
+    ///State transition - sets the `val` field to Set
+    pub struct SetVal<St: State = Empty>(PhantomData<fn() -> St>);
+    impl<St: State> sealed::Sealed for SetVal<St> {}
+    impl<St: State> State for SetVal<St> {
+        type Uri = St::Uri;
+        type Src = St::Src;
+        type Cts = St::Cts;
+        type Val = Set<members::val>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
         ///Marker type for the `uri` field
         pub struct uri(());
-        ///Marker type for the `val` field
-        pub struct val(());
         ///Marker type for the `src` field
         pub struct src(());
         ///Marker type for the `cts` field
         pub struct cts(());
+        ///Marker type for the `val` field
+        pub struct val(());
     }
 }
 
@@ -881,7 +881,7 @@ pub struct LabelBuilder<
     _type: ::core::marker::PhantomData<fn() -> S>,
 }
 
-impl Label<DefaultStr> {
+impl Label<jacquard_common::DefaultStr> {
     /// Create a new builder for this type, using the default string type (DefaultStr = SmolStr) if needed
     pub fn new() -> LabelBuilder<label_state::Empty, jacquard_common::DefaultStr> {
         LabelBuilder::new()
@@ -1080,9 +1080,9 @@ impl<St, S: jacquard_common::BosStr> LabelBuilder<St, S>
 where
     St: label_state::State,
     St::Uri: label_state::IsSet,
-    St::Val: label_state::IsSet,
     St::Src: label_state::IsSet,
     St::Cts: label_state::IsSet,
+    St::Val: label_state::IsSet,
 {
     /// Build the final struct.
     pub fn build(self) -> Label<S> {
@@ -1536,67 +1536,67 @@ pub mod label_value_definition_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Severity;
         type Locales;
-        type Blurs;
+        type Severity;
         type Identifier;
+        type Blurs;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Severity = Unset;
         type Locales = Unset;
-        type Blurs = Unset;
+        type Severity = Unset;
         type Identifier = Unset;
-    }
-    ///State transition - sets the `severity` field to Set
-    pub struct SetSeverity<St: State = Empty>(PhantomData<fn() -> St>);
-    impl<St: State> sealed::Sealed for SetSeverity<St> {}
-    impl<St: State> State for SetSeverity<St> {
-        type Severity = Set<members::severity>;
-        type Locales = St::Locales;
-        type Blurs = St::Blurs;
-        type Identifier = St::Identifier;
+        type Blurs = Unset;
     }
     ///State transition - sets the `locales` field to Set
     pub struct SetLocales<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetLocales<St> {}
     impl<St: State> State for SetLocales<St> {
-        type Severity = St::Severity;
         type Locales = Set<members::locales>;
-        type Blurs = St::Blurs;
+        type Severity = St::Severity;
         type Identifier = St::Identifier;
+        type Blurs = St::Blurs;
     }
-    ///State transition - sets the `blurs` field to Set
-    pub struct SetBlurs<St: State = Empty>(PhantomData<fn() -> St>);
-    impl<St: State> sealed::Sealed for SetBlurs<St> {}
-    impl<St: State> State for SetBlurs<St> {
-        type Severity = St::Severity;
+    ///State transition - sets the `severity` field to Set
+    pub struct SetSeverity<St: State = Empty>(PhantomData<fn() -> St>);
+    impl<St: State> sealed::Sealed for SetSeverity<St> {}
+    impl<St: State> State for SetSeverity<St> {
         type Locales = St::Locales;
-        type Blurs = Set<members::blurs>;
+        type Severity = Set<members::severity>;
         type Identifier = St::Identifier;
+        type Blurs = St::Blurs;
     }
     ///State transition - sets the `identifier` field to Set
     pub struct SetIdentifier<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetIdentifier<St> {}
     impl<St: State> State for SetIdentifier<St> {
-        type Severity = St::Severity;
         type Locales = St::Locales;
-        type Blurs = St::Blurs;
+        type Severity = St::Severity;
         type Identifier = Set<members::identifier>;
+        type Blurs = St::Blurs;
+    }
+    ///State transition - sets the `blurs` field to Set
+    pub struct SetBlurs<St: State = Empty>(PhantomData<fn() -> St>);
+    impl<St: State> sealed::Sealed for SetBlurs<St> {}
+    impl<St: State> State for SetBlurs<St> {
+        type Locales = St::Locales;
+        type Severity = St::Severity;
+        type Identifier = St::Identifier;
+        type Blurs = Set<members::blurs>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `severity` field
-        pub struct severity(());
         ///Marker type for the `locales` field
         pub struct locales(());
-        ///Marker type for the `blurs` field
-        pub struct blurs(());
+        ///Marker type for the `severity` field
+        pub struct severity(());
         ///Marker type for the `identifier` field
         pub struct identifier(());
+        ///Marker type for the `blurs` field
+        pub struct blurs(());
     }
 }
 
@@ -1619,7 +1619,7 @@ pub struct LabelValueDefinitionBuilder<
     _type: ::core::marker::PhantomData<fn() -> S>,
 }
 
-impl LabelValueDefinition<DefaultStr> {
+impl LabelValueDefinition<jacquard_common::DefaultStr> {
     /// Create a new builder for this type, using the default string type (DefaultStr = SmolStr) if needed
     pub fn new() -> LabelValueDefinitionBuilder<
         label_value_definition_state::Empty,
@@ -1788,10 +1788,10 @@ where
 impl<St, S: jacquard_common::BosStr> LabelValueDefinitionBuilder<St, S>
 where
     St: label_value_definition_state::State,
-    St::Severity: label_value_definition_state::IsSet,
     St::Locales: label_value_definition_state::IsSet,
-    St::Blurs: label_value_definition_state::IsSet,
+    St::Severity: label_value_definition_state::IsSet,
     St::Identifier: label_value_definition_state::IsSet,
+    St::Blurs: label_value_definition_state::IsSet,
 {
     /// Build the final struct.
     pub fn build(self) -> LabelValueDefinition<S> {
@@ -1835,51 +1835,51 @@ pub mod label_value_definition_strings_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Description;
         type Lang;
         type Name;
-        type Description;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Description = Unset;
         type Lang = Unset;
         type Name = Unset;
-        type Description = Unset;
+    }
+    ///State transition - sets the `description` field to Set
+    pub struct SetDescription<St: State = Empty>(PhantomData<fn() -> St>);
+    impl<St: State> sealed::Sealed for SetDescription<St> {}
+    impl<St: State> State for SetDescription<St> {
+        type Description = Set<members::description>;
+        type Lang = St::Lang;
+        type Name = St::Name;
     }
     ///State transition - sets the `lang` field to Set
     pub struct SetLang<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetLang<St> {}
     impl<St: State> State for SetLang<St> {
+        type Description = St::Description;
         type Lang = Set<members::lang>;
         type Name = St::Name;
-        type Description = St::Description;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetName<St> {}
     impl<St: State> State for SetName<St> {
-        type Lang = St::Lang;
-        type Name = Set<members::name>;
         type Description = St::Description;
-    }
-    ///State transition - sets the `description` field to Set
-    pub struct SetDescription<St: State = Empty>(PhantomData<fn() -> St>);
-    impl<St: State> sealed::Sealed for SetDescription<St> {}
-    impl<St: State> State for SetDescription<St> {
         type Lang = St::Lang;
-        type Name = St::Name;
-        type Description = Set<members::description>;
+        type Name = Set<members::name>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `description` field
+        pub struct description(());
         ///Marker type for the `lang` field
         pub struct lang(());
         ///Marker type for the `name` field
         pub struct name(());
-        ///Marker type for the `description` field
-        pub struct description(());
     }
 }
 
@@ -1897,7 +1897,7 @@ pub struct LabelValueDefinitionStringsBuilder<
     _type: ::core::marker::PhantomData<fn() -> S>,
 }
 
-impl LabelValueDefinitionStrings<DefaultStr> {
+impl LabelValueDefinitionStrings<jacquard_common::DefaultStr> {
     /// Create a new builder for this type, using the default string type (DefaultStr = SmolStr) if needed
     pub fn new() -> LabelValueDefinitionStringsBuilder<
         label_value_definition_strings_state::Empty,
@@ -2013,9 +2013,9 @@ where
 impl<St, S: jacquard_common::BosStr> LabelValueDefinitionStringsBuilder<St, S>
 where
     St: label_value_definition_strings_state::State,
+    St::Description: label_value_definition_strings_state::IsSet,
     St::Lang: label_value_definition_strings_state::IsSet,
     St::Name: label_value_definition_strings_state::IsSet,
-    St::Description: label_value_definition_strings_state::IsSet,
 {
     /// Build the final struct.
     pub fn build(self) -> LabelValueDefinitionStrings<S> {
@@ -2087,7 +2087,7 @@ pub struct SelfLabelsBuilder<
     _type: ::core::marker::PhantomData<fn() -> S>,
 }
 
-impl SelfLabels<DefaultStr> {
+impl SelfLabels<jacquard_common::DefaultStr> {
     /// Create a new builder for this type, using the default string type (DefaultStr = SmolStr) if needed
     pub fn new() -> SelfLabelsBuilder<
         self_labels_state::Empty,
diff --git a/crates/jacquard-codegen-tests/src/generated/macro_mode/com_atproto/repo/strong_ref.rs b/crates/jacquard-codegen-tests/src/generated/macro_mode/com_atproto/repo/strong_ref.rs
index 985b0f00..6f31fb35 100644
--- a/crates/jacquard-codegen-tests/src/generated/macro_mode/com_atproto/repo/strong_ref.rs
+++ b/crates/jacquard-codegen-tests/src/generated/macro_mode/com_atproto/repo/strong_ref.rs
@@ -104,7 +104,7 @@ pub struct StrongRefBuilder<
     _type: ::core::marker::PhantomData<fn() -> S>,
 }
 
-impl StrongRef<DefaultStr> {
+impl StrongRef<jacquard_common::DefaultStr> {
     /// Create a new builder for this type, using the default string type (DefaultStr = SmolStr) if needed
     pub fn new() -> StrongRefBuilder<
         strong_ref_state::Empty,
diff --git a/crates/jacquard-codegen-tests/src/generated/macro_mode/test_collision/collection.rs b/crates/jacquard-codegen-tests/src/generated/macro_mode/test_collision/collection.rs
index 7a178fd8..d468312b 100644
--- a/crates/jacquard-codegen-tests/src/generated/macro_mode/test_collision/collection.rs
+++ b/crates/jacquard-codegen-tests/src/generated/macro_mode/test_collision/collection.rs
@@ -371,7 +371,7 @@ pub struct CollectionRecordBuilder<
     _type: ::core::marker::PhantomData<fn() -> S>,
 }
 
-impl CollectionRecord<DefaultStr> {
+impl CollectionRecord<jacquard_common::DefaultStr> {
     /// Create a new builder for this type, using the default string type (DefaultStr = SmolStr) if needed
     pub fn new() -> CollectionRecordBuilder<
         collection_record_state::Empty,
diff --git a/crates/jacquard-codegen-tests/src/generated/macro_mode/test_collision/did.rs b/crates/jacquard-codegen-tests/src/generated/macro_mode/test_collision/did.rs
index 1ce5a513..7bd164ae 100644
--- a/crates/jacquard-codegen-tests/src/generated/macro_mode/test_collision/did.rs
+++ b/crates/jacquard-codegen-tests/src/generated/macro_mode/test_collision/did.rs
@@ -264,37 +264,37 @@ pub mod did_record_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Owner;
         type Identifier;
+        type Owner;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Owner = Unset;
         type Identifier = Unset;
-    }
-    ///State transition - sets the `owner` field to Set
-    pub struct SetOwner<St: State = Empty>(PhantomData<fn() -> St>);
-    impl<St: State> sealed::Sealed for SetOwner<St> {}
-    impl<St: State> State for SetOwner<St> {
-        type Owner = Set<members::owner>;
-        type Identifier = St::Identifier;
+        type Owner = Unset;
     }
     ///State transition - sets the `identifier` field to Set
     pub struct SetIdentifier<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetIdentifier<St> {}
     impl<St: State> State for SetIdentifier<St> {
-        type Owner = St::Owner;
         type Identifier = Set<members::identifier>;
+        type Owner = St::Owner;
+    }
+    ///State transition - sets the `owner` field to Set
+    pub struct SetOwner<St: State = Empty>(PhantomData<fn() -> St>);
+    impl<St: State> sealed::Sealed for SetOwner<St> {}
+    impl<St: State> State for SetOwner<St> {
+        type Identifier = St::Identifier;
+        type Owner = Set<members::owner>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `owner` field
-        pub struct owner(());
         ///Marker type for the `identifier` field
         pub struct identifier(());
+        ///Marker type for the `owner` field
+        pub struct owner(());
     }
 }
 
@@ -312,7 +312,7 @@ pub struct DidRecordBuilder<
     _type: ::core::marker::PhantomData<fn() -> S>,
 }
 
-impl DidRecord<DefaultStr> {
+impl DidRecord<jacquard_common::DefaultStr> {
     /// Create a new builder for this type, using the default string type (DefaultStr = SmolStr) if needed
     pub fn new() -> DidRecordBuilder<
         did_record_state::Empty,
@@ -405,8 +405,8 @@ where
 impl<St, S: jacquard_common::BosStr> DidRecordBuilder<St, S>
 where
     St: did_record_state::State,
-    St::Owner: did_record_state::IsSet,
     St::Identifier: did_record_state::IsSet,
+    St::Owner: did_record_state::IsSet,
 {
     /// Build the final struct.
     pub fn build(self) -> DidRecord<S> {
diff --git a/crates/jacquard-codegen-tests/src/generated/macro_mode/test_collision/option.rs b/crates/jacquard-codegen-tests/src/generated/macro_mode/test_collision/option.rs
index d056c742..bdcb80ab 100644
--- a/crates/jacquard-codegen-tests/src/generated/macro_mode/test_collision/option.rs
+++ b/crates/jacquard-codegen-tests/src/generated/macro_mode/test_collision/option.rs
@@ -180,7 +180,7 @@ pub struct OptionRecordBuilder<
     _type: ::core::marker::PhantomData<fn() -> S>,
 }
 
-impl OptionRecord<DefaultStr> {
+impl OptionRecord<jacquard_common::DefaultStr> {
     /// Create a new builder for this type, using the default string type (DefaultStr = SmolStr) if needed
     pub fn new() -> OptionRecordBuilder<
         option_record_state::Empty,
diff --git a/crates/jacquard-codegen-tests/src/generated/macro_mode/test_ns2/consumer.rs b/crates/jacquard-codegen-tests/src/generated/macro_mode/test_ns2/consumer.rs
index 8ed618a5..8edec6e5 100644
--- a/crates/jacquard-codegen-tests/src/generated/macro_mode/test_ns2/consumer.rs
+++ b/crates/jacquard-codegen-tests/src/generated/macro_mode/test_ns2/consumer.rs
@@ -110,7 +110,7 @@ pub struct ConsumerBuilder<
     _type: ::core::marker::PhantomData<fn() -> S>,
 }
 
-impl Consumer<DefaultStr> {
+impl Consumer<jacquard_common::DefaultStr> {
     /// Create a new builder for this type, using the default string type (DefaultStr = SmolStr) if needed
     pub fn new() -> ConsumerBuilder<consumer_state::Empty, jacquard_common::DefaultStr> {
         ConsumerBuilder::new()
diff --git a/crates/jacquard-codegen-tests/src/generated/macro_mode/test_ns3/collision.rs b/crates/jacquard-codegen-tests/src/generated/macro_mode/test_ns3/collision.rs
index a7cbe2ed..f52bce06 100644
--- a/crates/jacquard-codegen-tests/src/generated/macro_mode/test_ns3/collision.rs
+++ b/crates/jacquard-codegen-tests/src/generated/macro_mode/test_ns3/collision.rs
@@ -149,7 +149,7 @@ pub struct FooBuilder<
     _type: ::core::marker::PhantomData<fn() -> S>,
 }
 
-impl Foo<DefaultStr> {
+impl Foo<jacquard_common::DefaultStr> {
     /// Create a new builder for this type, using the default string type (DefaultStr = SmolStr) if needed
     pub fn new() -> FooBuilder<foo_state::Empty, jacquard_common::DefaultStr> {
         FooBuilder::new()
@@ -404,7 +404,7 @@ pub struct CollisionBuilder<
     _type: ::core::marker::PhantomData<fn() -> S>,
 }
 
-impl Collision<DefaultStr> {
+impl Collision<jacquard_common::DefaultStr> {
     /// Create a new builder for this type, using the default string type (DefaultStr = SmolStr) if needed
     pub fn new() -> CollisionBuilder<
         collision_state::Empty,
diff --git a/crates/jacquard-codegen-tests/src/generated/pretty/app_bsky/embed/external.rs b/crates/jacquard-codegen-tests/src/generated/pretty/app_bsky/embed/external.rs
index 29c14105..d56cd262 100644
--- a/crates/jacquard-codegen-tests/src/generated/pretty/app_bsky/embed/external.rs
+++ b/crates/jacquard-codegen-tests/src/generated/pretty/app_bsky/embed/external.rs
@@ -179,51 +179,51 @@ pub mod external_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Description;
         type Title;
         type Uri;
-        type Description;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Description = Unset;
         type Title = Unset;
         type Uri = Unset;
-        type Description = Unset;
+    }
+    ///State transition - sets the `description` field to Set
+    pub struct SetDescription<St: State = Empty>(PhantomData<fn() -> St>);
+    impl<St: State> sealed::Sealed for SetDescription<St> {}
+    impl<St: State> State for SetDescription<St> {
+        type Description = Set<members::description>;
+        type Title = St::Title;
+        type Uri = St::Uri;
     }
     ///State transition - sets the `title` field to Set
     pub struct SetTitle<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetTitle<St> {}
     impl<St: State> State for SetTitle<St> {
+        type Description = St::Description;
         type Title = Set<members::title>;
         type Uri = St::Uri;
-        type Description = St::Description;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetUri<St> {}
     impl<St: State> State for SetUri<St> {
-        type Title = St::Title;
-        type Uri = Set<members::uri>;
         type Description = St::Description;
-    }
-    ///State transition - sets the `description` field to Set
-    pub struct SetDescription<St: State = Empty>(PhantomData<fn() -> St>);
-    impl<St: State> sealed::Sealed for SetDescription<St> {}
-    impl<St: State> State for SetDescription<St> {
         type Title = St::Title;
-        type Uri = St::Uri;
-        type Description = Set<members::description>;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `description` field
+        pub struct description(());
         ///Marker type for the `title` field
         pub struct title(());
         ///Marker type for the `uri` field
         pub struct uri(());
-        ///Marker type for the `description` field
-        pub struct description(());
     }
 }
 
@@ -343,9 +343,9 @@ where
 impl<St, S: BosStr> ExternalBuilder<St, S>
 where
     St: external_state::State,
+    St::Description: external_state::IsSet,
     St::Title: external_state::IsSet,
     St::Uri: external_state::IsSet,
-    St::Description: external_state::IsSet,
 {
     /// Build the final struct.
     pub fn build(self) -> External<S> {
@@ -749,51 +749,51 @@ pub mod view_external_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Title;
         type Description;
         type Uri;
+        type Title;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Title = Unset;
         type Description = Unset;
         type Uri = Unset;
-    }
-    ///State transition - sets the `title` field to Set
-    pub struct SetTitle<St: State = Empty>(PhantomData<fn() -> St>);
-    impl<St: State> sealed::Sealed for SetTitle<St> {}
-    impl<St: State> State for SetTitle<St> {
-        type Title = Set<members::title>;
-        type Description = St::Description;
-        type Uri = St::Uri;
+        type Title = Unset;
     }
     ///State transition - sets the `description` field to Set
     pub struct SetDescription<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetDescription<St> {}
     impl<St: State> State for SetDescription<St> {
-        type Title = St::Title;
         type Description = Set<members::description>;
         type Uri = St::Uri;
+        type Title = St::Title;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetUri<St> {}
     impl<St: State> State for SetUri<St> {
-        type Title = St::Title;
         type Description = St::Description;
         type Uri = Set<members::uri>;
+        type Title = St::Title;
+    }
+    ///State transition - sets the `title` field to Set
+    pub struct SetTitle<St: State = Empty>(PhantomData<fn() -> St>);
+    impl<St: State> sealed::Sealed for SetTitle<St> {}
+    impl<St: State> State for SetTitle<St> {
+        type Description = St::Description;
+        type Uri = St::Uri;
+        type Title = Set<members::title>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `title` field
-        pub struct title(());
         ///Marker type for the `description` field
         pub struct description(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `title` field
+        pub struct title(());
     }
 }
 
@@ -913,9 +913,9 @@ where
 impl<St, S: BosStr> ViewExternalBuilder<St, S>
 where
     St: view_external_state::State,
-    St::Title: view_external_state::IsSet,
     St::Description: view_external_state::IsSet,
     St::Uri: view_external_state::IsSet,
+    St::Title: view_external_state::IsSet,
 {
     /// Build the final struct.
     pub fn build(self) -> ViewExternal<S> {
diff --git a/crates/jacquard-codegen-tests/src/generated/pretty/app_bsky/richtext/facet.rs b/crates/jacquard-codegen-tests/src/generated/pretty/app_bsky/richtext/facet.rs
index 8b1f9f0b..20a08312 100644
--- a/crates/jacquard-codegen-tests/src/generated/pretty/app_bsky/richtext/facet.rs
+++ b/crates/jacquard-codegen-tests/src/generated/pretty/app_bsky/richtext/facet.rs
@@ -219,37 +219,37 @@ pub mod byte_slice_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type ByteStart;
         type ByteEnd;
+        type ByteStart;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type ByteStart = Unset;
         type ByteEnd = Unset;
-    }
-    ///State transition - sets the `byte_start` field to Set
-    pub struct SetByteStart<St: State = Empty>(PhantomData<fn() -> St>);
-    impl<St: State> sealed::Sealed for SetByteStart<St> {}
-    impl<St: State> State for SetByteStart<St> {
-        type ByteStart = Set<members::byte_start>;
-        type ByteEnd = St::ByteEnd;
+        type ByteStart = Unset;
     }
     ///State transition - sets the `byte_end` field to Set
     pub struct SetByteEnd<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetByteEnd<St> {}
     impl<St: State> State for SetByteEnd<St> {
-        type ByteStart = St::ByteStart;
         type ByteEnd = Set<members::byte_end>;
+        type ByteStart = St::ByteStart;
+    }
+    ///State transition - sets the `byte_start` field to Set
+    pub struct SetByteStart<St: State = Empty>(PhantomData<fn() -> St>);
+    impl<St: State> sealed::Sealed for SetByteStart<St> {}
+    impl<St: State> State for SetByteStart<St> {
+        type ByteEnd = St::ByteEnd;
+        type ByteStart = Set<members::byte_start>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `byte_start` field
-        pub struct byte_start(());
         ///Marker type for the `byte_end` field
         pub struct byte_end(());
+        ///Marker type for the `byte_start` field
+        pub struct byte_start(());
     }
 }
 
@@ -337,8 +337,8 @@ where
 impl<St, S: BosStr> ByteSliceBuilder<St, S>
 where
     St: byte_slice_state::State,
-    St::ByteStart: byte_slice_state::IsSet,
     St::ByteEnd: byte_slice_state::IsSet,
+    St::ByteStart: byte_slice_state::IsSet,
 {
     /// Build the final struct.
     pub fn build(self) -> ByteSlice<S> {
@@ -652,37 +652,37 @@ pub mod facet_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Index;
         type Features;
+        type Index;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Index = Unset;
         type Features = Unset;
-    }
-    ///State transition - sets the `index` field to Set
-    pub struct SetIndex<St: State = Empty>(PhantomData<fn() -> St>);
-    impl<St: State> sealed::Sealed for SetIndex<St> {}
-    impl<St: State> State for SetIndex<St> {
-        type Index = Set<members::index>;
-        type Features = St::Features;
+        type Index = Unset;
     }
     ///State transition - sets the `features` field to Set
     pub struct SetFeatures<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetFeatures<St> {}
     impl<St: State> State for SetFeatures<St> {
-        type Index = St::Index;
         type Features = Set<members::features>;
+        type Index = St::Index;
+    }
+    ///State transition - sets the `index` field to Set
+    pub struct SetIndex<St: State = Empty>(PhantomData<fn() -> St>);
+    impl<St: State> sealed::Sealed for SetIndex<St> {}
+    impl<St: State> State for SetIndex<St> {
+        type Features = St::Features;
+        type Index = Set<members::index>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `index` field
-        pub struct index(());
         ///Marker type for the `features` field
         pub struct features(());
+        ///Marker type for the `index` field
+        pub struct index(());
     }
 }
 
@@ -770,8 +770,8 @@ where
 impl<St, S: BosStr> FacetBuilder<St, S>
 where
     St: facet_state::State,
-    St::Index: facet_state::IsSet,
     St::Features: facet_state::IsSet,
+    St::Index: facet_state::IsSet,
 {
     /// Build the final struct.
     pub fn build(self) -> Facet<S> {
diff --git a/crates/jacquard-codegen-tests/src/generated/pretty/com_atproto/label.rs b/crates/jacquard-codegen-tests/src/generated/pretty/com_atproto/label.rs
index b28c27af..7c1d4840 100644
--- a/crates/jacquard-codegen-tests/src/generated/pretty/com_atproto/label.rs
+++ b/crates/jacquard-codegen-tests/src/generated/pretty/com_atproto/label.rs
@@ -679,67 +679,67 @@ pub mod label_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
+        type Cts;
         type Src;
-        type Uri;
         type Val;
-        type Cts;
+        type Uri;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
+        type Cts = Unset;
         type Src = Unset;
-        type Uri = Unset;
         type Val = Unset;
-        type Cts = Unset;
+        type Uri = Unset;
+    }
+    ///State transition - sets the `cts` field to Set
+    pub struct SetCts<St: State = Empty>(PhantomData<fn() -> St>);
+    impl<St: State> sealed::Sealed for SetCts<St> {}
+    impl<St: State> State for SetCts<St> {
+        type Cts = Set<members::cts>;
+        type Src = St::Src;
+        type Val = St::Val;
+        type Uri = St::Uri;
     }
     ///State transition - sets the `src` field to Set
     pub struct SetSrc<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetSrc<St> {}
     impl<St: State> State for SetSrc<St> {
-        type Src = Set<members::src>;
-        type Uri = St::Uri;
-        type Val = St::Val;
         type Cts = St::Cts;
-    }
-    ///State transition - sets the `uri` field to Set
-    pub struct SetUri<St: State = Empty>(PhantomData<fn() -> St>);
-    impl<St: State> sealed::Sealed for SetUri<St> {}
-    impl<St: State> State for SetUri<St> {
-        type Src = St::Src;
-        type Uri = Set<members::uri>;
+        type Src = Set<members::src>;
         type Val = St::Val;
-        type Cts = St::Cts;
+        type Uri = St::Uri;
     }
     ///State transition - sets the `val` field to Set
     pub struct SetVal<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetVal<St> {}
     impl<St: State> State for SetVal<St> {
+        type Cts = St::Cts;
         type Src = St::Src;
-        type Uri = St::Uri;
         type Val = Set<members::val>;
-        type Cts = St::Cts;
+        type Uri = St::Uri;
     }
-    ///State transition - sets the `cts` field to Set
-    pub struct SetCts<St: State = Empty>(PhantomData<fn() -> St>);
-    impl<St: State> sealed::Sealed for SetCts<St> {}
-    impl<St: State> State for SetCts<St> {
+    ///State transition - sets the `uri` field to Set
+    pub struct SetUri<St: State = Empty>(PhantomData<fn() -> St>);
+    impl<St: State> sealed::Sealed for SetUri<St> {}
+    impl<St: State> State for SetUri<St> {
+        type Cts = St::Cts;
         type Src = St::Src;
-        type Uri = St::Uri;
         type Val = St::Val;
-        type Cts = Set<members::cts>;
+        type Uri = Set<members::uri>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
+        ///Marker type for the `cts` field
+        pub struct cts(());
         ///Marker type for the `src` field
         pub struct src(());
-        ///Marker type for the `uri` field
-        pub struct uri(());
         ///Marker type for the `val` field
         pub struct val(());
-        ///Marker type for the `cts` field
-        pub struct cts(());
+        ///Marker type for the `uri` field
+        pub struct uri(());
     }
 }
 
@@ -940,10 +940,10 @@ impl<St: label_state::State, S: BosStr> LabelBuilder<St, S> {
 impl<St, S: BosStr> LabelBuilder<St, S>
 where
     St: label_state::State,
+    St::Cts: label_state::IsSet,
     St::Src: label_state::IsSet,
-    St::Uri: label_state::IsSet,
     St::Val: label_state::IsSet,
-    St::Cts: label_state::IsSet,
+    St::Uri: label_state::IsSet,
 {
     /// Build the final struct.
     pub fn build(self) -> Label<S> {
@@ -1315,67 +1315,67 @@ pub mod label_value_definition_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Locales;
+        type Identifier;
         type Severity;
+        type Locales;
         type Blurs;
-        type Identifier;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Locales = Unset;
+        type Identifier = Unset;
         type Severity = Unset;
+        type Locales = Unset;
         type Blurs = Unset;
-        type Identifier = Unset;
     }
-    ///State transition - sets the `locales` field to Set
-    pub struct SetLocales<St: State = Empty>(PhantomData<fn() -> St>);
-    impl<St: State> sealed::Sealed for SetLocales<St> {}
-    impl<St: State> State for SetLocales<St> {
-        type Locales = Set<members::locales>;
+    ///State transition - sets the `identifier` field to Set
+    pub struct SetIdentifier<St: State = Empty>(PhantomData<fn() -> St>);
+    impl<St: State> sealed::Sealed for SetIdentifier<St> {}
+    impl<St: State> State for SetIdentifier<St> {
+        type Identifier = Set<members::identifier>;
         type Severity = St::Severity;
+        type Locales = St::Locales;
         type Blurs = St::Blurs;
-        type Identifier = St::Identifier;
     }
     ///State transition - sets the `severity` field to Set
     pub struct SetSeverity<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetSeverity<St> {}
     impl<St: State> State for SetSeverity<St> {
-        type Locales = St::Locales;
+        type Identifier = St::Identifier;
         type Severity = Set<members::severity>;
+        type Locales = St::Locales;
         type Blurs = St::Blurs;
+    }
+    ///State transition - sets the `locales` field to Set
+    pub struct SetLocales<St: State = Empty>(PhantomData<fn() -> St>);
+    impl<St: State> sealed::Sealed for SetLocales<St> {}
+    impl<St: State> State for SetLocales<St> {
         type Identifier = St::Identifier;
+        type Severity = St::Severity;
+        type Locales = Set<members::locales>;
+        type Blurs = St::Blurs;
     }
     ///State transition - sets the `blurs` field to Set
     pub struct SetBlurs<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetBlurs<St> {}
     impl<St: State> State for SetBlurs<St> {
-        type Locales = St::Locales;
-        type Severity = St::Severity;
-        type Blurs = Set<members::blurs>;
         type Identifier = St::Identifier;
-    }
-    ///State transition - sets the `identifier` field to Set
-    pub struct SetIdentifier<St: State = Empty>(PhantomData<fn() -> St>);
-    impl<St: State> sealed::Sealed for SetIdentifier<St> {}
-    impl<St: State> State for SetIdentifier<St> {
-        type Locales = St::Locales;
         type Severity = St::Severity;
-        type Blurs = St::Blurs;
-        type Identifier = Set<members::identifier>;
+        type Locales = St::Locales;
+        type Blurs = Set<members::blurs>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `locales` field
-        pub struct locales(());
+        ///Marker type for the `identifier` field
+        pub struct identifier(());
         ///Marker type for the `severity` field
         pub struct severity(());
+        ///Marker type for the `locales` field
+        pub struct locales(());
         ///Marker type for the `blurs` field
         pub struct blurs(());
-        ///Marker type for the `identifier` field
-        pub struct identifier(());
     }
 }
 
@@ -1558,10 +1558,10 @@ where
 impl<St, S: BosStr> LabelValueDefinitionBuilder<St, S>
 where
     St: label_value_definition_state::State,
-    St::Locales: label_value_definition_state::IsSet,
+    St::Identifier: label_value_definition_state::IsSet,
     St::Severity: label_value_definition_state::IsSet,
+    St::Locales: label_value_definition_state::IsSet,
     St::Blurs: label_value_definition_state::IsSet,
-    St::Identifier: label_value_definition_state::IsSet,
 {
     /// Build the final struct.
     pub fn build(self) -> LabelValueDefinition<S> {
@@ -1602,51 +1602,51 @@ pub mod label_value_definition_strings_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Lang;
         type Description;
         type Name;
+        type Lang;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Lang = Unset;
         type Description = Unset;
         type Name = Unset;
-    }
-    ///State transition - sets the `lang` field to Set
-    pub struct SetLang<St: State = Empty>(PhantomData<fn() -> St>);
-    impl<St: State> sealed::Sealed for SetLang<St> {}
-    impl<St: State> State for SetLang<St> {
-        type Lang = Set<members::lang>;
-        type Description = St::Description;
-        type Name = St::Name;
+        type Lang = Unset;
     }
     ///State transition - sets the `description` field to Set
     pub struct SetDescription<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetDescription<St> {}
     impl<St: State> State for SetDescription<St> {
-        type Lang = St::Lang;
         type Description = Set<members::description>;
         type Name = St::Name;
+        type Lang = St::Lang;
     }
     ///State transition - sets the `name` field to Set
     pub struct SetName<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetName<St> {}
     impl<St: State> State for SetName<St> {
-        type Lang = St::Lang;
         type Description = St::Description;
         type Name = Set<members::name>;
+        type Lang = St::Lang;
+    }
+    ///State transition - sets the `lang` field to Set
+    pub struct SetLang<St: State = Empty>(PhantomData<fn() -> St>);
+    impl<St: State> sealed::Sealed for SetLang<St> {}
+    impl<St: State> State for SetLang<St> {
+        type Description = St::Description;
+        type Name = St::Name;
+        type Lang = Set<members::lang>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `lang` field
-        pub struct lang(());
         ///Marker type for the `description` field
         pub struct description(());
         ///Marker type for the `name` field
         pub struct name(());
+        ///Marker type for the `lang` field
+        pub struct lang(());
     }
 }
 
@@ -1776,9 +1776,9 @@ where
 impl<St, S: BosStr> LabelValueDefinitionStringsBuilder<St, S>
 where
     St: label_value_definition_strings_state::State,
-    St::Lang: label_value_definition_strings_state::IsSet,
     St::Description: label_value_definition_strings_state::IsSet,
     St::Name: label_value_definition_strings_state::IsSet,
+    St::Lang: label_value_definition_strings_state::IsSet,
 {
     /// Build the final struct.
     pub fn build(self) -> LabelValueDefinitionStrings<S> {
diff --git a/crates/jacquard-codegen-tests/src/generated/pretty/com_atproto/repo/strong_ref.rs b/crates/jacquard-codegen-tests/src/generated/pretty/com_atproto/repo/strong_ref.rs
index 5489e140..56037327 100644
--- a/crates/jacquard-codegen-tests/src/generated/pretty/com_atproto/repo/strong_ref.rs
+++ b/crates/jacquard-codegen-tests/src/generated/pretty/com_atproto/repo/strong_ref.rs
@@ -59,37 +59,37 @@ pub mod strong_ref_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type Cid;
         type Uri;
+        type Cid;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type Cid = Unset;
         type Uri = Unset;
-    }
-    ///State transition - sets the `cid` field to Set
-    pub struct SetCid<St: State = Empty>(PhantomData<fn() -> St>);
-    impl<St: State> sealed::Sealed for SetCid<St> {}
-    impl<St: State> State for SetCid<St> {
-        type Cid = Set<members::cid>;
-        type Uri = St::Uri;
+        type Cid = Unset;
     }
     ///State transition - sets the `uri` field to Set
     pub struct SetUri<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetUri<St> {}
     impl<St: State> State for SetUri<St> {
-        type Cid = St::Cid;
         type Uri = Set<members::uri>;
+        type Cid = St::Cid;
+    }
+    ///State transition - sets the `cid` field to Set
+    pub struct SetCid<St: State = Empty>(PhantomData<fn() -> St>);
+    impl<St: State> sealed::Sealed for SetCid<St> {}
+    impl<St: State> State for SetCid<St> {
+        type Uri = St::Uri;
+        type Cid = Set<members::cid>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `cid` field
-        pub struct cid(());
         ///Marker type for the `uri` field
         pub struct uri(());
+        ///Marker type for the `cid` field
+        pub struct cid(());
     }
 }
 
@@ -177,8 +177,8 @@ where
 impl<St, S: BosStr> StrongRefBuilder<St, S>
 where
     St: strong_ref_state::State,
-    St::Cid: strong_ref_state::IsSet,
     St::Uri: strong_ref_state::IsSet,
+    St::Cid: strong_ref_state::IsSet,
 {
     /// Build the final struct.
     pub fn build(self) -> StrongRef<S> {
diff --git a/crates/jacquard-codegen-tests/src/generated/pretty/test_ns3/collision.rs b/crates/jacquard-codegen-tests/src/generated/pretty/test_ns3/collision.rs
index c29dfb6f..bf79af9f 100644
--- a/crates/jacquard-codegen-tests/src/generated/pretty/test_ns3/collision.rs
+++ b/crates/jacquard-codegen-tests/src/generated/pretty/test_ns3/collision.rs
@@ -316,37 +316,37 @@ pub mod collision_state {
     }
     /// State trait tracking which required fields have been set
     pub trait State: sealed::Sealed {
-        type LocalFoo;
         type ExternalFoo;
+        type LocalFoo;
     }
     /// Empty state - all required fields are unset
     pub struct Empty(());
     impl sealed::Sealed for Empty {}
     impl State for Empty {
-        type LocalFoo = Unset;
         type ExternalFoo = Unset;
-    }
-    ///State transition - sets the `local_foo` field to Set
-    pub struct SetLocalFoo<St: State = Empty>(PhantomData<fn() -> St>);
-    impl<St: State> sealed::Sealed for SetLocalFoo<St> {}
-    impl<St: State> State for SetLocalFoo<St> {
-        type LocalFoo = Set<members::local_foo>;
-        type ExternalFoo = St::ExternalFoo;
+        type LocalFoo = Unset;
     }
     ///State transition - sets the `external_foo` field to Set
     pub struct SetExternalFoo<St: State = Empty>(PhantomData<fn() -> St>);
     impl<St: State> sealed::Sealed for SetExternalFoo<St> {}
     impl<St: State> State for SetExternalFoo<St> {
-        type LocalFoo = St::LocalFoo;
         type ExternalFoo = Set<members::external_foo>;
+        type LocalFoo = St::LocalFoo;
+    }
+    ///State transition - sets the `local_foo` field to Set
+    pub struct SetLocalFoo<St: State = Empty>(PhantomData<fn() -> St>);
+    impl<St: State> sealed::Sealed for SetLocalFoo<St> {}
+    impl<St: State> State for SetLocalFoo<St> {
+        type ExternalFoo = St::ExternalFoo;
+        type LocalFoo = Set<members::local_foo>;
     }
     /// Marker types for field names
     #[allow(non_camel_case_types)]
     pub mod members {
-        ///Marker type for the `local_foo` field
-        pub struct local_foo(());
         ///Marker type for the `external_foo` field
         pub struct external_foo(());
+        ///Marker type for the `local_foo` field
+        pub struct local_foo(());
     }
 }
 
@@ -447,8 +447,8 @@ impl<St: collision_state::State, S: BosStr> CollisionBuilder<St, S> {
 impl<St, S: BosStr> CollisionBuilder<St, S>
 where
     St: collision_state::State,
-    St::LocalFoo: collision_state::IsSet,
     St::ExternalFoo: collision_state::IsSet,
+    St::LocalFoo: collision_state::IsSet,
 {
     /// Build the final struct.
     pub fn build(self) -> Collision<S> {
diff --git a/crates/jacquard-lexicon/src/codegen/builder_gen/builder_struct.rs b/crates/jacquard-lexicon/src/codegen/builder_gen/builder_struct.rs
index 6a7094e6..04e92518 100644
--- a/crates/jacquard-lexicon/src/codegen/builder_gen/builder_struct.rs
+++ b/crates/jacquard-lexicon/src/codegen/builder_gen/builder_struct.rs
@@ -83,7 +83,7 @@ pub fn generate_builder_struct(
             quote! {}
         };
         quote! {
-            impl #type_ident<DefaultStr> {
+            impl #type_ident<#default_str_path> {
                 /// Create a new builder for this type, using the default string type (DefaultStr = SmolStr) if needed
                 pub fn new() -> #builder_name<#lifetime #state_mod_name::Empty, #default_str_path> {
                     #builder_name::new()
diff --git a/crates/jacquard/src/client.rs b/crates/jacquard/src/client.rs
index 05a353fe..dd671faf 100644
--- a/crates/jacquard/src/client.rs
+++ b/crates/jacquard/src/client.rs
@@ -829,7 +829,7 @@ pub trait AgentSessionExt: AgentSession + IdentityResolver {
                 "no rkey",
                 ClientError::invalid_request("no rkey"),
             ))?;
-            let request = GetRecord::new()
+            let request = GetRecord::builder()
                 .repo(uri.authority().clone())
                 .collection(collection.clone())
                 .rkey(RecordKey(rkey.clone()))
diff --git a/examples/oauth_timeline.rs b/examples/oauth_timeline.rs
index cb62cd03..9253d705 100644
--- a/examples/oauth_timeline.rs
+++ b/examples/oauth_timeline.rs
@@ -72,7 +72,7 @@ async fn main() -> miette::Result<()> {
 
     // Wrap in Agent and fetch the timeline
     let agent: Agent<_> = Agent::from(session);
-    let output = agent.send(GetTimeline::builder().limit(5).build()).await?;
+    let output = agent.send(GetTimeline::new().limit(5).build()).await?;
     let timeline = output.into_output()?;
     for (i, post) in timeline.feed.iter().enumerate() {
         println!("\n{}. by {}", i + 1, post.post.author.handle);