diff --git a/consumer/src/tree.rs b/consumer/src/tree.rs
index bde49611..a15b878e 100644
--- a/consumer/src/tree.rs
+++ b/consumer/src/tree.rs
@@ -88,10 +88,7 @@ impl State {
         };
 
         let mut current_focus = root_subtree.focus;
-        loop {
-            let Some(node_state) = self.nodes.get(&current_focus) else {
-                break;
-            };
+        while let Some(node_state) = self.nodes.get(&current_focus) {
             let Some(subtree_id) = node_state.data.tree_id() else {
                 break;
             };
diff --git a/platforms/windows/src/node.rs b/platforms/windows/src/node.rs
index fd3556f2..015c0c60 100644
--- a/platforms/windows/src/node.rs
+++ b/platforms/windows/src/node.rs
@@ -1228,11 +1228,9 @@ macro_rules! patterns {
                 self.resolve(|node| {
                     let wrapper = NodeWrapper(&node);
                     match pattern_id {
-                        $($pattern_id => {
-                            if wrapper.$is_supported() {
-                                let intermediate: $provider_interface = self.to_interface();
-                                return intermediate.cast();
-                            }
+                        $($pattern_id if wrapper.$is_supported() => {
+                            let intermediate: $provider_interface = self.to_interface();
+                            return intermediate.cast();
                         })*
                         _ => (),
                     }