diff --git a/src/resolution.rs b/src/resolution.rs
index 1e743efd..47fbac7e 100644
--- a/src/resolution.rs
+++ b/src/resolution.rs
@@ -304,7 +304,7 @@ fn find_descriptor(
             return Some(descriptor);
         }
 
-        current_class_name = class.superclass.as_deref()?;
+        current_class_name = class.superclass?;
     }
 }
 
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 7fe3992d..3949786d 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -481,7 +481,7 @@ fn get_property_filter(project: &Project, new_inst: &Instance) -> Option<UstrSet
         }
 
         let class = database.classes.get(current_class_name)?;
-        if let Some(super_class) = class.superclass.as_ref() {
+        if let Some(super_class) = class.superclass {
             current_class_name = super_class;
         } else {
             break;
diff --git a/src/syncback/property_filter.rs b/src/syncback/property_filter.rs
index 47678870..359e3f30 100644
--- a/src/syncback/property_filter.rs
+++ b/src/syncback/property_filter.rs
@@ -101,7 +101,7 @@ fn should_property_serialize(class_name: &str, prop_name: &str) -> bool {
                 }
                 kind => unimplemented!("unknown property kind {kind:?}"),
             };
-        } else if let Some(super_class) = class_data.superclass.as_ref() {
+        } else if let Some(super_class) = class_data.superclass {
             current_class_name = super_class;
         } else {
             break;