diff --git a/src/main/java/org/openrewrite/analysis/controlflow/ControlFlowSummary.java b/src/main/java/org/openrewrite/analysis/controlflow/ControlFlowSummary.java
index 8ea49302f..29924a39b 100644
--- a/src/main/java/org/openrewrite/analysis/controlflow/ControlFlowSummary.java
+++ b/src/main/java/org/openrewrite/analysis/controlflow/ControlFlowSummary.java
@@ -59,16 +59,16 @@ private static void recurseGetAllControlFlowNodes(ControlFlowNode current, Set<C
     public Set<ControlFlowNode.BasicBlock> getBasicBlocks() {
         return getAllNodes()
                 .stream()
-                .filter(node -> node instanceof ControlFlowNode.BasicBlock)
-                .map(node -> (ControlFlowNode.BasicBlock) node)
+                .filter(org.openrewrite.analysis.controlflow.ControlFlowNode.BasicBlock.class::isInstance)
+                .map(org.openrewrite.analysis.controlflow.ControlFlowNode.BasicBlock.class::cast)
                 .collect(Collectors.toSet());
     }
 
     public Set<ControlFlowNode.ConditionNode> getConditionNodes() {
         return getAllNodes()
                 .stream()
-                .filter(node -> node instanceof ControlFlowNode.ConditionNode)
-                .map(node -> (ControlFlowNode.ConditionNode) node)
+                .filter(org.openrewrite.analysis.controlflow.ControlFlowNode.ConditionNode.class::isInstance)
+                .map(org.openrewrite.analysis.controlflow.ControlFlowNode.ConditionNode.class::cast)
                 .collect(Collectors.toSet());
     }
 
@@ -92,8 +92,8 @@ public Set<ControlFlowNode.BasicBlock> computeReachableBasicBlock(BarrierGuardPr
         recurseComputeReachableBasicBlock(start, predicate, reachable);
         return reachable
                 .stream()
-                .filter(cfn -> cfn instanceof ControlFlowNode.BasicBlock)
-                .map(cfn -> (ControlFlowNode.BasicBlock) cfn)
+                .filter(org.openrewrite.analysis.controlflow.ControlFlowNode.BasicBlock.class::isInstance)
+                .map(org.openrewrite.analysis.controlflow.ControlFlowNode.BasicBlock.class::cast)
                 .collect(Collectors.toSet());
     }
 
diff --git a/src/main/java/org/openrewrite/analysis/search/FindMethods.java b/src/main/java/org/openrewrite/analysis/search/FindMethods.java
index 90c8531ac..ccb836296 100644
--- a/src/main/java/org/openrewrite/analysis/search/FindMethods.java
+++ b/src/main/java/org/openrewrite/analysis/search/FindMethods.java
@@ -209,7 +209,7 @@ public static Set<J> find(J j, String methodPattern, boolean matchOverrides) {
                 )
                 .stream()
                 .filter(t -> t instanceof J.MethodInvocation || t instanceof J.MemberReference || t instanceof J.NewClass)
-                .map(t -> (J) t)
+                .map(J.class::cast)
                 .collect(Collectors.toSet());
     }
 
diff --git a/src/main/java/org/openrewrite/analysis/trait/expr/VarAccess.java b/src/main/java/org/openrewrite/analysis/trait/expr/VarAccess.java
index e5caa7d31..9e8442701 100644
--- a/src/main/java/org/openrewrite/analysis/trait/expr/VarAccess.java
+++ b/src/main/java/org/openrewrite/analysis/trait/expr/VarAccess.java
@@ -137,7 +137,7 @@ public boolean hasQualifier() {
 
     @Override
     public Option<Expr> getQualifier() {
-        return InstanceAccess.viewOf(cursor.getParentTreeCursor()).map(e -> (Expr) e).toOption();
+        return InstanceAccess.viewOf(cursor.getParentTreeCursor()).map(Expr.class::cast).toOption();
     }
 
     @Override