diff --git a/src/engine/strat_engine/pool.rs b/src/engine/strat_engine/pool.rs
index 818fdf314b..ea363fdf1c 100644
--- a/src/engine/strat_engine/pool.rs
+++ b/src/engine/strat_engine/pool.rs
@@ -277,7 +277,7 @@ impl StratPool {
 
     pub fn check(&mut self) -> () {
         #![allow(match_same_arms)]
-        let dm = DM::new().expect("Could not get DM handle");
+        let dm = DM::new().unwrap();
 
         let result = match self.thin_pool.check(&dm) {
             Ok(r) => r,
diff --git a/src/engine/strat_engine/range_alloc.rs b/src/engine/strat_engine/range_alloc.rs
index 018e30b206..4b9539607d 100644
--- a/src/engine/strat_engine/range_alloc.rs
+++ b/src/engine/strat_engine/range_alloc.rs
@@ -108,16 +108,22 @@ impl RangeAllocator {
                 (None, Some((next_off, next_len))) => {
                     // Contig with next, make new entry
                     self.used.insert(off, len + next_len);
-                    self.used.remove(&next_off).expect("must exist");
+                    self.used
+                        .remove(&next_off)
+                        .expect("matched Some((next_off, ...");
                 }
                 (Some((prev_off, prev_len)), None) => {
                     // Contig with prev, just extend prev
-                    *self.used.get_mut(&prev_off).expect("must exist") = prev_len + len;
+                    *self.used
+                         .get_mut(&prev_off)
+                         .expect("matched Some((prev_off, ...") = prev_len + len;
                 }
                 (Some((prev_off, prev_len)), Some((next_off, next_len))) => {
                     // Contig with both, remove next and extend prev
                     self.used.remove(&next_off);
-                    *self.used.get_mut(&prev_off).expect("must exist") = prev_len + len + next_len;
+                    *self.used
+                         .get_mut(&prev_off)
+                         .expect("matched Some((prev_off, ...") = prev_len + len + next_len;
                 }
             }
         }