diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
index 727f14bb94ab..47ae294492eb 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
@@ -196,7 +196,8 @@ private ExprCfgNode getALastEvalNode(ExprCfgNode e) {
 
 /**
  * Holds if a reverse local flow step should be added from the post-update node
- * for `e` to the post-update node for the result.
+ * for `e` to the post-update node for the result. `preservesValue` is true
+ * if the step is value preserving.
  *
  * This is needed to allow for side-effects on compound expressions to propagate
  * to sub components. For example, in
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll b/rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll
index 7f8df8d144ba..067ef98b2fc0 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll
@@ -51,7 +51,8 @@ private import codeql.rust.elements.internal.CallExprBaseImpl::Impl as CallExprB
 
 /**
  * Holds if in a call to the function with canonical path `path`, the value referred
- * to by `output` is a flow source of the given `kind`.
+ * to by `output` is a flow source of the given `kind` and `madId` is the data
+ * extension row number.
  *
  * `output = "ReturnValue"` simply means the result of the call itself.
  *
@@ -64,7 +65,8 @@ extensible predicate sourceModel(
 
 /**
  * Holds if in a call to the function with canonical path `path`, the value referred
- * to by `input` is a flow sink of the given `kind`.
+ * to by `input` is a flow sink of the given `kind` and `madId` is the data
+ * extension row number.
  *
  * For example, `input = Argument[0]` means the first argument of the call.
  *
@@ -77,7 +79,8 @@ extensible predicate sinkModel(
 
 /**
  * Holds if in a call to the function with canonical path `path`, the value referred
- * to by `input` can flow to the value referred to by `output`.
+ * to by `input` can flow to the value referred to by `output` and `madId` is the data
+ * extension row number.
  *
  * `kind` should be either `value` or `taint`, for value-preserving or taint-preserving
  * steps, respectively.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CallImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CallImpl.qll
index ac6e08bb9cf7..020b50594a6d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CallImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CallImpl.qll
@@ -123,11 +123,10 @@ module Impl {
   }
 
   class CallExprMethodCall extends Call instanceof CallExpr {
-    Path qualifier;
     string methodName;
     boolean selfIsRef;
 
-    CallExprMethodCall() { callIsMethodCall(this, qualifier, methodName, selfIsRef) }
+    CallExprMethodCall() { callIsMethodCall(this, _, methodName, selfIsRef) }
 
     /**
      * Holds if this call must have an explicit borrow for the `self` argument,
diff --git a/rust/ql/lib/codeql/rust/internal/Type.qll b/rust/ql/lib/codeql/rust/internal/Type.qll
index 56c179354b40..eaa7e83fc6da 100644
--- a/rust/ql/lib/codeql/rust/internal/Type.qll
+++ b/rust/ql/lib/codeql/rust/internal/Type.qll
@@ -620,9 +620,7 @@ final class TypeBoundTypeAbstraction extends TypeAbstraction, TypeBound {
 }
 
 final class SelfTypeBoundTypeAbstraction extends TypeAbstraction, Name {
-  private TraitTypeAbstraction trait;
-
-  SelfTypeBoundTypeAbstraction() { trait.getName() = this }
+  SelfTypeBoundTypeAbstraction() { any(TraitTypeAbstraction trait).getName() = this }
 
   override TypeParameter getATypeParameter() { none() }
 }