diff --git a/java/ql/lib/semmle/code/java/ControlFlowGraph.qll b/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
index 64449b6f93d7..de1a239faeac 100644
--- a/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
+++ b/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
@@ -162,12 +162,6 @@ module ControlFlow {
     /** Gets the expression this `Node` corresponds to, if any. */
     Expr asExpr() { this = TExprNode(result) }
 
-    /** Gets the call this `Node` corresponds to, if any. */
-    Call asCall() {
-      result = this.asExpr() or
-      result = this.asStmt()
-    }
-
     /** Gets a textual representation of this element. */
     string toString() { none() }
 
diff --git a/java/ql/lib/semmle/code/java/Expr.qll b/java/ql/lib/semmle/code/java/Expr.qll
index c609c35cd71e..068ba100be98 100644
--- a/java/ql/lib/semmle/code/java/Expr.qll
+++ b/java/ql/lib/semmle/code/java/Expr.qll
@@ -1245,6 +1245,9 @@ class ClassInstanceExpr extends Expr, ConstructorCall, @classinstancexpr {
   /** Gets the immediately enclosing statement of this class instance creation expression. */
   override Stmt getEnclosingStmt() { result = Expr.super.getEnclosingStmt() }
 
+  /** Gets the `ControlFlowNode` corresponding to this call. */
+  override ControlFlowNode getControlFlowNode() { result = Expr.super.getControlFlowNode() }
+
   /** Gets a printable representation of this expression. */
   override string toString() {
     result = "new " + this.getConstructor().getName() + "(...)"
@@ -2113,6 +2116,9 @@ class MethodCall extends Expr, Call, @methodaccess {
   /** Gets the immediately enclosing statement that contains this method access. */
   override Stmt getEnclosingStmt() { result = Expr.super.getEnclosingStmt() }
 
+  /** Gets the `ControlFlowNode` corresponding to this call. */
+  override ControlFlowNode getControlFlowNode() { result = Expr.super.getControlFlowNode() }
+
   /** Gets a printable representation of this expression. */
   override string toString() {
     if exists(this.getMethod())
@@ -2305,6 +2311,9 @@ class Call extends ExprParent, @caller {
   /** Gets the enclosing statement of this call. */
   /*abstract*/ Stmt getEnclosingStmt() { none() }
 
+  /** Gets the `ControlFlowNode` corresponding to this call. */
+  /*abstract*/ ControlFlowNode getControlFlowNode() { none() }
+
   /** Gets the number of arguments provided in this call. */
   int getNumArgument() { count(this.getAnArgument()) = result }
 
diff --git a/java/ql/lib/semmle/code/java/Statement.qll b/java/ql/lib/semmle/code/java/Statement.qll
index 4366334dfbdc..e2c7779b43cb 100644
--- a/java/ql/lib/semmle/code/java/Statement.qll
+++ b/java/ql/lib/semmle/code/java/Statement.qll
@@ -61,7 +61,7 @@ class Stmt extends StmtParent, ExprParent, @stmt {
 }
 
 /** A statement parent is any element that can have a statement as its child. */
-class StmtParent extends @stmtparent, Top { }
+class StmtParent extends @stmtparent, ExprParent { }
 
 /**
  * An error statement.
@@ -960,6 +960,9 @@ class ThisConstructorInvocationStmt extends Stmt, ConstructorCall, @constructori
   /** Gets the immediately enclosing statement of this constructor invocation. */
   override Stmt getEnclosingStmt() { result = this }
 
+  /** Gets the `ControlFlowNode` corresponding to this call. */
+  override ControlFlowNode getControlFlowNode() { result = Stmt.super.getControlFlowNode() }
+
   override string pp() { result = "this(...)" }
 
   override string toString() { result = "this(...)" }
@@ -1001,6 +1004,9 @@ class SuperConstructorInvocationStmt extends Stmt, ConstructorCall, @superconstr
   /** Gets the immediately enclosing statement of this constructor invocation. */
   override Stmt getEnclosingStmt() { result = this }
 
+  /** Gets the `ControlFlowNode` corresponding to this call. */
+  override ControlFlowNode getControlFlowNode() { result = Stmt.super.getControlFlowNode() }
+
   override string pp() { result = "super(...)" }
 
   override string toString() { result = "super(...)" }
diff --git a/java/ql/lib/semmle/code/java/controlflow/Paths.qll b/java/ql/lib/semmle/code/java/controlflow/Paths.qll
index abc56e32b5ca..23f0786966db 100644
--- a/java/ql/lib/semmle/code/java/controlflow/Paths.qll
+++ b/java/ql/lib/semmle/code/java/controlflow/Paths.qll
@@ -34,7 +34,7 @@ abstract class ActionConfiguration extends string {
 private BasicBlock actionBlock(ActionConfiguration conf) {
   exists(ControlFlowNode node | result = node.getBasicBlock() |
     conf.isAction(node) or
-    callAlwaysPerformsAction(node.asCall(), conf)
+    callAlwaysPerformsAction(any(Call call | call.getControlFlowNode() = node), conf)
   )
 }
 
diff --git a/java/ql/lib/semmle/code/java/dataflow/InstanceAccess.qll b/java/ql/lib/semmle/code/java/dataflow/InstanceAccess.qll
index feeb0d100c64..60ed5591a95f 100644
--- a/java/ql/lib/semmle/code/java/dataflow/InstanceAccess.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/InstanceAccess.qll
@@ -229,7 +229,7 @@ class InstanceAccessExt extends TInstanceAccessExt {
   /** Gets the control flow node associated with this instance access. */
   ControlFlowNode getCfgNode() {
     exists(ExprParent e | e = this.getAssociatedExprOrStmt() |
-      result.asCall() = e
+      result = e.(Call).getControlFlowNode()
       or
       e.(InstanceAccess).getControlFlowNode() = result
       or
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll b/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll
index 5e3a8550e3cc..962ff0bc169d 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll
@@ -132,7 +132,7 @@ private module BaseSsaImpl {
       inner != outer and
       inner.getDeclaringType() = innerclass and
       result = parentDef(desugaredGetEnclosingType*(innerclass)) and
-      result.getEnclosingStmt().getEnclosingCallable() = outer and
+      result.getEnclosingCallable() = outer and
       capturedvar = TLocalVar(outer, v) and
       closurevar = TLocalVar(inner, v)
     )
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll
index 409cf5863630..160cf0303922 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll
@@ -115,7 +115,7 @@ private ControlFlowNode captureNode(TrackedVar capturedvar, TrackedVar closureva
     inner != outer and
     inner.getDeclaringType() = innerclass and
     result = parentDef(desugaredGetEnclosingType*(innerclass)) and
-    result.getEnclosingStmt().getEnclosingCallable() = outer and
+    result.getEnclosingCallable() = outer and
     capturedvar = TLocalVar(outer, v) and
     closurevar = TLocalVar(inner, v)
   )
@@ -153,7 +153,7 @@ private predicate hasEntryDef(TrackedVar v, BasicBlock b) {
 overlay[global]
 pragma[nomagic]
 private predicate uncertainVariableUpdateImpl(TrackedVar v, ControlFlowNode n, BasicBlock b, int i) {
-  exists(Call c | c = n.asCall() | updatesNamedField(c, v, _)) and
+  exists(Call c | c.getControlFlowNode() = n | updatesNamedField(c, v, _)) and
   b.getNode(i) = n and
   hasDominanceInformation(b)
   or
@@ -525,8 +525,11 @@ private module Cached {
   overlay[global]
   cached
   predicate defUpdatesNamedField(SsaImplicitWrite calldef, TrackedField f, Callable setter) {
-    f = calldef.getSourceVariable() and
-    updatesNamedField0(calldef.getControlFlowNode().asCall(), f, setter)
+    exists(Call call |
+      f = calldef.getSourceVariable() and
+      call.getControlFlowNode() = calldef.getControlFlowNode() and
+      updatesNamedField0(call, f, setter)
+    )
   }
 
   /** Holds if `init` is a closure variable that captures the value of `capturedvar`. */
diff --git a/java/ql/src/experimental/quantum/Examples/ArtifactReuse.qll b/java/ql/src/experimental/quantum/Examples/ArtifactReuse.qll
index 776510b52ad1..1a20a7fa2b51 100644
--- a/java/ql/src/experimental/quantum/Examples/ArtifactReuse.qll
+++ b/java/ql/src/experimental/quantum/Examples/ArtifactReuse.qll
@@ -42,7 +42,7 @@ private DataFlow::Node getGeneratingWrapperSet(Crypto::NonceArtifactNode a) {
 }
 
 private predicate ancestorOfArtifact(
-  Crypto::ArtifactNode a, Callable enclosingCallable, ControlFlow::Node midOrTarget
+  Crypto::ArtifactNode a, Callable enclosingCallable, ControlFlowNode midOrTarget
 ) {
   a.asElement().(Expr).getEnclosingCallable() = enclosingCallable and
   (
@@ -87,7 +87,7 @@ predicate isArtifactReuse(Crypto::ArtifactNode a, Crypto::ArtifactNode b) {
       ancestorOfArtifact(b, commonParent, _)
     )
     implies
-    exists(Callable commonParent, ControlFlow::Node aMid, ControlFlow::Node bMid |
+    exists(Callable commonParent, ControlFlowNode aMid, ControlFlowNode bMid |
       ancestorOfArtifact(a, commonParent, aMid) and
       ancestorOfArtifact(b, commonParent, bMid) and
       a instanceof Crypto::NonceArtifactNode and
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.expected b/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.expected
index 31da586d6307..cdbc573a0e53 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.expected
+++ b/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.expected
@@ -1,157 +1,20 @@
-| Test.kt:2:43:79:2 | { ... } | Test.kt:3:13:3:13 | var ...; |
-| Test.kt:3:13:3:13 | var ...; | Test.kt:3:17:3:18 | px |
-| Test.kt:3:13:3:13 | x | Test.kt:4:13:4:13 | var ...; |
-| Test.kt:3:17:3:18 | px | Test.kt:3:13:3:13 | x |
-| Test.kt:4:13:4:13 | var ...; | Test.kt:4:17:4:18 | pw |
-| Test.kt:4:13:4:13 | w | Test.kt:5:13:5:13 | var ...; |
-| Test.kt:4:17:4:18 | pw | Test.kt:4:13:4:13 | w |
-| Test.kt:5:13:5:13 | var ...; | Test.kt:5:17:5:18 | pz |
-| Test.kt:5:13:5:13 | z | Test.kt:7:7:7:7 | var ...; |
-| Test.kt:5:17:5:18 | pz | Test.kt:5:13:5:13 | z |
-| Test.kt:7:7:7:7 | j | Test.kt:8:7:8:7 | var ...; |
-| Test.kt:7:7:7:7 | var ...; | Test.kt:7:7:7:7 | j |
-| Test.kt:8:7:8:7 | var ...; | Test.kt:8:17:8:18 | 50 |
-| Test.kt:8:7:8:7 | y | Test.kt:11:3:16:3 | <Expr>; |
-| Test.kt:8:17:8:18 | 50 | Test.kt:8:7:8:7 | y |
-| Test.kt:11:3:16:3 | ... -> ... | Test.kt:11:3:16:3 | true |
-| Test.kt:11:3:16:3 | ... -> ... | Test.kt:11:7:11:7 | x |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:11:3:16:3 | when ... |
-| Test.kt:11:3:16:3 | true | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:11:3:16:3 | when ... | Test.kt:11:3:16:3 | ... -> ... |
-| Test.kt:11:7:11:7 | x | Test.kt:11:11:11:11 | 0 |
-| Test.kt:11:7:11:11 | ... > ... | Test.kt:11:3:16:3 | ... -> ... |
-| Test.kt:11:7:11:11 | ... > ... | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:11:7:11:11 | ... > ... | Test.kt:18:3:18:3 | <Expr>; |
-| Test.kt:11:11:11:11 | 0 | Test.kt:11:7:11:11 | ... > ... |
-| Test.kt:11:14:14:3 | { ... } | Test.kt:12:4:12:4 | <Expr>; |
-| Test.kt:12:4:12:4 | <Expr>; | Test.kt:12:8:12:9 | 20 |
-| Test.kt:12:4:12:9 | ...=... | Test.kt:13:4:13:4 | <Expr>; |
-| Test.kt:12:8:12:9 | 20 | Test.kt:12:4:12:9 | ...=... |
-| Test.kt:13:4:13:4 | <Expr>; | Test.kt:13:8:13:9 | 10 |
-| Test.kt:13:8:13:9 | 10 | Test.kt:13:4:13:9 | ...=... |
-| Test.kt:14:10:16:3 | { ... } | Test.kt:15:4:15:4 | <Expr>; |
-| Test.kt:15:4:15:4 | <Expr>; | Test.kt:15:8:15:9 | 30 |
-| Test.kt:15:8:15:9 | 30 | Test.kt:15:4:15:9 | ...=... |
-| Test.kt:18:3:18:3 | <Expr>; | Test.kt:18:8:18:8 | x |
-| Test.kt:18:3:18:20 | ...=... | Test.kt:21:3:24:11 | <Expr>; |
-| Test.kt:18:7:18:20 | (...)... | Test.kt:18:3:18:20 | ...=... |
-| Test.kt:18:8:18:8 | x | Test.kt:18:12:18:12 | y |
-| Test.kt:18:8:18:12 | ... + ... | Test.kt:18:7:18:20 | (...)... |
-| Test.kt:18:12:18:12 | y | Test.kt:18:8:18:12 | ... + ... |
-| Test.kt:21:3:24:11 | ... -> ... | Test.kt:21:3:24:11 | true |
-| Test.kt:21:3:24:11 | ... -> ... | Test.kt:21:7:21:7 | x |
-| Test.kt:21:3:24:11 | <Expr>; | Test.kt:21:3:24:11 | when ... |
-| Test.kt:21:3:24:11 | true | Test.kt:24:11:24:11 | z |
-| Test.kt:21:3:24:11 | when ... | Test.kt:21:3:24:11 | ... -> ... |
-| Test.kt:21:7:21:7 | x | Test.kt:21:11:21:11 | 0 |
-| Test.kt:21:7:21:11 | ... < ... | Test.kt:2:2:79:2 | Normal Exit |
-| Test.kt:21:7:21:11 | ... < ... | Test.kt:21:3:24:11 | ... -> ... |
-| Test.kt:21:7:21:11 | ... < ... | Test.kt:22:4:22:4 | <Expr>; |
-| Test.kt:21:11:21:11 | 0 | Test.kt:21:7:21:11 | ... < ... |
-| Test.kt:22:4:22:4 | <Expr>; | Test.kt:22:8:22:9 | 40 |
-| Test.kt:22:4:22:9 | ...=... | Test.kt:27:3:27:3 | <Expr>; |
-| Test.kt:22:8:22:9 | 40 | Test.kt:22:4:22:9 | ...=... |
-| Test.kt:24:11:24:11 | z | Test.kt:24:4:24:11 | return ... |
-| Test.kt:27:3:27:3 | <Expr>; | Test.kt:27:7:27:8 | 10 |
-| Test.kt:27:3:27:8 | ...=... | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:27:7:27:8 | 10 | Test.kt:27:3:27:8 | ...=... |
-| Test.kt:30:3:33:3 | ... -> ... | Test.kt:30:7:30:7 | x |
-| Test.kt:30:3:33:3 | <Expr>; | Test.kt:30:3:33:3 | when ... |
-| Test.kt:30:3:33:3 | when ... | Test.kt:30:3:33:3 | ... -> ... |
-| Test.kt:30:7:30:7 | x | Test.kt:30:12:30:12 | 0 |
-| Test.kt:30:7:30:12 | ... (value equals) ... | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:30:7:30:12 | ... (value equals) ... | Test.kt:35:3:35:3 | <Expr>; |
-| Test.kt:30:12:30:12 | 0 | Test.kt:30:7:30:12 | ... (value equals) ... |
-| Test.kt:30:15:33:3 | { ... } | Test.kt:31:4:31:4 | <Expr>; |
-| Test.kt:31:4:31:4 | <Expr>; | Test.kt:31:8:31:9 | 60 |
-| Test.kt:31:4:31:9 | ...=... | Test.kt:32:4:32:4 | <Expr>; |
-| Test.kt:31:8:31:9 | 60 | Test.kt:31:4:31:9 | ...=... |
-| Test.kt:32:4:32:4 | <Expr>; | Test.kt:32:8:32:9 | 10 |
-| Test.kt:32:8:32:9 | 10 | Test.kt:32:4:32:9 | ...=... |
-| Test.kt:35:3:35:3 | <Expr>; | Test.kt:35:3:35:3 | z |
-| Test.kt:35:3:35:3 | z | Test.kt:35:8:35:8 | x |
-| Test.kt:35:3:35:8 | ...+=... | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:35:8:35:8 | x | Test.kt:35:3:35:8 | ...+=... |
-| Test.kt:38:3:41:3 | while (...) | Test.kt:38:10:38:10 | x |
-| Test.kt:38:10:38:10 | x | Test.kt:38:14:38:14 | 0 |
-| Test.kt:38:10:38:14 | ... > ... | Test.kt:38:17:41:3 | { ... } |
-| Test.kt:38:10:38:14 | ... > ... | Test.kt:43:3:43:3 | <Expr>; |
-| Test.kt:38:14:38:14 | 0 | Test.kt:38:10:38:14 | ... > ... |
-| Test.kt:38:17:41:3 | { ... } | Test.kt:39:4:39:4 | <Expr>; |
-| Test.kt:39:4:39:4 | <Expr>; | Test.kt:39:8:39:9 | 10 |
-| Test.kt:39:4:39:9 | ...=... | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:39:8:39:9 | 10 | Test.kt:39:4:39:9 | ...=... |
-| Test.kt:40:4:40:4 | <Expr>; | Test.kt:40:4:40:6 | tmp0 |
-| Test.kt:40:4:40:4 | x | Test.kt:40:4:40:6 | tmp0 |
-| Test.kt:40:4:40:6 | ...=... | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | <Stmt> |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | tmp0 |
-| Test.kt:40:4:40:6 | <Stmt> | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:40:4:40:6 | dec(...) | Test.kt:40:4:40:6 | ...=... |
-| Test.kt:40:4:40:6 | tmp0 | Test.kt:40:4:40:4 | <Expr>; |
-| Test.kt:40:4:40:6 | tmp0 | Test.kt:40:4:40:6 | <implicit coercion to unit> |
-| Test.kt:40:4:40:6 | tmp0 | Test.kt:40:4:40:6 | dec(...) |
-| Test.kt:40:4:40:6 | var ...; | Test.kt:40:4:40:4 | x |
-| Test.kt:40:4:40:6 | { ... } | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:43:3:43:3 | <Expr>; | Test.kt:43:3:43:3 | z |
-| Test.kt:43:3:43:3 | z | Test.kt:43:8:43:8 | y |
-| Test.kt:43:3:43:15 | ...+=... | Test.kt:73:3:73:3 | <Expr>; |
-| Test.kt:43:8:43:8 | y | Test.kt:43:8:43:15 | (...)... |
-| Test.kt:43:8:43:15 | (...)... | Test.kt:43:3:43:15 | ...+=... |
-| Test.kt:73:3:73:3 | <Expr>; | Test.kt:73:3:73:3 | z |
-| Test.kt:73:3:73:3 | z | Test.kt:73:8:73:8 | x |
-| Test.kt:73:3:73:16 | ...+=... | Test.kt:77:3:77:3 | <Expr>; |
-| Test.kt:73:8:73:8 | x | Test.kt:73:12:73:12 | y |
-| Test.kt:73:8:73:12 | ... + ... | Test.kt:73:16:73:16 | w |
-| Test.kt:73:8:73:16 | ... + ... | Test.kt:73:3:73:16 | ...+=... |
-| Test.kt:73:12:73:12 | <implicit cast> | Test.kt:73:8:73:12 | ... + ... |
-| Test.kt:73:12:73:12 | y | Test.kt:73:12:73:12 | <implicit cast> |
-| Test.kt:73:16:73:16 | w | Test.kt:73:8:73:16 | ... + ... |
-| Test.kt:77:3:77:3 | <Expr>; | Test.kt:77:7:77:8 | 40 |
-| Test.kt:77:3:77:8 | ...=... | Test.kt:78:10:78:10 | w |
-| Test.kt:77:7:77:8 | 40 | Test.kt:77:3:77:8 | ...=... |
-| Test.kt:78:10:78:10 | w | Test.kt:78:3:78:10 | return ... |
-| Test.kt:81:25:98:2 | { ... } | Test.kt:83:7:83:7 | var ...; |
-| Test.kt:83:7:83:7 | b | Test.kt:84:7:84:7 | var ...; |
-| Test.kt:83:7:83:7 | var ...; | Test.kt:83:7:83:7 | b |
-| Test.kt:84:7:84:7 | c | Test.kt:85:3:85:3 | <Expr>; |
-| Test.kt:84:7:84:7 | var ...; | Test.kt:84:7:84:7 | c |
-| Test.kt:85:3:85:3 | <Expr>; | Test.kt:85:7:85:7 | 0 |
-| Test.kt:85:3:85:7 | ...=... | Test.kt:86:3:96:3 | while (...) |
-| Test.kt:85:7:85:7 | 0 | Test.kt:85:3:85:7 | ...=... |
-| Test.kt:86:3:96:3 | while (...) | Test.kt:86:9:86:12 | true |
-| Test.kt:86:9:86:12 | true | Test.kt:86:15:96:3 | { ... } |
-| Test.kt:86:15:96:3 | { ... } | Test.kt:87:4:87:4 | <Expr>; |
-| Test.kt:87:4:87:4 | <Expr>; | Test.kt:87:8:87:9 | 10 |
-| Test.kt:87:4:87:9 | ...=... | Test.kt:88:4:91:4 | <Expr>; |
-| Test.kt:87:8:87:9 | 10 | Test.kt:87:4:87:9 | ...=... |
-| Test.kt:88:4:91:4 | ... -> ... | Test.kt:88:8:88:8 | a |
-| Test.kt:88:4:91:4 | <Expr>; | Test.kt:88:4:91:4 | when ... |
-| Test.kt:88:4:91:4 | when ... | Test.kt:88:4:91:4 | ... -> ... |
-| Test.kt:88:8:88:8 | a | Test.kt:88:12:88:14 | 100 |
-| Test.kt:88:8:88:14 | ... > ... | Test.kt:88:17:91:4 | { ... } |
-| Test.kt:88:8:88:14 | ... > ... | Test.kt:92:4:93:9 | <Expr>; |
-| Test.kt:88:12:88:14 | 100 | Test.kt:88:8:88:14 | ... > ... |
-| Test.kt:88:17:91:4 | { ... } | Test.kt:89:5:89:5 | <Expr>; |
-| Test.kt:89:5:89:5 | <Expr>; | Test.kt:89:9:89:10 | 10 |
-| Test.kt:89:5:89:10 | ...=... | Test.kt:90:5:90:5 | <Expr>; |
-| Test.kt:89:9:89:10 | 10 | Test.kt:89:5:89:10 | ...=... |
-| Test.kt:90:5:90:5 | <Expr>; | Test.kt:90:9:90:9 | c |
-| Test.kt:90:9:90:9 | c | Test.kt:90:5:90:9 | ...=... |
-| Test.kt:92:4:93:9 | ... -> ... | Test.kt:92:8:92:8 | a |
-| Test.kt:92:4:93:9 | <Expr>; | Test.kt:92:4:93:9 | when ... |
-| Test.kt:92:4:93:9 | when ... | Test.kt:92:4:93:9 | ... -> ... |
-| Test.kt:92:8:92:8 | a | Test.kt:92:13:92:14 | 10 |
-| Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:81:2:98:2 | Normal Exit |
-| Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:93:5:93:9 | break |
-| Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:94:4:95:12 | <Expr>; |
-| Test.kt:92:13:92:14 | 10 | Test.kt:92:8:92:14 | ... (value equals) ... |
-| Test.kt:93:5:93:9 | break | Test.kt:97:10:97:10 | b |
-| Test.kt:94:4:95:12 | ... -> ... | Test.kt:94:8:94:8 | a |
-| Test.kt:94:4:95:12 | <Expr>; | Test.kt:94:4:95:12 | when ... |
-| Test.kt:94:4:95:12 | when ... | Test.kt:94:4:95:12 | ... -> ... |
-| Test.kt:94:8:94:8 | a | Test.kt:94:13:94:14 | 20 |
-| Test.kt:94:8:94:14 | ... (value equals) ... | Test.kt:95:12:95:12 | c |
-| Test.kt:94:13:94:14 | 20 | Test.kt:94:8:94:14 | ... (value equals) ... |
-| Test.kt:95:12:95:12 | c | Test.kt:95:5:95:12 | return ... |
-| Test.kt:97:10:97:10 | b | Test.kt:97:3:97:10 | return ... |
+| Test.kt:2:2:79:2 | Normal Exit | Test.kt:2:2:79:2 | Exit |
+| Test.kt:2:43:79:2 | { ... } | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:2:43:79:2 | { ... } | Test.kt:11:14:14:3 | { ... } |
+| Test.kt:2:43:79:2 | { ... } | Test.kt:18:3:18:3 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:2:2:79:2 | Normal Exit |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:21:3:24:11 | ... -> ... |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:38:10:38:10 | x |
+| Test.kt:38:10:38:10 | x | Test.kt:38:17:41:3 | { ... } |
+| Test.kt:38:10:38:10 | x | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:81:2:98:2 | Normal Exit | Test.kt:81:2:98:2 | Exit |
+| Test.kt:81:25:98:2 | { ... } | Test.kt:86:9:86:12 | true |
+| Test.kt:86:9:86:12 | true | Test.kt:88:17:91:4 | { ... } |
+| Test.kt:86:9:86:12 | true | Test.kt:92:4:93:9 | <Expr>; |
+| Test.kt:92:4:93:9 | <Expr>; | Test.kt:81:2:98:2 | Normal Exit |
+| Test.kt:92:4:93:9 | <Expr>; | Test.kt:93:5:93:9 | break |
+| Test.kt:92:4:93:9 | <Expr>; | Test.kt:94:4:95:12 | <Expr>; |
+| Test.kt:94:4:95:12 | <Expr>; | Test.kt:95:12:95:12 | c |
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.ql b/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.ql
index 701640bf7209..b157cb5fca3d 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.ql
+++ b/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.ql
@@ -1,9 +1,8 @@
-import default
-import semmle.code.java.controlflow.Dominance
+import java
 
-from Method func, ControlFlowNode dominator, ControlFlowNode node
+from Method func, BasicBlock dominator, BasicBlock bb
 where
-  iDominates(dominator, node) and
-  dominator.getEnclosingStmt().getEnclosingCallable() = func and
+  dominator.immediatelyDominates(bb) and
+  dominator.getEnclosingCallable() = func and
   func.getDeclaringType().hasName("Test")
-select dominator, node
+select dominator, bb
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.expected b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.expected
index 75662bfacd49..cdbc573a0e53 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.expected
+++ b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.expected
@@ -1,157 +1,20 @@
-| Test.kt:2:43:79:2 | { ... } | Test.kt:3:9:3:18 | var ...; |
-| Test.kt:3:9:3:18 | var ...; | Test.kt:3:17:3:18 | px |
-| Test.kt:3:9:3:18 | x | Test.kt:4:9:4:18 | var ...; |
-| Test.kt:3:17:3:18 | px | Test.kt:3:9:3:18 | x |
-| Test.kt:4:9:4:18 | var ...; | Test.kt:4:17:4:18 | pw |
-| Test.kt:4:9:4:18 | w | Test.kt:5:9:5:18 | var ...; |
-| Test.kt:4:17:4:18 | pw | Test.kt:4:9:4:18 | w |
-| Test.kt:5:9:5:18 | var ...; | Test.kt:5:17:5:18 | pz |
-| Test.kt:5:9:5:18 | z | Test.kt:7:3:7:12 | var ...; |
-| Test.kt:5:17:5:18 | pz | Test.kt:5:9:5:18 | z |
-| Test.kt:7:3:7:12 | j | Test.kt:8:3:8:18 | var ...; |
-| Test.kt:7:3:7:12 | var ...; | Test.kt:7:3:7:12 | j |
-| Test.kt:8:3:8:18 | var ...; | Test.kt:8:17:8:18 | 50 |
-| Test.kt:8:3:8:18 | y | Test.kt:11:3:16:3 | <Expr>; |
-| Test.kt:8:17:8:18 | 50 | Test.kt:8:3:8:18 | y |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:11:3:16:3 | when ... |
-| Test.kt:11:3:16:3 | when ... | Test.kt:11:7:14:3 | ... -> ... |
-| Test.kt:11:7:11:7 | x | Test.kt:11:11:11:11 | 0 |
-| Test.kt:11:7:11:11 | ... > ... | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:11:7:11:11 | ... > ... | Test.kt:14:10:16:3 | ... -> ... |
-| Test.kt:11:7:11:11 | ... > ... | Test.kt:18:3:18:20 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:11:7:11:7 | x |
-| Test.kt:11:11:11:11 | 0 | Test.kt:11:7:11:11 | ... > ... |
-| Test.kt:11:14:14:3 | { ... } | Test.kt:12:4:12:9 | <Expr>; |
-| Test.kt:12:4:12:9 | ...=... | Test.kt:13:4:13:9 | <Expr>; |
-| Test.kt:12:4:12:9 | <Expr>; | Test.kt:12:8:12:9 | 20 |
-| Test.kt:12:8:12:9 | 20 | Test.kt:12:4:12:9 | ...=... |
-| Test.kt:13:4:13:9 | <Expr>; | Test.kt:13:8:13:9 | 10 |
-| Test.kt:13:8:13:9 | 10 | Test.kt:13:4:13:9 | ...=... |
-| Test.kt:14:10:16:3 | ... -> ... | Test.kt:14:10:16:3 | true |
-| Test.kt:14:10:16:3 | true | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:14:10:16:3 | { ... } | Test.kt:15:4:15:9 | <Expr>; |
-| Test.kt:15:4:15:9 | <Expr>; | Test.kt:15:8:15:9 | 30 |
-| Test.kt:15:8:15:9 | 30 | Test.kt:15:4:15:9 | ...=... |
-| Test.kt:18:3:18:20 | ...=... | Test.kt:21:3:24:11 | <Expr>; |
-| Test.kt:18:3:18:20 | <Expr>; | Test.kt:18:8:18:8 | x |
-| Test.kt:18:7:18:20 | (...)... | Test.kt:18:3:18:20 | ...=... |
-| Test.kt:18:8:18:8 | x | Test.kt:18:12:18:12 | y |
-| Test.kt:18:8:18:12 | ... + ... | Test.kt:18:7:18:20 | (...)... |
-| Test.kt:18:12:18:12 | y | Test.kt:18:8:18:12 | ... + ... |
-| Test.kt:21:3:24:11 | <Expr>; | Test.kt:21:3:24:11 | when ... |
-| Test.kt:21:3:24:11 | when ... | Test.kt:21:7:22:9 | ... -> ... |
-| Test.kt:21:7:21:7 | x | Test.kt:21:11:21:11 | 0 |
-| Test.kt:21:7:21:11 | ... < ... | Test.kt:2:2:79:2 | Normal Exit |
-| Test.kt:21:7:21:11 | ... < ... | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:21:7:21:11 | ... < ... | Test.kt:24:4:24:11 | ... -> ... |
-| Test.kt:21:7:22:9 | ... -> ... | Test.kt:21:7:21:7 | x |
-| Test.kt:21:11:21:11 | 0 | Test.kt:21:7:21:11 | ... < ... |
-| Test.kt:22:4:22:9 | ...=... | Test.kt:27:3:27:8 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:22:8:22:9 | 40 |
-| Test.kt:22:8:22:9 | 40 | Test.kt:22:4:22:9 | ...=... |
-| Test.kt:24:4:24:11 | ... -> ... | Test.kt:24:4:24:11 | true |
-| Test.kt:24:4:24:11 | true | Test.kt:24:11:24:11 | z |
-| Test.kt:24:11:24:11 | z | Test.kt:24:4:24:11 | return ... |
-| Test.kt:27:3:27:8 | ...=... | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:27:7:27:8 | 10 |
-| Test.kt:27:7:27:8 | 10 | Test.kt:27:3:27:8 | ...=... |
-| Test.kt:30:3:33:3 | <Expr>; | Test.kt:30:3:33:3 | when ... |
-| Test.kt:30:3:33:3 | when ... | Test.kt:30:7:33:3 | ... -> ... |
-| Test.kt:30:7:30:7 | x | Test.kt:30:12:30:12 | 0 |
-| Test.kt:30:7:30:12 | ... (value equals) ... | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:30:7:30:12 | ... (value equals) ... | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:30:7:30:7 | x |
-| Test.kt:30:12:30:12 | 0 | Test.kt:30:7:30:12 | ... (value equals) ... |
-| Test.kt:30:15:33:3 | { ... } | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:31:4:31:9 | ...=... | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:31:4:31:9 | <Expr>; | Test.kt:31:8:31:9 | 60 |
-| Test.kt:31:8:31:9 | 60 | Test.kt:31:4:31:9 | ...=... |
-| Test.kt:32:4:32:9 | <Expr>; | Test.kt:32:8:32:9 | 10 |
-| Test.kt:32:8:32:9 | 10 | Test.kt:32:4:32:9 | ...=... |
-| Test.kt:35:3:35:8 | ...+=... | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:35:3:35:8 | z |
-| Test.kt:35:3:35:8 | z | Test.kt:35:8:35:8 | x |
-| Test.kt:35:8:35:8 | x | Test.kt:35:3:35:8 | ...+=... |
-| Test.kt:38:3:41:3 | while (...) | Test.kt:38:10:38:10 | x |
-| Test.kt:38:10:38:10 | x | Test.kt:38:14:38:14 | 0 |
-| Test.kt:38:10:38:14 | ... > ... | Test.kt:38:17:41:3 | { ... } |
-| Test.kt:38:10:38:14 | ... > ... | Test.kt:43:3:43:15 | <Expr>; |
-| Test.kt:38:14:38:14 | 0 | Test.kt:38:10:38:14 | ... > ... |
-| Test.kt:38:17:41:3 | { ... } | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:39:4:39:9 | ...=... | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:39:4:39:9 | <Expr>; | Test.kt:39:8:39:9 | 10 |
-| Test.kt:39:8:39:9 | 10 | Test.kt:39:4:39:9 | ...=... |
-| Test.kt:40:4:40:4 | x | Test.kt:40:4:40:6 | <unary> |
-| Test.kt:40:4:40:6 | ...=... | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | <Stmt> |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | <unary> |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | <unary> |
-| Test.kt:40:4:40:6 | <Stmt> | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:40:4:40:6 | <unary> | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:40:4:40:6 | <unary> | Test.kt:40:4:40:6 | <implicit coercion to unit> |
-| Test.kt:40:4:40:6 | <unary> | Test.kt:40:4:40:6 | dec(...) |
-| Test.kt:40:4:40:6 | dec(...) | Test.kt:40:4:40:6 | ...=... |
-| Test.kt:40:4:40:6 | var ...; | Test.kt:40:4:40:4 | x |
-| Test.kt:40:4:40:6 | { ... } | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:43:3:43:15 | ...+=... | Test.kt:73:3:73:16 | <Expr>; |
-| Test.kt:43:3:43:15 | <Expr>; | Test.kt:43:3:43:15 | z |
-| Test.kt:43:3:43:15 | z | Test.kt:43:8:43:8 | y |
-| Test.kt:43:8:43:8 | y | Test.kt:43:8:43:15 | (...)... |
-| Test.kt:43:8:43:15 | (...)... | Test.kt:43:3:43:15 | ...+=... |
-| Test.kt:73:3:73:16 | ...+=... | Test.kt:77:3:77:8 | <Expr>; |
-| Test.kt:73:3:73:16 | <Expr>; | Test.kt:73:3:73:16 | z |
-| Test.kt:73:3:73:16 | z | Test.kt:73:8:73:8 | x |
-| Test.kt:73:8:73:8 | x | Test.kt:73:12:73:12 | y |
-| Test.kt:73:8:73:12 | ... + ... | Test.kt:73:16:73:16 | w |
-| Test.kt:73:8:73:16 | ... + ... | Test.kt:73:3:73:16 | ...+=... |
-| Test.kt:73:12:73:12 | <implicit cast> | Test.kt:73:8:73:12 | ... + ... |
-| Test.kt:73:12:73:12 | y | Test.kt:73:12:73:12 | <implicit cast> |
-| Test.kt:73:16:73:16 | w | Test.kt:73:8:73:16 | ... + ... |
-| Test.kt:77:3:77:8 | ...=... | Test.kt:78:10:78:10 | w |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:77:7:77:8 | 40 |
-| Test.kt:77:7:77:8 | 40 | Test.kt:77:3:77:8 | ...=... |
-| Test.kt:78:10:78:10 | w | Test.kt:78:3:78:10 | return ... |
-| Test.kt:81:25:98:2 | { ... } | Test.kt:83:3:83:12 | var ...; |
-| Test.kt:83:3:83:12 | b | Test.kt:84:3:84:12 | var ...; |
-| Test.kt:83:3:83:12 | var ...; | Test.kt:83:3:83:12 | b |
-| Test.kt:84:3:84:12 | c | Test.kt:85:3:85:7 | <Expr>; |
-| Test.kt:84:3:84:12 | var ...; | Test.kt:84:3:84:12 | c |
-| Test.kt:85:3:85:7 | ...=... | Test.kt:86:3:96:3 | while (...) |
-| Test.kt:85:3:85:7 | <Expr>; | Test.kt:85:7:85:7 | 0 |
-| Test.kt:85:7:85:7 | 0 | Test.kt:85:3:85:7 | ...=... |
-| Test.kt:86:3:96:3 | while (...) | Test.kt:86:9:86:12 | true |
-| Test.kt:86:9:86:12 | true | Test.kt:86:15:96:3 | { ... } |
-| Test.kt:86:15:96:3 | { ... } | Test.kt:87:4:87:9 | <Expr>; |
-| Test.kt:87:4:87:9 | ...=... | Test.kt:88:4:91:4 | <Expr>; |
-| Test.kt:87:4:87:9 | <Expr>; | Test.kt:87:8:87:9 | 10 |
-| Test.kt:87:8:87:9 | 10 | Test.kt:87:4:87:9 | ...=... |
-| Test.kt:88:4:91:4 | <Expr>; | Test.kt:88:4:91:4 | when ... |
-| Test.kt:88:4:91:4 | when ... | Test.kt:88:8:91:4 | ... -> ... |
-| Test.kt:88:8:88:8 | a | Test.kt:88:12:88:14 | 100 |
-| Test.kt:88:8:88:14 | ... > ... | Test.kt:88:17:91:4 | { ... } |
-| Test.kt:88:8:88:14 | ... > ... | Test.kt:92:4:93:9 | <Expr>; |
-| Test.kt:88:8:91:4 | ... -> ... | Test.kt:88:8:88:8 | a |
-| Test.kt:88:12:88:14 | 100 | Test.kt:88:8:88:14 | ... > ... |
-| Test.kt:88:17:91:4 | { ... } | Test.kt:89:5:89:10 | <Expr>; |
-| Test.kt:89:5:89:10 | ...=... | Test.kt:90:5:90:9 | <Expr>; |
-| Test.kt:89:5:89:10 | <Expr>; | Test.kt:89:9:89:10 | 10 |
-| Test.kt:89:9:89:10 | 10 | Test.kt:89:5:89:10 | ...=... |
-| Test.kt:90:5:90:9 | <Expr>; | Test.kt:90:9:90:9 | c |
-| Test.kt:90:9:90:9 | c | Test.kt:90:5:90:9 | ...=... |
-| Test.kt:92:4:93:9 | <Expr>; | Test.kt:92:4:93:9 | when ... |
-| Test.kt:92:4:93:9 | when ... | Test.kt:92:8:93:9 | ... -> ... |
-| Test.kt:92:8:92:8 | a | Test.kt:92:13:92:14 | 10 |
-| Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:81:2:98:2 | Normal Exit |
-| Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:93:5:93:9 | break |
-| Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:94:4:95:12 | <Expr>; |
-| Test.kt:92:8:93:9 | ... -> ... | Test.kt:92:8:92:8 | a |
-| Test.kt:92:13:92:14 | 10 | Test.kt:92:8:92:14 | ... (value equals) ... |
-| Test.kt:93:5:93:9 | break | Test.kt:97:10:97:10 | b |
-| Test.kt:94:4:95:12 | <Expr>; | Test.kt:94:4:95:12 | when ... |
-| Test.kt:94:4:95:12 | when ... | Test.kt:94:8:95:12 | ... -> ... |
-| Test.kt:94:8:94:8 | a | Test.kt:94:13:94:14 | 20 |
-| Test.kt:94:8:94:14 | ... (value equals) ... | Test.kt:95:12:95:12 | c |
-| Test.kt:94:8:95:12 | ... -> ... | Test.kt:94:8:94:8 | a |
-| Test.kt:94:13:94:14 | 20 | Test.kt:94:8:94:14 | ... (value equals) ... |
-| Test.kt:95:12:95:12 | c | Test.kt:95:5:95:12 | return ... |
-| Test.kt:97:10:97:10 | b | Test.kt:97:3:97:10 | return ... |
+| Test.kt:2:2:79:2 | Normal Exit | Test.kt:2:2:79:2 | Exit |
+| Test.kt:2:43:79:2 | { ... } | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:2:43:79:2 | { ... } | Test.kt:11:14:14:3 | { ... } |
+| Test.kt:2:43:79:2 | { ... } | Test.kt:18:3:18:3 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:2:2:79:2 | Normal Exit |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:21:3:24:11 | ... -> ... |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:38:10:38:10 | x |
+| Test.kt:38:10:38:10 | x | Test.kt:38:17:41:3 | { ... } |
+| Test.kt:38:10:38:10 | x | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:81:2:98:2 | Normal Exit | Test.kt:81:2:98:2 | Exit |
+| Test.kt:81:25:98:2 | { ... } | Test.kt:86:9:86:12 | true |
+| Test.kt:86:9:86:12 | true | Test.kt:88:17:91:4 | { ... } |
+| Test.kt:86:9:86:12 | true | Test.kt:92:4:93:9 | <Expr>; |
+| Test.kt:92:4:93:9 | <Expr>; | Test.kt:81:2:98:2 | Normal Exit |
+| Test.kt:92:4:93:9 | <Expr>; | Test.kt:93:5:93:9 | break |
+| Test.kt:92:4:93:9 | <Expr>; | Test.kt:94:4:95:12 | <Expr>; |
+| Test.kt:94:4:95:12 | <Expr>; | Test.kt:95:12:95:12 | c |
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.ql b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.ql
index 701640bf7209..b157cb5fca3d 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.ql
+++ b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.ql
@@ -1,9 +1,8 @@
-import default
-import semmle.code.java.controlflow.Dominance
+import java
 
-from Method func, ControlFlowNode dominator, ControlFlowNode node
+from Method func, BasicBlock dominator, BasicBlock bb
 where
-  iDominates(dominator, node) and
-  dominator.getEnclosingStmt().getEnclosingCallable() = func and
+  dominator.immediatelyDominates(bb) and
+  dominator.getEnclosingCallable() = func and
   func.getDeclaringType().hasName("Test")
-select dominator, node
+select dominator, bb
diff --git a/java/ql/test/library-tests/controlflow/dominance/dominator.expected b/java/ql/test/library-tests/controlflow/dominance/dominator.expected
index 1e385c4fd62f..e7eafe4ecaee 100644
--- a/java/ql/test/library-tests/controlflow/dominance/dominator.expected
+++ b/java/ql/test/library-tests/controlflow/dominance/dominator.expected
@@ -1,176 +1,31 @@
-| Test.java:2:32:72:2 | { ... } | Test.java:3:3:3:8 | var ...; |
-| Test.java:3:3:3:8 | var ...; | Test.java:3:7:3:7 | j |
-| Test.java:3:7:3:7 | j | Test.java:4:3:4:14 | var ...; |
-| Test.java:4:3:4:14 | var ...; | Test.java:4:12:4:13 | 50 |
-| Test.java:4:8:4:13 | y | Test.java:7:3:7:12 | if (...) |
-| Test.java:4:12:4:13 | 50 | Test.java:4:8:4:13 | y |
-| Test.java:7:3:7:12 | if (...) | Test.java:7:7:7:7 | x |
-| Test.java:7:7:7:7 | x | Test.java:7:11:7:11 | 0 |
-| Test.java:7:7:7:11 | ... > ... | Test.java:7:14:10:3 | { ... } |
-| Test.java:7:7:7:11 | ... > ... | Test.java:10:10:12:3 | { ... } |
-| Test.java:7:7:7:11 | ... > ... | Test.java:14:3:14:20 | <Expr>; |
-| Test.java:7:11:7:11 | 0 | Test.java:7:7:7:11 | ... > ... |
-| Test.java:7:14:10:3 | { ... } | Test.java:8:4:8:10 | <Expr>; |
-| Test.java:8:4:8:9 | ...=... | Test.java:9:4:9:10 | <Expr>; |
-| Test.java:8:4:8:10 | <Expr>; | Test.java:8:8:8:9 | 20 |
-| Test.java:8:8:8:9 | 20 | Test.java:8:4:8:9 | ...=... |
-| Test.java:9:4:9:10 | <Expr>; | Test.java:9:8:9:9 | 10 |
-| Test.java:9:8:9:9 | 10 | Test.java:9:4:9:9 | ...=... |
-| Test.java:10:10:12:3 | { ... } | Test.java:11:4:11:10 | <Expr>; |
-| Test.java:11:4:11:10 | <Expr>; | Test.java:11:8:11:9 | 30 |
-| Test.java:11:8:11:9 | 30 | Test.java:11:4:11:9 | ...=... |
-| Test.java:14:3:14:19 | ...=... | Test.java:17:3:17:12 | if (...) |
-| Test.java:14:3:14:20 | <Expr>; | Test.java:14:14:14:14 | x |
-| Test.java:14:7:14:19 | (...)... | Test.java:14:3:14:19 | ...=... |
-| Test.java:14:14:14:14 | x | Test.java:14:18:14:18 | y |
-| Test.java:14:14:14:18 | ... + ... | Test.java:14:7:14:19 | (...)... |
-| Test.java:14:18:14:18 | y | Test.java:14:14:14:18 | ... + ... |
-| Test.java:17:3:17:12 | if (...) | Test.java:17:7:17:7 | x |
-| Test.java:17:7:17:7 | x | Test.java:17:11:17:11 | 0 |
-| Test.java:17:7:17:11 | ... < ... | Test.java:2:6:2:9 | Normal Exit |
-| Test.java:17:7:17:11 | ... < ... | Test.java:18:4:18:10 | <Expr>; |
-| Test.java:17:7:17:11 | ... < ... | Test.java:20:11:20:11 | z |
-| Test.java:17:11:17:11 | 0 | Test.java:17:7:17:11 | ... < ... |
-| Test.java:18:4:18:9 | ...=... | Test.java:23:3:23:9 | <Expr>; |
-| Test.java:18:4:18:10 | <Expr>; | Test.java:18:8:18:9 | 40 |
-| Test.java:18:8:18:9 | 40 | Test.java:18:4:18:9 | ...=... |
-| Test.java:20:11:20:11 | z | Test.java:20:4:20:12 | return ... |
-| Test.java:23:3:23:8 | ...=... | Test.java:26:3:26:13 | if (...) |
-| Test.java:23:3:23:9 | <Expr>; | Test.java:23:7:23:8 | 10 |
-| Test.java:23:7:23:8 | 10 | Test.java:23:3:23:8 | ...=... |
-| Test.java:26:3:26:13 | if (...) | Test.java:26:7:26:7 | x |
-| Test.java:26:7:26:7 | x | Test.java:26:12:26:12 | 0 |
-| Test.java:26:7:26:12 | ... == ... | Test.java:26:15:29:3 | { ... } |
-| Test.java:26:7:26:12 | ... == ... | Test.java:31:3:31:9 | <Expr>; |
-| Test.java:26:12:26:12 | 0 | Test.java:26:7:26:12 | ... == ... |
-| Test.java:26:15:29:3 | { ... } | Test.java:27:4:27:10 | <Expr>; |
-| Test.java:27:4:27:9 | ...=... | Test.java:28:4:28:10 | <Expr>; |
-| Test.java:27:4:27:10 | <Expr>; | Test.java:27:8:27:9 | 60 |
-| Test.java:27:8:27:9 | 60 | Test.java:27:4:27:9 | ...=... |
-| Test.java:28:4:28:10 | <Expr>; | Test.java:28:8:28:9 | 10 |
-| Test.java:28:8:28:9 | 10 | Test.java:28:4:28:9 | ...=... |
-| Test.java:31:3:31:3 | z | Test.java:31:8:31:8 | x |
-| Test.java:31:3:31:8 | ...+=... | Test.java:34:3:34:15 | while (...) |
-| Test.java:31:3:31:9 | <Expr>; | Test.java:31:3:31:3 | z |
-| Test.java:31:8:31:8 | x | Test.java:31:3:31:8 | ...+=... |
-| Test.java:34:3:34:15 | while (...) | Test.java:34:10:34:10 | x |
-| Test.java:34:10:34:10 | x | Test.java:34:14:34:14 | 0 |
-| Test.java:34:10:34:14 | ... > ... | Test.java:34:17:37:3 | { ... } |
-| Test.java:34:10:34:14 | ... > ... | Test.java:39:3:39:9 | <Expr>; |
-| Test.java:34:14:34:14 | 0 | Test.java:34:10:34:14 | ... > ... |
-| Test.java:34:17:37:3 | { ... } | Test.java:35:4:35:10 | <Expr>; |
-| Test.java:35:4:35:9 | ...=... | Test.java:36:4:36:7 | <Expr>; |
-| Test.java:35:4:35:10 | <Expr>; | Test.java:35:8:35:9 | 10 |
-| Test.java:35:8:35:9 | 10 | Test.java:35:4:35:9 | ...=... |
-| Test.java:36:4:36:4 | x | Test.java:36:4:36:6 | ...-- |
-| Test.java:36:4:36:7 | <Expr>; | Test.java:36:4:36:4 | x |
-| Test.java:39:3:39:3 | z | Test.java:39:8:39:8 | y |
-| Test.java:39:3:39:8 | ...+=... | Test.java:42:3:42:26 | for (...;...;...) |
-| Test.java:39:3:39:9 | <Expr>; | Test.java:39:3:39:3 | z |
-| Test.java:39:8:39:8 | y | Test.java:39:3:39:8 | ...+=... |
-| Test.java:42:3:42:26 | for (...;...;...) | Test.java:42:12:42:12 | 0 |
-| Test.java:42:8:42:12 | ...=... | Test.java:42:15:42:15 | j |
-| Test.java:42:12:42:12 | 0 | Test.java:42:8:42:12 | ...=... |
-| Test.java:42:15:42:15 | j | Test.java:42:19:42:20 | 10 |
-| Test.java:42:15:42:20 | ... < ... | Test.java:42:28:45:3 | { ... } |
-| Test.java:42:15:42:20 | ... < ... | Test.java:47:3:47:9 | <Expr>; |
-| Test.java:42:19:42:20 | 10 | Test.java:42:15:42:20 | ... < ... |
-| Test.java:42:23:42:23 | j | Test.java:42:23:42:25 | ...++ |
-| Test.java:42:28:45:3 | { ... } | Test.java:43:4:43:9 | <Expr>; |
-| Test.java:43:4:43:8 | ...=... | Test.java:44:4:44:10 | <Expr>; |
-| Test.java:43:4:43:9 | <Expr>; | Test.java:43:8:43:8 | 0 |
-| Test.java:43:8:43:8 | 0 | Test.java:43:4:43:8 | ...=... |
-| Test.java:44:4:44:9 | ...=... | Test.java:42:23:42:23 | j |
-| Test.java:44:4:44:10 | <Expr>; | Test.java:44:8:44:9 | 10 |
-| Test.java:44:8:44:9 | 10 | Test.java:44:4:44:9 | ...=... |
-| Test.java:47:3:47:3 | z | Test.java:47:8:47:8 | w |
-| Test.java:47:3:47:8 | ...+=... | Test.java:50:3:50:26 | for (...;...;...) |
-| Test.java:47:3:47:9 | <Expr>; | Test.java:47:3:47:3 | z |
-| Test.java:47:8:47:8 | w | Test.java:47:3:47:8 | ...+=... |
-| Test.java:50:3:50:26 | for (...;...;...) | Test.java:50:12:50:12 | 0 |
-| Test.java:50:8:50:12 | ...=... | Test.java:50:15:50:15 | j |
-| Test.java:50:12:50:12 | 0 | Test.java:50:8:50:12 | ...=... |
-| Test.java:50:15:50:15 | j | Test.java:50:19:50:20 | 10 |
-| Test.java:50:15:50:20 | ... < ... | Test.java:50:28:64:3 | { ... } |
-| Test.java:50:15:50:20 | ... < ... | Test.java:66:3:66:17 | <Expr>; |
-| Test.java:50:19:50:20 | 10 | Test.java:50:15:50:20 | ... < ... |
-| Test.java:50:23:50:23 | j | Test.java:50:23:50:25 | ...++ |
-| Test.java:50:28:64:3 | { ... } | Test.java:51:4:51:10 | <Expr>; |
-| Test.java:51:4:51:9 | ...=... | Test.java:52:4:52:13 | if (...) |
-| Test.java:51:4:51:10 | <Expr>; | Test.java:51:8:51:9 | 30 |
-| Test.java:51:8:51:9 | 30 | Test.java:51:4:51:9 | ...=... |
-| Test.java:52:4:52:13 | if (...) | Test.java:52:8:52:8 | z |
-| Test.java:52:8:52:8 | z | Test.java:52:12:52:12 | 0 |
-| Test.java:52:8:52:12 | ... > ... | Test.java:50:23:50:23 | j |
-| Test.java:52:8:52:12 | ... > ... | Test.java:53:5:53:14 | if (...) |
-| Test.java:52:8:52:12 | ... > ... | Test.java:59:9:62:4 | { ... } |
-| Test.java:52:12:52:12 | 0 | Test.java:52:8:52:12 | ... > ... |
-| Test.java:53:5:53:14 | if (...) | Test.java:53:9:53:9 | y |
-| Test.java:53:9:53:9 | y | Test.java:53:13:53:13 | 0 |
-| Test.java:53:9:53:13 | ... > ... | Test.java:53:16:56:5 | { ... } |
-| Test.java:53:9:53:13 | ... > ... | Test.java:56:12:58:5 | { ... } |
-| Test.java:53:13:53:13 | 0 | Test.java:53:9:53:13 | ... > ... |
-| Test.java:53:16:56:5 | { ... } | Test.java:54:6:54:11 | <Expr>; |
-| Test.java:54:6:54:10 | ...=... | Test.java:55:6:55:11 | break |
-| Test.java:54:6:54:11 | <Expr>; | Test.java:54:10:54:10 | 0 |
-| Test.java:54:10:54:10 | 0 | Test.java:54:6:54:10 | ...=... |
-| Test.java:56:12:58:5 | { ... } | Test.java:57:6:57:12 | <Expr>; |
-| Test.java:57:6:57:11 | ...=... | Test.java:63:4:63:9 | <Expr>; |
-| Test.java:57:6:57:12 | <Expr>; | Test.java:57:10:57:11 | 20 |
-| Test.java:57:10:57:11 | 20 | Test.java:57:6:57:11 | ...=... |
-| Test.java:59:9:62:4 | { ... } | Test.java:60:5:60:11 | <Expr>; |
-| Test.java:60:5:60:10 | ...=... | Test.java:61:5:61:13 | continue |
-| Test.java:60:5:60:11 | <Expr>; | Test.java:60:9:60:10 | 10 |
-| Test.java:60:9:60:10 | 10 | Test.java:60:5:60:10 | ...=... |
-| Test.java:63:4:63:9 | <Expr>; | Test.java:63:8:63:8 | 0 |
-| Test.java:63:8:63:8 | 0 | Test.java:63:4:63:8 | ...=... |
-| Test.java:66:3:66:3 | z | Test.java:66:8:66:8 | x |
-| Test.java:66:3:66:16 | ...+=... | Test.java:70:3:70:9 | <Expr>; |
-| Test.java:66:3:66:17 | <Expr>; | Test.java:66:3:66:3 | z |
-| Test.java:66:8:66:8 | x | Test.java:66:12:66:12 | y |
-| Test.java:66:8:66:12 | ... + ... | Test.java:66:16:66:16 | w |
-| Test.java:66:8:66:16 | ... + ... | Test.java:66:3:66:16 | ...+=... |
-| Test.java:66:12:66:12 | y | Test.java:66:8:66:12 | ... + ... |
-| Test.java:66:16:66:16 | w | Test.java:66:8:66:16 | ... + ... |
-| Test.java:70:3:70:8 | ...=... | Test.java:71:10:71:10 | w |
-| Test.java:70:3:70:9 | <Expr>; | Test.java:70:7:70:8 | 40 |
-| Test.java:70:7:70:8 | 40 | Test.java:70:3:70:8 | ...=... |
-| Test.java:71:10:71:10 | w | Test.java:71:3:71:11 | return ... |
-| Test.java:74:19:91:2 | { ... } | Test.java:76:3:76:8 | var ...; |
-| Test.java:76:3:76:8 | var ...; | Test.java:76:7:76:7 | b |
-| Test.java:76:7:76:7 | b | Test.java:77:3:77:8 | var ...; |
-| Test.java:77:3:77:8 | var ...; | Test.java:77:7:77:7 | c |
-| Test.java:77:7:77:7 | c | Test.java:78:3:78:8 | <Expr>; |
-| Test.java:78:3:78:7 | ...=... | Test.java:79:3:79:13 | while (...) |
-| Test.java:78:3:78:8 | <Expr>; | Test.java:78:7:78:7 | 0 |
-| Test.java:78:7:78:7 | 0 | Test.java:78:3:78:7 | ...=... |
-| Test.java:79:3:79:13 | while (...) | Test.java:79:9:79:12 | true |
-| Test.java:79:9:79:12 | true | Test.java:79:15:89:3 | { ... } |
-| Test.java:79:15:89:3 | { ... } | Test.java:80:4:80:10 | <Expr>; |
-| Test.java:80:4:80:9 | ...=... | Test.java:81:4:81:15 | if (...) |
-| Test.java:80:4:80:10 | <Expr>; | Test.java:80:8:80:9 | 10 |
-| Test.java:80:8:80:9 | 10 | Test.java:80:4:80:9 | ...=... |
-| Test.java:81:4:81:15 | if (...) | Test.java:81:8:81:8 | a |
-| Test.java:81:8:81:8 | a | Test.java:81:12:81:14 | 100 |
-| Test.java:81:8:81:14 | ... > ... | Test.java:81:17:84:4 | { ... } |
-| Test.java:81:8:81:14 | ... > ... | Test.java:85:4:85:15 | if (...) |
-| Test.java:81:12:81:14 | 100 | Test.java:81:8:81:14 | ... > ... |
-| Test.java:81:17:84:4 | { ... } | Test.java:82:5:82:11 | <Expr>; |
-| Test.java:82:5:82:10 | ...=... | Test.java:83:5:83:10 | <Expr>; |
-| Test.java:82:5:82:11 | <Expr>; | Test.java:82:9:82:10 | 10 |
-| Test.java:82:9:82:10 | 10 | Test.java:82:5:82:10 | ...=... |
-| Test.java:83:5:83:10 | <Expr>; | Test.java:83:9:83:9 | c |
-| Test.java:83:9:83:9 | c | Test.java:83:5:83:9 | ...=... |
-| Test.java:85:4:85:15 | if (...) | Test.java:85:8:85:8 | a |
-| Test.java:85:8:85:8 | a | Test.java:85:13:85:14 | 10 |
-| Test.java:85:8:85:14 | ... == ... | Test.java:74:6:74:10 | Normal Exit |
-| Test.java:85:8:85:14 | ... == ... | Test.java:86:5:86:10 | break |
-| Test.java:85:8:85:14 | ... == ... | Test.java:87:4:87:15 | if (...) |
-| Test.java:85:13:85:14 | 10 | Test.java:85:8:85:14 | ... == ... |
-| Test.java:86:5:86:10 | break | Test.java:90:10:90:10 | b |
-| Test.java:87:4:87:15 | if (...) | Test.java:87:8:87:8 | a |
-| Test.java:87:8:87:8 | a | Test.java:87:13:87:14 | 20 |
-| Test.java:87:8:87:14 | ... == ... | Test.java:88:12:88:12 | c |
-| Test.java:87:13:87:14 | 20 | Test.java:87:8:87:14 | ... == ... |
-| Test.java:88:12:88:12 | c | Test.java:88:5:88:13 | return ... |
-| Test.java:90:10:90:10 | b | Test.java:90:3:90:11 | return ... |
+| Test.java:2:6:2:9 | Normal Exit | Test.java:2:6:2:9 | Exit |
+| Test.java:2:32:72:2 | { ... } | Test.java:7:14:10:3 | { ... } |
+| Test.java:2:32:72:2 | { ... } | Test.java:10:10:12:3 | { ... } |
+| Test.java:2:32:72:2 | { ... } | Test.java:14:3:14:20 | <Expr>; |
+| Test.java:14:3:14:20 | <Expr>; | Test.java:2:6:2:9 | Normal Exit |
+| Test.java:14:3:14:20 | <Expr>; | Test.java:18:4:18:10 | <Expr>; |
+| Test.java:14:3:14:20 | <Expr>; | Test.java:20:11:20:11 | z |
+| Test.java:18:4:18:10 | <Expr>; | Test.java:26:15:29:3 | { ... } |
+| Test.java:18:4:18:10 | <Expr>; | Test.java:31:3:31:9 | <Expr>; |
+| Test.java:31:3:31:9 | <Expr>; | Test.java:34:10:34:10 | x |
+| Test.java:34:10:34:10 | x | Test.java:34:17:37:3 | { ... } |
+| Test.java:34:10:34:10 | x | Test.java:39:3:39:9 | <Expr>; |
+| Test.java:39:3:39:9 | <Expr>; | Test.java:42:15:42:15 | j |
+| Test.java:42:15:42:15 | j | Test.java:42:28:45:3 | { ... } |
+| Test.java:42:15:42:15 | j | Test.java:47:3:47:9 | <Expr>; |
+| Test.java:47:3:47:9 | <Expr>; | Test.java:50:15:50:15 | j |
+| Test.java:50:15:50:15 | j | Test.java:50:28:64:3 | { ... } |
+| Test.java:50:15:50:15 | j | Test.java:66:3:66:17 | <Expr>; |
+| Test.java:50:28:64:3 | { ... } | Test.java:50:23:50:23 | j |
+| Test.java:50:28:64:3 | { ... } | Test.java:53:5:53:14 | if (...) |
+| Test.java:50:28:64:3 | { ... } | Test.java:59:9:62:4 | { ... } |
+| Test.java:53:5:53:14 | if (...) | Test.java:53:16:56:5 | { ... } |
+| Test.java:53:5:53:14 | if (...) | Test.java:56:12:58:5 | { ... } |
+| Test.java:74:6:74:10 | Normal Exit | Test.java:74:6:74:10 | Exit |
+| Test.java:74:19:91:2 | { ... } | Test.java:79:9:79:12 | true |
+| Test.java:79:9:79:12 | true | Test.java:81:17:84:4 | { ... } |
+| Test.java:79:9:79:12 | true | Test.java:85:4:85:15 | if (...) |
+| Test.java:85:4:85:15 | if (...) | Test.java:74:6:74:10 | Normal Exit |
+| Test.java:85:4:85:15 | if (...) | Test.java:86:5:86:10 | break |
+| Test.java:85:4:85:15 | if (...) | Test.java:87:4:87:15 | if (...) |
+| Test.java:87:4:87:15 | if (...) | Test.java:88:12:88:12 | c |
diff --git a/java/ql/test/library-tests/controlflow/dominance/dominator.ql b/java/ql/test/library-tests/controlflow/dominance/dominator.ql
index 701640bf7209..b157cb5fca3d 100644
--- a/java/ql/test/library-tests/controlflow/dominance/dominator.ql
+++ b/java/ql/test/library-tests/controlflow/dominance/dominator.ql
@@ -1,9 +1,8 @@
-import default
-import semmle.code.java.controlflow.Dominance
+import java
 
-from Method func, ControlFlowNode dominator, ControlFlowNode node
+from Method func, BasicBlock dominator, BasicBlock bb
 where
-  iDominates(dominator, node) and
-  dominator.getEnclosingStmt().getEnclosingCallable() = func and
+  dominator.immediatelyDominates(bb) and
+  dominator.getEnclosingCallable() = func and
   func.getDeclaringType().hasName("Test")
-select dominator, node
+select dominator, bb
diff --git a/shared/controlflow/codeql/controlflow/BasicBlock.qll b/shared/controlflow/codeql/controlflow/BasicBlock.qll
index ed86ae5aa8be..163ddee70f0b 100644
--- a/shared/controlflow/codeql/controlflow/BasicBlock.qll
+++ b/shared/controlflow/codeql/controlflow/BasicBlock.qll
@@ -177,6 +177,9 @@ module Make<LocationSig Location, InputSig<Location> Input> implements CfgSig<Lo
     /** Gets the CFG scope of this basic block. */
     CfgScope getScope() { result = nodeGetCfgScope(this.getFirstNode()) }
 
+    /** Gets the enclosing callable of this basic block. */
+    CfgScope getEnclosingCallable() { result = nodeGetCfgScope(this.getFirstNode()) }
+
     /** Gets the location of this basic block. */
     Location getLocation() { result = this.getFirstNode().getLocation() }
 
diff --git a/shared/controlflow/codeql/controlflow/SuccessorType.qll b/shared/controlflow/codeql/controlflow/SuccessorType.qll
index cc673c9e5cab..ef772a929728 100644
--- a/shared/controlflow/codeql/controlflow/SuccessorType.qll
+++ b/shared/controlflow/codeql/controlflow/SuccessorType.qll
@@ -28,6 +28,34 @@ module;
 
 private import codeql.util.Boolean
 
+private newtype TConditionKind =
+  TBooleanCondition() or
+  TNullnessCondition() or
+  TMatchingCondition() or
+  TEmptinessCondition()
+
+/** A condition kind. This is used to classify different `ConditionalSuccessor`s. */
+class ConditionKind extends TConditionKind {
+  /** Gets a textual representation of this condition kind. */
+  string toString() {
+    this instanceof TBooleanCondition and result = "Boolean"
+    or
+    this instanceof TNullnessCondition and result = "Nullness"
+    or
+    this instanceof TMatchingCondition and result = "Matching"
+    or
+    this instanceof TEmptinessCondition and result = "Emptiness"
+  }
+
+  predicate isBoolean() { this instanceof TBooleanCondition }
+
+  predicate isNullness() { this instanceof TNullnessCondition }
+
+  predicate isMatching() { this instanceof TMatchingCondition }
+
+  predicate isEmptiness() { this instanceof TEmptinessCondition }
+}
+
 private newtype TSuccessorType =
   TDirectSuccessor() or
   TBooleanSuccessor(Boolean branch) or
@@ -83,6 +111,18 @@ private class TConditionalSuccessor =
 abstract private class ConditionalSuccessorImpl extends NormalSuccessorImpl, TConditionalSuccessor {
   /** Gets the Boolean value of this successor. */
   abstract boolean getValue();
+
+  /** Gets the condition kind of this conditional successor. */
+  abstract ConditionKind getKind();
+
+  /**
+   * Gets the dual of this conditional successor. That is, the conditional
+   * successor of the same kind but with the opposite value.
+   */
+  ConditionalSuccessor getDual() {
+    this.getValue().booleanNot() = result.getValue() and
+    this.getKind() = result.getKind()
+  }
 }
 
 final class ConditionalSuccessor = ConditionalSuccessorImpl;
@@ -116,6 +156,8 @@ final class ConditionalSuccessor = ConditionalSuccessorImpl;
 class BooleanSuccessor extends ConditionalSuccessorImpl, TBooleanSuccessor {
   override boolean getValue() { this = TBooleanSuccessor(result) }
 
+  override ConditionKind getKind() { result = TBooleanCondition() }
+
   override string toString() { result = this.getValue().toString() }
 }
 
@@ -151,6 +193,8 @@ class NullnessSuccessor extends ConditionalSuccessorImpl, TNullnessSuccessor {
 
   override boolean getValue() { this = TNullnessSuccessor(result) }
 
+  override ConditionKind getKind() { result = TNullnessCondition() }
+
   override string toString() { if this.isNull() then result = "null" else result = "non-null" }
 }
 
@@ -192,6 +236,8 @@ class MatchingSuccessor extends ConditionalSuccessorImpl, TMatchingSuccessor {
 
   override boolean getValue() { this = TMatchingSuccessor(result) }
 
+  override ConditionKind getKind() { result = TMatchingCondition() }
+
   override string toString() { if this.isMatch() then result = "match" else result = "no-match" }
 }
 
@@ -233,6 +279,8 @@ class EmptinessSuccessor extends ConditionalSuccessorImpl, TEmptinessSuccessor {
 
   override boolean getValue() { this = TEmptinessSuccessor(result) }
 
+  override ConditionKind getKind() { result = TEmptinessCondition() }
+
   override string toString() { if this.isEmpty() then result = "empty" else result = "non-empty" }
 }