diff --git a/compiler/gen_dev/src/generic64/storage.rs b/compiler/gen_dev/src/generic64/storage.rs
index d3978994a1..5ab6558106 100644
--- a/compiler/gen_dev/src/generic64/storage.rs
+++ b/compiler/gen_dev/src/generic64/storage.rs
@@ -920,12 +920,12 @@ impl<
             // This is a join point and will not be in the storage map.
             return;
         }
-        match self.remove_storage_for_sym(sym) {
+        match self.symbol_storage_map.remove(sym) {
             // Free stack chunck if this is the last reference to the chunk.
-            Stack(Primitive { base_offset, .. }) => {
+            Some(Stack(Primitive { base_offset, .. })) => {
                 self.free_stack_chunk(base_offset, 8);
             }
-            Stack(Complex { .. } | ReferencedPrimitive { .. }) => {
+            Some(Stack(Complex { .. } | ReferencedPrimitive { .. })) => {
                 self.free_reference(sym);
             }
             _ => {}