diff --git a/query-builder-macros/src/statement_parser/if_else.rs b/query-builder-macros/src/statement_parser/if_else.rs
index 1d53334f9..cd65328e0 100644
--- a/query-builder-macros/src/statement_parser/if_else.rs
+++ b/query-builder-macros/src/statement_parser/if_else.rs
@@ -170,7 +170,7 @@ impl IfElseWithoutIfKeywordMetaAst {
             || self
                 .else_meta
                 .as_ref()
-                .map_or(false, |else_meta| else_meta.body.has_return_statement())
+                .is_some_and(|else_meta| else_meta.body.has_return_statement())
     }
 }
 
diff --git a/query-builder-macros/src/statement_parser/query_chain.rs b/query-builder-macros/src/statement_parser/query_chain.rs
index 4fefd1f20..e799a4099 100644
--- a/query-builder-macros/src/statement_parser/query_chain.rs
+++ b/query-builder-macros/src/statement_parser/query_chain.rs
@@ -51,7 +51,7 @@ impl QueriesChainParser {
     pub fn _is_definitely_query_block(&self) -> bool {
         let last_stmt = self.statements.last();
 
-        last_stmt.map_or(false, |s| s.is_return_statement())
+        last_stmt.is_some_and(|s| s.is_return_statement())
     }
 
     pub fn is_likely_query_block(&self) -> bool {