diff --git a/c2rust-refactor/src/macros.rs b/c2rust-refactor/src/macros.rs
index a286197d36..689db7a60e 100644
--- a/c2rust-refactor/src/macros.rs
+++ b/c2rust-refactor/src/macros.rs
@@ -13,7 +13,14 @@ macro_rules! match_or_else {
     ([$e:expr] $($arm_pat:pat => $arm_body:expr),*; $or_else:expr) => {
         match $e {
             $( $arm_pat => $arm_body, )*
-            ref x @ _ => $or_else(x),
+            _ => $or_else,
+        }
+    };
+
+    ([$e:expr] $($arm_pat:pat => $arm_body:expr),*; $or_else_var:ident => $or_else:expr) => {
+        match $e {
+            $( $arm_pat => $arm_body, )*
+            ref $or_else_var @ _ => $or_else,
         }
     };
 }
@@ -22,11 +29,11 @@ macro_rules! match_or_else {
 macro_rules! expect {
     ([$e:expr] $arm_pat:pat => $arm_body:expr) => {
         $crate::match_or_else!([$e] $arm_pat => $arm_body;
-            |x| panic!("expected {}, got {:?}", stringify!($arm_pat), x))
+            x => panic!("expected {}, got {:?}", stringify!($arm_pat), x))
     };
     ([$e:expr] $($arm_pat:pat => $arm_body:expr),*) => {
         $crate::match_or_else!([$e] $($arm_pat => $arm_body),*;
-            |x| panic!("expected one of: {}, got {:?}", stringify!($($arm_pat),*), x))
+            x => panic!("expected one of: {}, got {:?}", stringify!($($arm_pat),*), x))
     };
 }
 
@@ -35,6 +42,28 @@ macro_rules! unpack {
     ([$e:expr] $enum_:ident :: $variant:ident ( $($arg:ident),* )) => {
         let ($($arg,)*) = $crate::expect!([$e] $enum_::$variant($($arg),*) => ($($arg,)*));
     };
+
+    (
+        [$e:expr]
+        $enum_:ident :: $variant:ident ( $($arg:ident),* );
+        $or_else:expr
+    ) => {
+        let ($($arg,)*) = $crate::match_or_else!(
+            [$e] $enum_::$variant($($arg),*) => ($($arg,)*);
+            $or_else
+        );
+    };
+
+    (
+        [$e:expr]
+        $enum_:ident :: $variant:ident ( $($arg:ident),* );
+        $or_else_var:ident => $or_else:expr
+    ) => {
+        let ($($arg,)*) = $crate::match_or_else!(
+            [$e] $enum_::$variant($($arg),*) => ($($arg,)*);
+            $or_else_var => $or_else
+        );
+    };
 }
 
 #[macro_export]
diff --git a/c2rust-refactor/src/path_edit.rs b/c2rust-refactor/src/path_edit.rs
index b503055288..51668cc67f 100644
--- a/c2rust-refactor/src/path_edit.rs
+++ b/c2rust-refactor/src/path_edit.rs
@@ -124,7 +124,7 @@ where
                     _ => {}
                 }
 
-                unpack!([&mut t.kind] TyKind::Path(qself, path));
+                unpack!([&mut t.kind] TyKind::Path(qself, path); return);
                 let (new_qself, new_path) =
                     self.handle_qpath(id, qself.clone(), path.clone(), qpath);
                 *qself = new_qself;