diff --git a/lib/middleware-common-tests/src/lib.rs b/lib/middleware-common-tests/src/lib.rs
index 383d1a022..e3c0596d1 100644
--- a/lib/middleware-common-tests/src/lib.rs
+++ b/lib/middleware-common-tests/src/lib.rs
@@ -119,22 +119,11 @@ mod tests {
 
         let add_to: Func<(i32, i32), i32> = instance.func("add_to").unwrap();
 
-        let cv_pushed = if let Some(msm) = instance
-            .module
-            .runnable_module
-            .borrow()
-            .get_module_state_map()
-        {
+        let cv_pushed = if let Some(msm) = instance.module.runnable_module.get_module_state_map() {
             push_code_version(CodeVersion {
                 baseline: true,
                 msm: msm,
-                base: instance
-                    .module
-                    .runnable_module
-                    .borrow()
-                    .get_code()
-                    .unwrap()
-                    .as_ptr() as usize,
+                base: instance.module.runnable_module.get_code().unwrap().as_ptr() as usize,
                 runnable_module: instance.module.runnable_module.clone(),
                 backend: backend_id,
             });
@@ -172,22 +161,11 @@ mod tests {
 
         let add_to: Func<(i32, i32), i32> = instance.func("add_to").unwrap();
 
-        let cv_pushed = if let Some(msm) = instance
-            .module
-            .runnable_module
-            .borrow()
-            .get_module_state_map()
-        {
+        let cv_pushed = if let Some(msm) = instance.module.runnable_module.get_module_state_map() {
             push_code_version(CodeVersion {
                 baseline: true,
                 msm: msm,
-                base: instance
-                    .module
-                    .runnable_module
-                    .borrow()
-                    .get_code()
-                    .unwrap()
-                    .as_ptr() as usize,
+                base: instance.module.runnable_module.get_code().unwrap().as_ptr() as usize,
                 backend: backend_id,
                 runnable_module: instance.module.runnable_module.clone(),
             });
diff --git a/lib/runtime-core/src/instance.rs b/lib/runtime-core/src/instance.rs
index 7c4091994..0f21248df 100644
--- a/lib/runtime-core/src/instance.rs
+++ b/lib/runtime-core/src/instance.rs
@@ -146,11 +146,9 @@ impl Instance {
 
     /// Load an `Instance` using the given loader.
     pub fn load<T: Loader>(&self, loader: T) -> ::std::result::Result<T::Instance, T::Error> {
-        loader.load(
-            &**self.module.runnable_module,
-            &self.module.info,
-            unsafe { &*self.inner.vmctx },
-        )
+        loader.load(&**self.module.runnable_module, &self.module.info, unsafe {
+            &*self.inner.vmctx
+        })
     }
 
     /// Through generic magic and the awe-inspiring power of traits, we bring you...
diff --git a/lib/runtime-core/src/tiering.rs b/lib/runtime-core/src/tiering.rs
index af05f17a5..697348ae3 100644
--- a/lib/runtime-core/src/tiering.rs
+++ b/lib/runtime-core/src/tiering.rs
@@ -125,16 +125,9 @@ pub unsafe fn run_tiering<F: Fn(InteractiveShellContext) -> ShellExitOperation>(
         msm: baseline
             .module
             .runnable_module
-            .borrow()
             .get_module_state_map()
             .unwrap(),
-        base: baseline
-            .module
-            .runnable_module
-            .borrow()
-            .get_code()
-            .unwrap()
-            .as_ptr() as usize,
+        base: baseline.module.runnable_module.get_code().unwrap().as_ptr() as usize,
         backend: baseline_backend,
         runnable_module: baseline.module.runnable_module.clone(),
     });
@@ -166,14 +159,12 @@ pub unsafe fn run_tiering<F: Fn(InteractiveShellContext) -> ShellExitOperation>(
             let code_ptr = optimized
                 .module
                 .runnable_module
-                .borrow()
                 .get_code()
                 .unwrap()
                 .as_ptr() as usize;
             let target_addresses: Vec<usize> = optimized
                 .module
                 .runnable_module
-                .borrow()
                 .get_local_function_offsets()
                 .unwrap()
                 .into_iter()
@@ -184,7 +175,6 @@ pub unsafe fn run_tiering<F: Fn(InteractiveShellContext) -> ShellExitOperation>(
                 baseline
                     .module
                     .runnable_module
-                    .borrow()
                     .patch_local_function(i - base, target_addresses[i - base]);
             }
 
@@ -193,13 +183,11 @@ pub unsafe fn run_tiering<F: Fn(InteractiveShellContext) -> ShellExitOperation>(
                 msm: optimized
                     .module
                     .runnable_module
-                    .borrow()
                     .get_module_state_map()
                     .unwrap(),
                 base: optimized
                     .module
                     .runnable_module
-                    .borrow()
                     .get_code()
                     .unwrap()
                     .as_ptr() as usize,
@@ -218,16 +206,10 @@ pub unsafe fn run_tiering<F: Fn(InteractiveShellContext) -> ShellExitOperation>(
                 let msm = baseline
                     .module
                     .runnable_module
-                    .borrow()
                     .get_module_state_map()
                     .unwrap();
-                let code_base = baseline
-                    .module
-                    .runnable_module
-                    .borrow()
-                    .get_code()
-                    .unwrap()
-                    .as_ptr() as usize;
+                let code_base =
+                    baseline.module.runnable_module.get_code().unwrap().as_ptr() as usize;
                 invoke_call_return_on_stack(
                     &msm,
                     code_base,