diff --git a/examples/chi_sq/src/main.rs b/examples/chi_sq/src/main.rs
index 642858e46..c674a96e0 100644
--- a/examples/chi_sq/src/main.rs
+++ b/examples/chi_sq/src/main.rs
@@ -240,7 +240,7 @@ fn main() -> Result<(), Error> {
     println!("\t**********FHE************");
     run_fhe(
         chi_sq_fhe_program,
-        PhantomData::<Signed>::default(),
+        PhantomData::<Signed>,
         n_0,
         n_1,
         n_2,
@@ -255,7 +255,7 @@ fn main() -> Result<(), Error> {
     // just under 50ms...
     run_fhe(
         chi_sq_optimized_fhe_program,
-        PhantomData::<Signed>::default(),
+        PhantomData::<Signed>,
         n_0,
         n_1,
         n_2,
diff --git a/sunscreen_fhe_program/src/lib.rs b/sunscreen_fhe_program/src/lib.rs
index e339611ef..b56bb1421 100644
--- a/sunscreen_fhe_program/src/lib.rs
+++ b/sunscreen_fhe_program/src/lib.rs
@@ -351,9 +351,7 @@ impl FheProgramTrait for FheProgram {
             closure_set.insert(mapped_id);
         }
 
-        while !visit.is_empty() {
-            let node = visit.pop().expect("Fatal error: prune queue was empty.");
-
+        while let Some(node) = visit.pop() {
             for edge in closure.neighbors(node) {
                 if !closure_set.contains(&edge) {
                     closure_set.insert(edge);
diff --git a/sunscreen_runtime/src/serialization.rs b/sunscreen_runtime/src/serialization.rs
index ff8848f40..701ab61bc 100644
--- a/sunscreen_runtime/src/serialization.rs
+++ b/sunscreen_runtime/src/serialization.rs
@@ -155,7 +155,7 @@ where
             "WithContext",
             FIELDS,
             WithContextVisitor {
-                marker: std::marker::PhantomData::default(),
+                marker: std::marker::PhantomData,
             },
         )
     }