diff --git a/proc/src/proc_expose.rs b/proc/src/proc_expose.rs
index 98b0df0..d0f643b 100644
--- a/proc/src/proc_expose.rs
+++ b/proc/src/proc_expose.rs
@@ -60,37 +60,7 @@ impl ToTokens for ExposeImpl {
         let state = &block.self_ty;
         write_quote_to(out, quote! { #block });
         for (t, variants) in exposed.iter() {
-            let formatted_type = format!("{}", quote! { #t }); 
-            let predefined = match formatted_type.as_str() {
-                "bool" => quote! {
-                    Some(::tengri::dsl::DslVal::Sym(":true"))  => true,
-                    Some(::tengri::dsl::DslVal::Sym(":false")) => false,
-                },
-                "u8" | "u16" | "u32" | "u64" | "usize" |
-                "i8" | "i16" | "i32" | "i64" | "isize" => {
-                    let num_err = LitStr::new(
-                        &format!("{{n}}: failed to convert to {formatted_type}"),
-                        Span::call_site()
-                    );
-                    quote! {
-                        Some(::tengri::dsl::DslVal::Num(n)) => TryInto::<#t>::try_into(*n)
-                            .unwrap_or_else(|_|panic!(#num_err)),
-                    }
-                },
-                _ => quote! {},
-            };
-            let values = variants.iter().map(|(key, value)|{
-                let key = LitStr::new(&key, Span::call_site());
-                quote! { Some(::tengri::dsl::DslVal::Sym(#key)) => state.#value(), }
-            });
-            write_quote_to(out, quote! {
-                /// Generated by [tengri_proc::expose].
-                impl ::tengri::dsl::DslFrom<#state> for #t {
-                    fn try_dsl_from (state: &#state, value: &impl Dsl) -> Perhaps<Self> {
-                        Ok(Some(match value { #predefined #(#values)* _ => return Ok(None) }))
-                    }
-                }
-            });
+            self.expose_variants(out, t, variants);
         }
         if exposed.len() > 0 {
             //panic!("{}", quote! {#out});
@@ -98,6 +68,66 @@ impl ToTokens for ExposeImpl {
     }
 }
 
+impl ExposeImpl {
+    fn expose_variants (
+        &self, out: &mut TokenStream2, t: &ExposeType, variants: &BTreeMap<String, Ident>
+    ) {
+        let Self(ItemImpl { self_ty: state, .. }, ..) = self;
+        let arms = variants.iter().map(|(key, value)|{
+            let key = LitStr::new(&key, Span::call_site());
+            quote! { #key => state.#value(), }
+        });
+        let arms = Self::with_predefined(t, quote! { #(#arms)* });
+        write_quote_to(out, quote! {
+            /// Generated by [tengri_proc::expose].
+            impl ::tengri::dsl::DslFrom<#state> for #t {
+                fn try_dsl_from (state: &#state, dsl: &impl Dsl) -> Perhaps<Self> {
+                    Ok(Some(match dsl.val() {
+                        #arms
+                        _ => { return Ok(None) }
+                    }))
+                }
+            }
+        });
+    }
+    fn with_predefined (t: &ExposeType, variants: impl ToTokens) -> impl ToTokens {
+        let formatted_type = format!("{}", quote! { #t });
+        if &formatted_type == "bool" {
+            return quote! {
+                ::tengri::dsl::DslVal::Sym(s) => match s.as_ref() {
+                    ":true"  => true,
+                    ":false" => false,
+                    #variants
+                    _ => { return Ok(None) }
+                },
+            }
+        }
+        if matches!(formatted_type.as_str(),
+            "u8" | "u16" | "u32" | "u64" | "usize" |
+            "i8" | "i16" | "i32" | "i64" | "isize")
+        {
+            let num_err = LitStr::new(
+                &format!("{{n}}: failed to convert to {formatted_type}"),
+                Span::call_site()
+            );
+            return quote! {
+                ::tengri::dsl::DslVal::Num(n) => TryInto::<#t>::try_into(n)
+                    .unwrap_or_else(|_|panic!(#num_err)),
+                ::tengri::dsl::DslVal::Sym(s) => match s.as_ref() {
+                    #variants
+                    _ => { return Ok(None) }
+                },
+            }
+        }
+        return quote! {
+            ::tengri::dsl::DslVal::Sym(s) => match s.as_ref() {
+                #variants
+                _ => { return Ok(None) }
+            },
+        }
+    }
+}
+
 impl From<LitStr> for ExposeSym { fn from (this: LitStr) -> Self { Self(this) } }
 
 impl PartialOrd for ExposeSym {